wifi: mt76: move wed reset common code in mt76 module

Move WED reset code shared between mt7915 and mt7996 in common module.
This is a preliminary patch to introduce WED reset support for mt7996.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index 7c76afdaef681bab6ed38b0b7fd8050ab98103ca..f2532e67fa78bca78d003fdf9e0d3d309c6730f3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -1036,6 +1036,20 @@ void mt76_dma_attach(struct mt76_dev *dev)
 }
 EXPORT_SYMBOL_GPL(mt76_dma_attach);
 
+void mt76_dma_wed_reset(struct mt76_dev *dev)
+{
+       struct mt76_mmio *mmio = &dev->mmio;
+
+       if (!test_bit(MT76_STATE_WED_RESET, &dev->phy.state))
+               return;
+
+       complete(&mmio->wed_reset);
+
+       if (!wait_for_completion_timeout(&mmio->wed_reset_complete, 3 * HZ))
+               dev_err(dev->dev, "wed reset complete timeout\n");
+}
+EXPORT_SYMBOL_GPL(mt76_dma_wed_reset);
+
 void mt76_dma_cleanup(struct mt76_dev *dev)
 {
        int i;

diff --git a/drivers/net/wireless/mediatek/mt76/dma.h b/drivers/net/wireless/mediatek/mt76/dma.h
index e549e678b69f62d94ec121c2efb5973168e214a4..c60dfb817227b98a6d5658c8adcf9e9798d73c6b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.h
+++ b/drivers/net/wireless/mediatek/mt76/dma.h
@@ -78,6 +78,15 @@ int mt76_dma_rx_poll(struct napi_struct *napi, int budget);
 void mt76_dma_attach(struct mt76_dev *dev);
 void mt76_dma_cleanup(struct mt76_dev *dev);
 int mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q, bool reset);
+void mt76_dma_wed_reset(struct mt76_dev *dev);
+
+static inline void
+mt76_dma_reset_tx_queue(struct mt76_dev *dev, struct mt76_queue *q)
+{
+       dev->queue_ops->reset_q(dev, q);
+       if (mtk_wed_device_active(&dev->mmio.wed))
+               mt76_dma_wed_setup(dev, q, true);
+}
 
 static inline void
 mt76_dma_should_drop_buf(bool *drop, u32 ctrl, u32 buf1, u32 info)

diff --git a/drivers/net/wireless/mediatek/mt76/mmio.c b/drivers/net/wireless/mediatek/mt76/mmio.c
index c34624978a146fba142704b69ddb6ffec18d38b1..4a006409a3732f306a8074ffa9acc589c20dd38b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mmio.c
@@ -179,6 +179,14 @@ void mt76_mmio_wed_offload_disable(struct mtk_wed_device *wed)
        spin_unlock_bh(&dev->token_lock);
 }
 EXPORT_SYMBOL_GPL(mt76_mmio_wed_offload_disable);
+
+void mt76_mmio_wed_reset_complete(struct mtk_wed_device *wed)
+{
+       struct mt76_dev *dev = container_of(wed, struct mt76_dev, mmio.wed);
+
+       complete(&dev->mmio.wed_reset_complete);
+}
+EXPORT_SYMBOL_GPL(mt76_mmio_wed_reset_complete);
 #endif /*CONFIG_NET_MEDIATEK_SOC_WED */
 
 void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 7aac973723bcdc3a905ad37a7bb516f46c9271fa..36e54a32bd1f8e32ac097561a011916340e7c1e4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -1102,6 +1102,7 @@ u32 mt76_mmio_wed_init_rx_buf(struct mtk_wed_device *wed, int size);
 void mt76_mmio_wed_release_rx_buf(struct mtk_wed_device *wed);
 int mt76_mmio_wed_offload_enable(struct mtk_wed_device *wed);
 void mt76_mmio_wed_offload_disable(struct mtk_wed_device *wed);
+void mt76_mmio_wed_reset_complete(struct mtk_wed_device *wed);
 #endif /*CONFIG_NET_MEDIATEK_SOC_WED */
 
 #define mt76xx_chip(dev) mt76_chip(&((dev)->mt76))

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
index 1bceeb5227b12860ac8b06fc391da9dc7a47b519..c91a1c54027fa3503e83a5b84f6ec68fe0910fce 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
@@ -587,28 +587,6 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)
        return 0;
 }
 
-static void mt7915_dma_wed_reset(struct mt7915_dev *dev)
-{
-       struct mt76_dev *mdev = &dev->mt76;
-
-       if (!test_bit(MT76_STATE_WED_RESET, &dev->mphy.state))
-               return;
-
-       complete(&mdev->mmio.wed_reset);
-
-       if (!wait_for_completion_timeout(&dev->mt76.mmio.wed_reset_complete,
-                                        3 * HZ))
-               dev_err(dev->mt76.dev, "wed reset complete timeout\n");
-}
-
-static void
-mt7915_dma_reset_tx_queue(struct mt7915_dev *dev, struct mt76_queue *q)
-{
-       mt76_queue_reset(dev, q);
-       if (mtk_wed_device_active(&dev->mt76.mmio.wed))
-               mt76_dma_wed_setup(&dev->mt76, q, true);
-}
-
 int mt7915_dma_reset(struct mt7915_dev *dev, bool force)
 {
        struct mt76_phy *mphy_ext = dev->mt76.phys[MT_BAND1];
@@ -636,13 +614,13 @@ int mt7915_dma_reset(struct mt7915_dev *dev, bool force)
                mtk_wed_device_dma_reset(wed);
 
        mt7915_dma_disable(dev, force);
-       mt7915_dma_wed_reset(dev);
+       mt76_dma_wed_reset(&dev->mt76);
 
        /* reset hw queues */
        for (i = 0; i < __MT_TXQ_MAX; i++) {
-               mt7915_dma_reset_tx_queue(dev, dev->mphy.q_tx[i]);
+               mt76_dma_reset_tx_queue(&dev->mt76, dev->mphy.q_tx[i]);
                if (mphy_ext)
-                       mt7915_dma_reset_tx_queue(dev, mphy_ext->q_tx[i]);
+                       mt76_dma_reset_tx_queue(&dev->mt76, mphy_ext->q_tx[i]);
        }
 
        for (i = 0; i < __MT_MCUQ_MAX; i++)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
index 85cb3fed95057a5b5f87012a447d6defa4cd5c9b..c404c90b58a68bfbc4de6e6fd25bd22dff994db4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
@@ -595,13 +595,6 @@ out:
 
        return ret;
 }
-
-static void mt7915_mmio_wed_reset_complete(struct mtk_wed_device *wed)
-{
-       struct mt76_dev *dev = container_of(wed, struct mt76_dev, mmio.wed);
-
-       complete(&dev->mmio.wed_reset_complete);
-}
 #endif
 
 int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
@@ -685,7 +678,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
        wed->wlan.release_rx_buf = mt76_mmio_wed_release_rx_buf;
        wed->wlan.update_wo_rx_stats = mt7915_mmio_wed_update_rx_stats;
        wed->wlan.reset = mt7915_mmio_wed_reset;
-       wed->wlan.reset_complete = mt7915_mmio_wed_reset_complete;
+       wed->wlan.reset_complete = mt76_mmio_wed_reset_complete;
 
        dev->mt76.rx_token_size = wed->wlan.rx_npkt;