net: ethernet: mtk_wed: return status value in mtk_wdma_rx_reset

Move MTK_WDMA_RESET_IDX configuration in mtk_wdma_rx_reset routine.
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>

diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c
index 16d7af88bbace41b1454a8f598da5369c301a311..4ab2ec9dc5d3196b56d6649bc6695662e18c20ff 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
@@ -101,17 +101,21 @@ mtk_wdma_read_reset(struct mtk_wed_device *dev)
        return wdma_r32(dev, MTK_WDMA_GLO_CFG);
 }
 
-static void
+static int
 mtk_wdma_rx_reset(struct mtk_wed_device *dev)
 {
        u32 status, mask = MTK_WDMA_GLO_CFG_RX_DMA_BUSY;
-       int i;
+       int i, ret;
 
        wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_RX_DMA_EN);
-       if (readx_poll_timeout(mtk_wdma_read_reset, dev, status,
-                              !(status & mask), 0, 1000))
+       ret = readx_poll_timeout(mtk_wdma_read_reset, dev, status,
+                                !(status & mask), 0, 10000);
+       if (ret)
                dev_err(dev->hw->dev, "rx reset failed\n");
 
+       wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_RX);
+       wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
+
        for (i = 0; i < ARRAY_SIZE(dev->rx_wdma); i++) {
                if (dev->rx_wdma[i].desc)
                        continue;
@@ -119,6 +123,8 @@ mtk_wdma_rx_reset(struct mtk_wed_device *dev)
                wdma_w32(dev,
                         MTK_WDMA_RING_RX(i) + MTK_WED_RING_OFS_CPU_IDX, 0);
        }
+
+       return ret;
 }
 
 static void
@@ -565,9 +571,7 @@ mtk_wed_detach(struct mtk_wed_device *dev)
 
        mtk_wed_stop(dev);
 
-       wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_RX);
-       wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
-
+       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);
@@ -582,7 +586,6 @@ mtk_wed_detach(struct mtk_wed_device *dev)
                mtk_wed_wo_reset(dev);
                mtk_wed_free_rx_rings(dev);
                mtk_wed_wo_deinit(hw);
-               mtk_wdma_rx_reset(dev);
        }
 
        if (dev->wlan.bus_type == MTK_WED_BUS_PCIE) {
@@ -999,11 +1002,7 @@ mtk_wed_reset_dma(struct mtk_wed_device *dev)
                wed_w32(dev, MTK_WED_RESET_IDX, 0);
        }
 
-       wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_RX);
-       wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
-
-       if (mtk_wed_get_rx_capa(dev))
-               mtk_wdma_rx_reset(dev);
+       mtk_wdma_rx_reset(dev);
 
        if (busy) {
                mtk_wed_reset(dev, MTK_WED_RESET_WDMA_INT_AGENT);