wifi: mt76: move mt76_mmio_wed_offload_{enable,disable} in common code

mt76_mmio_wed_offload_enable and mt76_mmio_wed_offload_disable routines
will be reused by mt7996 driver for wed support.

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

diff --git a/drivers/net/wireless/mediatek/mt76/mmio.c b/drivers/net/wireless/mediatek/mt76/mmio.c
index 350650a..c346249 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mmio.c
@@ -157,6 +157,28 @@ unmap:
        return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(mt76_mmio_wed_init_rx_buf);
+
+int mt76_mmio_wed_offload_enable(struct mtk_wed_device *wed)
+{
+       struct mt76_dev *dev = container_of(wed, struct mt76_dev, mmio.wed);
+
+       spin_lock_bh(&dev->token_lock);
+       dev->token_size = wed->wlan.token_start;
+       spin_unlock_bh(&dev->token_lock);
+
+       return !wait_event_timeout(dev->tx_wait, !dev->wed_token_count, HZ);
+}
+EXPORT_SYMBOL_GPL(mt76_mmio_wed_offload_enable);
+
+void mt76_mmio_wed_offload_disable(struct mtk_wed_device *wed)
+{
+       struct mt76_dev *dev = container_of(wed, struct mt76_dev, mmio.wed);
+
+       spin_lock_bh(&dev->token_lock);
+       dev->token_size = dev->drv->token_size;
+       spin_unlock_bh(&dev->token_lock);
+}
+EXPORT_SYMBOL_GPL(mt76_mmio_wed_offload_disable);
 #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 5dd6b99..a1809a6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -1060,6 +1060,8 @@ static inline u16 mt76_rev(struct mt76_dev *dev)
 #ifdef CONFIG_NET_MEDIATEK_SOC_WED
 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);
 #endif /*CONFIG_NET_MEDIATEK_SOC_WED */
 
 #define mt76xx_chip(dev) mt76_chip(&((dev)->mt76))

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
index 1621a81..85cb3fe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
@@ -542,31 +542,6 @@ static u32 mt7915_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)
 }
 
 #ifdef CONFIG_NET_MEDIATEK_SOC_WED
-static int mt7915_mmio_wed_offload_enable(struct mtk_wed_device *wed)
-{
-       struct mt7915_dev *dev;
-
-       dev = container_of(wed, struct mt7915_dev, mt76.mmio.wed);
-
-       spin_lock_bh(&dev->mt76.token_lock);
-       dev->mt76.token_size = wed->wlan.token_start;
-       spin_unlock_bh(&dev->mt76.token_lock);
-
-       return !wait_event_timeout(dev->mt76.tx_wait,
-                                  !dev->mt76.wed_token_count, HZ);
-}
-
-static void mt7915_mmio_wed_offload_disable(struct mtk_wed_device *wed)
-{
-       struct mt7915_dev *dev;
-
-       dev = container_of(wed, struct mt7915_dev, mt76.mmio.wed);
-
-       spin_lock_bh(&dev->mt76.token_lock);
-       dev->mt76.token_size = MT7915_TOKEN_SIZE;
-       spin_unlock_bh(&dev->mt76.token_lock);
-}
-
 static void mt7915_mmio_wed_update_rx_stats(struct mtk_wed_device *wed,
                                            struct mtk_wed_wo_rx_stats *stats)
 {
@@ -704,8 +679,8 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
        }
 
        wed->wlan.init_buf = mt7915_wed_init_buf;
-       wed->wlan.offload_enable = mt7915_mmio_wed_offload_enable;
-       wed->wlan.offload_disable = mt7915_mmio_wed_offload_disable;
+       wed->wlan.offload_enable = mt76_mmio_wed_offload_enable;
+       wed->wlan.offload_disable = mt76_mmio_wed_offload_disable;
        wed->wlan.init_rx_buf = mt76_mmio_wed_init_rx_buf;
        wed->wlan.release_rx_buf = mt76_mmio_wed_release_rx_buf;
        wed->wlan.update_wo_rx_stats = mt7915_mmio_wed_update_rx_stats;