Use net_prefetch to remove #ifdef and simplify prefetch logic. This
follows the pattern introduced in a previous commit f468f21b7af0 ("net:
Take common prefetch code structure into a function"), which replaced
the same logic in all existing drivers at that time.

Fixes: 3c47e8ae113a ("net: libwx: Support to receive packets in NAPI")
Signed-off-by: Joe Damato <jdamato@fastly.com>
---
 drivers/net/ethernet/wangxun/libwx/wx_lib.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
index 1eecba984f3b..2b3d6586f44a 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
@@ -251,10 +251,7 @@ static struct sk_buff *wx_build_skb(struct wx_ring *rx_ring,
 				  rx_buffer->page_offset;
 
 		/* prefetch first cache line of first page */
-		prefetch(page_addr);
-#if L1_CACHE_BYTES < 128
-		prefetch(page_addr + L1_CACHE_BYTES);
-#endif
+		net_prefetch(page_addr);
 
 		/* allocate a skb to store the frags */
 		skb = napi_alloc_skb(&rx_ring->q_vector->napi, WX_RXBUFFER_256);
-- 
2.25.1

On Mon, Jul 22, 2024 at 07:08:13PM +0000, Joe Damato wrote:
> Use net_prefetch to remove #ifdef and simplify prefetch logic. This
> follows the pattern introduced in a previous commit f468f21b7af0 ("net:
> Take common prefetch code structure into a function"), which replaced
> the same logic in all existing drivers at that time.
> 
> Fixes: 3c47e8ae113a ("net: libwx: Support to receive packets in NAPI")
> Signed-off-by: Joe Damato <jdamato@fastly.com>

Hi Joe,

I would lean more towards this being a clean-up than a fix
(for net-next when it reopens, without a Fixes tag).
But that aside, this looks good to me.

Reviewed-by: Simon Horman <horms@kernel.org>

On 7/23/24 09:26, Simon Horman wrote:
> On Mon, Jul 22, 2024 at 07:08:13PM +0000, Joe Damato wrote:
>> Use net_prefetch to remove #ifdef and simplify prefetch logic. This
>> follows the pattern introduced in a previous commit f468f21b7af0 ("net:
>> Take common prefetch code structure into a function"), which replaced
>> the same logic in all existing drivers at that time.
>>
>> Fixes: 3c47e8ae113a ("net: libwx: Support to receive packets in NAPI")
>> Signed-off-by: Joe Damato <jdamato@fastly.com>
> 
> Hi Joe,
> 
> I would lean more towards this being a clean-up than a fix
> (for net-next when it reopens, without a Fixes tag).

Same feeling here, please repost for net-next after the merge window.

Thanks!

Paolo

On Tue, Jul 23, 2024 at 01:05:32PM +0200, Paolo Abeni wrote:
> 
> 
> On 7/23/24 09:26, Simon Horman wrote:
> > On Mon, Jul 22, 2024 at 07:08:13PM +0000, Joe Damato wrote:
> > > Use net_prefetch to remove #ifdef and simplify prefetch logic. This
> > > follows the pattern introduced in a previous commit f468f21b7af0 ("net:
> > > Take common prefetch code structure into a function"), which replaced
> > > the same logic in all existing drivers at that time.
> > > 
> > > Fixes: 3c47e8ae113a ("net: libwx: Support to receive packets in NAPI")
> > > Signed-off-by: Joe Damato <jdamato@fastly.com>
> > 
> > Hi Joe,
> > 
> > I would lean more towards this being a clean-up than a fix
> > (for net-next when it reopens, without a Fixes tag).
> 
> Same feeling here, please repost for net-next after the merge window.

Sure will do; sorry for the noise, I was on the fence whether this
was net or net-next. I'll know for next time though!

Thanks,
Joe