Skip to contentSkip to conversation

net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly

PATCH Applied Rafał Miłecki 2 participants 2 messages Jun 22, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly

From: Rafał Miłecki <[email protected]>

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")

---
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(-)
drivers/net/ethernet/broadcom/bcm4908_enet.c +3 -3
index 60d908507f51..02a569500234 100644
@@ -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)
Signature · 1 line
2.26.2
#1 lore raw
This patch was applied to netdev/net.git (refs/heads/master):

Hello:

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

Quoted 10 lines · On Tue, 22 Jun 2021 07:24:15 +0200 you wrote:

From: Rafał Miłecki <[email protected]>

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