[PATCH net] net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly

Subsystems: broadcom bcm4908 ethernet driver, networking drivers, the rest

STALE1874d

2 messages, 2 authors, 2021-06-22 · open the first message on its own page

[PATCH net] net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly

From: Rafał Miłecki <zajec5@gmail.com>
Date: 2021-06-22 05:24:41

From: Rafał Miłecki <rafal@milecki.pl>

Resetting software indexes in bcm4908_dma_alloc_buf_descs() is not
enough as it's called during device probe only. Driver resets DMA on
every .ndo_open callback and it's required to reset indexes then.

This fixes inconsistent rings state and stalled traffic after interface
down & up sequence.

Fixes: 4feffeadbcb2 ("net: broadcom: bcm4908enet: add BCM4908 controller driver")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
Sorry for a late fix, this bug has been exposed by OpenWrt and debugged
just yesterday.
---
 drivers/net/ethernet/broadcom/bcm4908_enet.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index 60d908507f51..02a569500234 100644
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
@@ -174,9 +174,6 @@ static int bcm4908_dma_alloc_buf_descs(struct bcm4908_enet *enet,
 	if (!ring->slots)
 		goto err_free_buf_descs;
 
-	ring->read_idx = 0;
-	ring->write_idx = 0;
-
 	return 0;
 
 err_free_buf_descs:
@@ -304,6 +301,9 @@ static void bcm4908_enet_dma_ring_init(struct bcm4908_enet *enet,
 
 	enet_write(enet, ring->st_ram_block + ENET_DMA_CH_STATE_RAM_BASE_DESC_PTR,
 		   (uint32_t)ring->dma_addr);
+
+	ring->read_idx = 0;
+	ring->write_idx = 0;
 }
 
 static void bcm4908_enet_dma_uninit(struct bcm4908_enet *enet)
-- 
2.26.2

Re: [PATCH net] net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly

From: patchwork-bot+netdevbpf@kernel.org
Date: 2021-06-22 17:40:13

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Tue, 22 Jun 2021 07:24:15 +0200 you wrote:
From: Rafał Miłecki <rafal@milecki.pl>

Resetting software indexes in bcm4908_dma_alloc_buf_descs() is not
enough as it's called during device probe only. Driver resets DMA on
every .ndo_open callback and it's required to reset indexes then.

This fixes inconsistent rings state and stalled traffic after interface
down & up sequence.

[...]
Here is the summary with links:
  - [net] net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly
    https://git.kernel.org/netdev/net/c/ddeacc4f6494

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help