53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Thu, 24 Nov 2022 16:22:52 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_wed: move MTK_WDMA_RESET_IDX_TX
|
|
configuration in mtk_wdma_tx_reset
|
|
|
|
Remove duplicated code. Increase poll timeout to 10ms in order to be
|
|
aligned with vendor sdk.
|
|
This is a preliminary patch to add Wireless Ethernet Dispatcher reset
|
|
support.
|
|
|
|
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
@@ -135,16 +135,15 @@ mtk_wdma_tx_reset(struct mtk_wed_device
|
|
|
|
wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_TX_DMA_EN);
|
|
if (readx_poll_timeout(mtk_wdma_read_reset, dev, status,
|
|
- !(status & mask), 0, 1000))
|
|
+ !(status & mask), 0, 10000))
|
|
dev_err(dev->hw->dev, "tx reset failed\n");
|
|
|
|
- for (i = 0; i < ARRAY_SIZE(dev->tx_wdma); i++) {
|
|
- if (dev->tx_wdma[i].desc)
|
|
- continue;
|
|
+ wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_TX);
|
|
+ wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(dev->tx_wdma); i++)
|
|
wdma_w32(dev,
|
|
MTK_WDMA_RING_TX(i) + MTK_WED_RING_OFS_CPU_IDX, 0);
|
|
- }
|
|
}
|
|
|
|
static void
|
|
@@ -573,12 +572,6 @@ mtk_wed_detach(struct mtk_wed_device *de
|
|
|
|
mtk_wdma_rx_reset(dev);
|
|
mtk_wed_reset(dev, MTK_WED_RESET_WED);
|
|
- if (mtk_wed_get_rx_capa(dev)) {
|
|
- wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_TX_DMA_EN);
|
|
- wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_TX);
|
|
- wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
|
|
- }
|
|
-
|
|
mtk_wed_free_tx_buffer(dev);
|
|
mtk_wed_free_tx_rings(dev);
|
|
|