From cb50f16f37fc3429085c454ee5978e05732d10ba Mon Sep 17 00:00:00 2001 From: Zhi-Jun You Date: Mon, 26 Oct 2026 17:57:28 +0800 Subject: [PATCH 1/4] net: ethernet: mtk_wed: skip ring reset in wdma_tx_ring_setup for WED v3 Currently WED v3 tx wdma ring, ring reset happens in a separate code block unconditionally. Moreover, v3 has double the size of wdma_desc and has different init values. mtk_wed_ring_reset doens't deal with that and would corrupt the wdma_desc. Fix this by skipping mtk_wed_ring_reset in mtk_wdma_tx_ring_setup for WED v3. Fixes: e2f64db13aa1 ("net: ethernet: mtk_wed: introduce WED support for MT7988") Reported-by: Sashiko Link: https://sashiko.dev/#/patchset/20260711112128.971-1-hujy652@gmail.com?part=1 Signed-off-by: Zhi-Jun You Link: https://patch.msgid.link/20261026-wedfix-v6-1-a52f6b15d2fc@gmail.com Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/mediatek/mtk_wed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c index 53d3b7e00e1c..d55042ccaff1 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed.c +++ b/drivers/net/ethernet/mediatek/mtk_wed.c @@ -1938,7 +1938,7 @@ mtk_wed_wdma_tx_ring_setup(struct mtk_wed_device *dev, int idx, int size, wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_CPU_IDX, 0); wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_DMA_IDX, 0); - if (reset) + if (!mtk_wed_is_v3_or_greater(dev->hw) && reset) mtk_wed_ring_reset(wdma, MTK_WED_WDMA_RING_SIZE, true); if (!idx) { From 7180a42d8e616f919dcff4b90a13b9a5ecea665b Mon Sep 17 00:00:00 2001 From: Zhi-Jun You Date: Mon, 26 Oct 2026 17:57:29 +0800 Subject: [PATCH 2/4] net: ethernet: mtk_wed: fix reset condition for rx wdma In mtk_wdma_rx_reset, currently only resets the CPU index of the rings that doesn't have a descriptor. This is wrong because no descriptor means the ring is not configured. Also mtk_wed_start makes sure that all rx_wdma rings are set up this would lead to no ring getting their CPU index reset. Fix this by inverting the reset condition so allocated rings will be reset. Fixes: 4c5de09eb0d0 ("net: ethernet: mtk_wed: add configure wed wo support") Reported-by: Sashiko Link: https://sashiko.dev/#/patchset/20260724172040.1653-1-hujy652%40gmail.com Signed-off-by: Zhi-Jun You Link: https://patch.msgid.link/20261026-wedfix-v6-2-a52f6b15d2fc@gmail.com Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/mediatek/mtk_wed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c index d55042ccaff1..3f0be70c3f14 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed.c +++ b/drivers/net/ethernet/mediatek/mtk_wed.c @@ -257,7 +257,7 @@ mtk_wdma_rx_reset(struct mtk_wed_device *dev) wdma_w32(dev, MTK_WDMA_RESET_IDX, 0); for (i = 0; i < ARRAY_SIZE(dev->rx_wdma); i++) { - if (dev->rx_wdma[i].desc) + if (!dev->rx_wdma[i].desc) continue; wdma_w32(dev, From 5b8d12512cbd3495dbd8c38e8047bb5d716f0f3f Mon Sep 17 00:00:00 2001 From: Zhi-Jun You Date: Mon, 26 Oct 2026 17:57:30 +0800 Subject: [PATCH 3/4] net: ethernet: mtk_wed: free up rings during detach During __mtk_wed_detach, rx_ring and tx_wdma aren't freed up. Fix this by add them to mtk_wed_free_rx_rings. This patch is pulled from mtk-openwrt-feeds to address Sashiko's review and edit to rely on ring->desc instead of an extra flag. Link: https://github.com/mediatek/mtk-openwrt-feeds/blob/main/25.12/files/target/linux/mediatek/patches-6.12/999-wed-04-Fix-reinsert-wifi-module-cause-memory-leak-issue.patch Fixes: 4c5de09eb0d0 ("net: ethernet: mtk_wed: add configure wed wo support") Reported-by: Sashiko Link: https://sashiko.dev/#/message/179000700034.2160803.10594281691384015089%40kernel.org Signed-off-by: Zhi-Jun You Link: https://patch.msgid.link/20261026-wedfix-v6-3-a52f6b15d2fc@gmail.com Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/mediatek/mtk_wed.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c index 3f0be70c3f14..3044a7a8ea03 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed.c +++ b/drivers/net/ethernet/mediatek/mtk_wed.c @@ -949,6 +949,14 @@ mtk_wed_free_ring(struct mtk_wed_device *dev, struct mtk_wed_ring *ring) static void mtk_wed_free_rx_rings(struct mtk_wed_device *dev) { + int i; + + for (i = 0; i < ARRAY_SIZE(dev->rx_ring); i++) + mtk_wed_free_ring(dev, &dev->rx_ring[i]); + + for (i = 0; i < ARRAY_SIZE(dev->tx_wdma); i++) + mtk_wed_free_ring(dev, &dev->tx_wdma[i]); + mtk_wed_free_rx_buffer(dev); mtk_wed_free_ring(dev, &dev->rro.ring); } From dd6efae5529107cc8db277eaeaff5c5f15e6bc15 Mon Sep 17 00:00:00 2001 From: Zhi-Jun You Date: Mon, 26 Oct 2026 17:57:31 +0800 Subject: [PATCH 4/4] net: ethernet: mtk_wed: setup WDMA_RING_TX(0) for non-DBDC MT7986 WDMA_RING_TX(0) is required to set MTK_WED_WDMA_RING_TX for WED RX but on a non-DBDC MT7986 it is never setup because idx is 1. Setting MTK_WED_WDMA_RING_TX with WDMA_RING_TX(1) is not feasible because WED still tries to send through WDMA_RING_TX(0). This is verified with register dump. Fix this by calling mtk_wed_wdma_tx_ring_setup if wed is v2 and rx_ring[0] is not allocated and reset tx_wdma[0] if it's already allocated also add error messages and bail when mtk_wed_start fails. Fixes: 4c5de09eb0d0 ("net: ethernet: mtk_wed: add configure wed wo support") Signed-off-by: Zhi-Jun You Link: https://patch.msgid.link/20261026-wedfix-v6-4-a52f6b15d2fc@gmail.com Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/mediatek/mtk_wed.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c index 3044a7a8ea03..f40ac5794341 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed.c +++ b/drivers/net/ethernet/mediatek/mtk_wed.c @@ -2345,7 +2345,20 @@ mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask) for (i = 0; i < ARRAY_SIZE(dev->rx_wdma); i++) if (!dev->rx_wdma[i].desc) - mtk_wed_wdma_rx_ring_setup(dev, i, 16, false); + if (mtk_wed_wdma_rx_ring_setup(dev, i, 16, false)) { + dev_err(dev->hw->dev, "wdma rx ring %d setup failed\n", i); + return; + } + + /* + * non-DBDC MT7986 allocates only rx_ring[1] and tx_wdma[1] during setup + * but tx_wdma[0] is also needed for WED to function. + */ + if (mtk_wed_is_v2(dev->hw) && !dev->rx_ring[0].desc) + if (mtk_wed_wdma_tx_ring_setup(dev, 0, MTK_WED_WDMA_RING_SIZE, !!dev->tx_wdma[0].desc)) { + dev_err(dev->hw->dev, "wdma tx ring 0 setup failed\n"); + return; + } if (dev->wlan.hw_rro) { for (i = 0; i < MTK_WED_RX_PAGE_QUEUES; i++) {