Skip to contentSkip to conversation

net: macb: Fix rx buffer cache handling

PATCH New Stefan Roese 1 participant 1 message Aug 23, 2019 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: macb: Fix rx buffer cache handling

With commit c6d07bf440bc ("net/macb: increase RX buffer size for GEM") ethernet support does not work any more with d-cache enabled on the AT91SAM. The reason is, that MACB_RX_BUFFER_SIZE was changed from 4096 to 128 but this change was not refected in the rx_buffer flush and invalidate functions, as these also use this macro.

This patch now fixes this by calculating the rx buffer size correctly again in those functions. With this change, ethernet works again reliably on my AT91SAM board.

Cc Ramon Fried <[email protected]>
Cc Eugen Hristev <[email protected]>
Cc Anup Patel <[email protected]>
Cc Bin Meng <[email protected]>
Cc Joe Hershberger <[email protected]>

---
v2:
- Use macb->rx_buffer_size instead of fixed MACB_RX_BUFFER_SIZE in rx buffer invalidate/flush functions as to correctly handle the GEM buffer sizes and not only MACB (suggested by Bin)

 drivers/net/macb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/macb.c +4 -2
index c99cf663a4..a6d7b8ae8d 100644
@@ -296,13 +296,15 @@ static inline void macb_flush_ring_desc(struct macb_device *macb, bool rx)
 static inline void macb_flush_rx_buffer(struct macb_device *macb)
 {
 	flush_dcache_range(macb->rx_buffer_dma, macb->rx_buffer_dma +
-			   ALIGN(MACB_RX_BUFFER_SIZE, PKTALIGN));
+			   ALIGN(macb->rx_buffer_size * MACB_RX_RING_SIZE,
+				 PKTALIGN));
 }
 
 static inline void macb_invalidate_rx_buffer(struct macb_device *macb)
 {
 	invalidate_dcache_range(macb->rx_buffer_dma, macb->rx_buffer_dma +
-				ALIGN(MACB_RX_BUFFER_SIZE, PKTALIGN));
+				ALIGN(macb->rx_buffer_size * MACB_RX_RING_SIZE,
+				      PKTALIGN));
 }
 
 #if defined(CONFIG_CMD_NET)
Signature · 1 line
2.23.0