aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm4908/patches-5.4/077-v5.14-net-broadcom-bcm4908_enet-reset-DMA-rings-sw-indexes.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2022-09-21 10:44:32 +0200
committerRafał Miłecki <rafal@milecki.pl>2022-09-21 10:44:32 +0200
commitf33b14d11672827e0d4867313d49a9e35b82f3fc (patch)
tree381b82abfdb0890873f15c1b5efb44d34f769fd9 /target/linux/bcm4908/patches-5.4/077-v5.14-net-broadcom-bcm4908_enet-reset-DMA-rings-sw-indexes.patch
parent4c45c111e0bef4c991d38a2bb1a1c0032bebc8e8 (diff)
downloadupstream-f33b14d11672827e0d4867313d49a9e35b82f3fc.tar.gz
upstream-f33b14d11672827e0d4867313d49a9e35b82f3fc.tar.bz2
upstream-f33b14d11672827e0d4867313d49a9e35b82f3fc.zip
bcm4908: fix -EPROBE_DEFER support in bcm4908_enet
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 1722e23ffcf9038114142a2129c29eb3cdec8ff9)
Diffstat (limited to 'target/linux/bcm4908/patches-5.4/077-v5.14-net-broadcom-bcm4908_enet-reset-DMA-rings-sw-indexes.patch')
-rw-r--r--target/linux/bcm4908/patches-5.4/077-v5.14-net-broadcom-bcm4908_enet-reset-DMA-rings-sw-indexes.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/bcm4908/patches-5.4/077-v5.14-net-broadcom-bcm4908_enet-reset-DMA-rings-sw-indexes.patch b/target/linux/bcm4908/patches-5.4/077-v5.14-net-broadcom-bcm4908_enet-reset-DMA-rings-sw-indexes.patch
new file mode 100644
index 0000000000..02290c8e64
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.4/077-v5.14-net-broadcom-bcm4908_enet-reset-DMA-rings-sw-indexes.patch
@@ -0,0 +1,45 @@
+From ddeacc4f6494e07cbb6f033627926623f3e7a9d0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Tue, 22 Jun 2021 07:24:15 +0200
+Subject: [PATCH] net: broadcom: bcm4908_enet: reset DMA rings sw indexes
+ properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/broadcom/bcm4908_enet.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- 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(s
+ if (!ring->slots)
+ goto err_free_buf_descs;
+
+- ring->read_idx = 0;
+- ring->write_idx = 0;
+-
+ return 0;
+
+ err_free_buf_descs:
+@@ -303,6 +300,9 @@ static void bcm4908_enet_dma_ring_init(s
+
+ 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)