96 lines
2.6 KiB
Diff
96 lines
2.6 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Mon, 18 Sep 2023 12:29:14 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_wed: refactor mtk_wed_check_wfdma_rx_fill
|
|
routine
|
|
|
|
Refactor mtk_wed_check_wfdma_rx_fill() in order to be reused adding HW
|
|
receive offload support for MT7988 SoC.
|
|
|
|
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
|
|
@@ -586,22 +586,15 @@ mtk_wed_set_512_support(struct mtk_wed_d
|
|
}
|
|
}
|
|
|
|
-#define MTK_WFMDA_RX_DMA_EN BIT(2)
|
|
-static void
|
|
-mtk_wed_check_wfdma_rx_fill(struct mtk_wed_device *dev, int idx)
|
|
+static int
|
|
+mtk_wed_check_wfdma_rx_fill(struct mtk_wed_device *dev,
|
|
+ struct mtk_wed_ring *ring)
|
|
{
|
|
- u32 val;
|
|
int i;
|
|
|
|
- if (!(dev->rx_ring[idx].flags & MTK_WED_RING_CONFIGURED))
|
|
- return; /* queue is not configured by mt76 */
|
|
-
|
|
for (i = 0; i < 3; i++) {
|
|
- u32 cur_idx;
|
|
+ u32 cur_idx = readl(ring->wpdma + MTK_WED_RING_OFS_CPU_IDX);
|
|
|
|
- cur_idx = wed_r32(dev,
|
|
- MTK_WED_WPDMA_RING_RX_DATA(idx) +
|
|
- MTK_WED_RING_OFS_CPU_IDX);
|
|
if (cur_idx == MTK_WED_RX_RING_SIZE - 1)
|
|
break;
|
|
|
|
@@ -610,12 +603,10 @@ mtk_wed_check_wfdma_rx_fill(struct mtk_w
|
|
|
|
if (i == 3) {
|
|
dev_err(dev->hw->dev, "rx dma enable failed\n");
|
|
- return;
|
|
+ return -ETIMEDOUT;
|
|
}
|
|
|
|
- val = wifi_r32(dev, dev->wlan.wpdma_rx_glo - dev->wlan.phy_base) |
|
|
- MTK_WFMDA_RX_DMA_EN;
|
|
- wifi_w32(dev, dev->wlan.wpdma_rx_glo - dev->wlan.phy_base, val);
|
|
+ return 0;
|
|
}
|
|
|
|
static void
|
|
@@ -1545,6 +1536,7 @@ mtk_wed_configure_irq(struct mtk_wed_dev
|
|
wed_w32(dev, MTK_WED_INT_MASK, irq_mask);
|
|
}
|
|
|
|
+#define MTK_WFMDA_RX_DMA_EN BIT(2)
|
|
static void
|
|
mtk_wed_dma_enable(struct mtk_wed_device *dev)
|
|
{
|
|
@@ -1632,8 +1624,26 @@ mtk_wed_dma_enable(struct mtk_wed_device
|
|
wdma_set(dev, MTK_WDMA_WRBK_TX_CFG, MTK_WDMA_WRBK_TX_CFG_WRBK_EN);
|
|
}
|
|
|
|
- for (i = 0; i < MTK_WED_RX_QUEUES; i++)
|
|
- mtk_wed_check_wfdma_rx_fill(dev, i);
|
|
+ for (i = 0; i < MTK_WED_RX_QUEUES; i++) {
|
|
+ struct mtk_wed_ring *ring = &dev->rx_ring[i];
|
|
+ u32 val;
|
|
+
|
|
+ if (!(ring->flags & MTK_WED_RING_CONFIGURED))
|
|
+ continue; /* queue is not configured by mt76 */
|
|
+
|
|
+ if (mtk_wed_check_wfdma_rx_fill(dev, ring)) {
|
|
+ dev_err(dev->hw->dev,
|
|
+ "rx_ring(%d) dma enable failed\n", i);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ val = wifi_r32(dev,
|
|
+ dev->wlan.wpdma_rx_glo -
|
|
+ dev->wlan.phy_base) | MTK_WFMDA_RX_DMA_EN;
|
|
+ wifi_w32(dev,
|
|
+ dev->wlan.wpdma_rx_glo - dev->wlan.phy_base,
|
|
+ val);
|
|
+ }
|
|
}
|
|
|
|
static void
|