diff mbox series

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

Message ID 20210622052415.12040-1-zajec5@gmail.com (mailing list archive)
State Accepted
Commit ddeacc4f6494e07cbb6f033627926623f3e7a9d0
Delegated to: Netdev Maintainers
Headers show
Series [net] net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net
netdev/subject_prefix success Link
netdev/cc_maintainers success CCed 5 of 5 maintainers
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 18 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success Link

Commit Message

Rafał Miłecki June 22, 2021, 5:24 a.m. UTC 
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(-)

Comments

patchwork-bot+netdevbpf@kernel.org June 22, 2021, 5:40 p.m. UTC | #1 
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
diff mbox series

Patch

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)