wifi: mt76: mt7915: move wed init routines in mmio.c

This is a preliminary patch to enable wed support for mt7986-wmac
chipset.

Tested-by: Daniel Golle <daniel@makrotopia.org>
Co-developed-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
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: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
index 7bd5f6725d7b7b6de9874b1c6f53acd08d4e8592..e75f2229b6a1e67dac2c83327776134c4adcab9c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
@@ -10,6 +10,9 @@
 #include "mac.h"
 #include "../trace.h"
 
+static bool wed_enable;
+module_param(wed_enable, bool, 0644);
+
 static const u32 mt7915_reg[] = {
        [INT_SOURCE_CSR]        = 0xd7010,
        [INT_MASK_CSR]          = 0xd7014,
@@ -472,6 +475,94 @@ static u32 mt7915_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)
        return dev->bus_ops->rmw(mdev, addr, mask, val);
 }
 
+#ifdef CONFIG_NET_MEDIATEK_SOC_WED
+static int mt7915_mmio_wed_offload_enable(struct mtk_wed_device *wed)
+{
+       struct mt7915_dev *dev;
+       struct mt7915_phy *phy;
+       int ret;
+
+       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);
+
+       ret = wait_event_timeout(dev->mt76.tx_wait,
+                                !dev->mt76.wed_token_count, HZ);
+       if (!ret)
+               return -EAGAIN;
+
+       phy = &dev->phy;
+       mt76_set(dev, MT_AGG_ACR4(phy->band_idx), MT_AGG_ACR_PPDU_TXS2H);
+
+       phy = dev->mt76.phys[MT_BAND1] ? dev->mt76.phys[MT_BAND1]->priv : NULL;
+       if (phy)
+               mt76_set(dev, MT_AGG_ACR4(phy->band_idx),
+                        MT_AGG_ACR_PPDU_TXS2H);
+
+       return 0;
+}
+
+static void mt7915_mmio_wed_offload_disable(struct mtk_wed_device *wed)
+{
+       struct mt7915_dev *dev;
+       struct mt7915_phy *phy;
+
+       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);
+
+       /* MT_TXD5_TX_STATUS_HOST (MPDU format) has higher priority than
+        * MT_AGG_ACR_PPDU_TXS2H (PPDU format) even though ACR bit is set.
+        */
+       phy = &dev->phy;
+       mt76_clear(dev, MT_AGG_ACR4(phy->band_idx), MT_AGG_ACR_PPDU_TXS2H);
+
+       phy = dev->mt76.phys[MT_BAND1] ? dev->mt76.phys[MT_BAND1]->priv : NULL;
+       if (phy)
+               mt76_clear(dev, MT_AGG_ACR4(phy->band_idx),
+                          MT_AGG_ACR_PPDU_TXS2H);
+}
+#endif
+
+int mt7915_mmio_wed_init(struct mt7915_dev *dev, struct pci_dev *pdev,
+                        int *irq)
+{
+#ifdef CONFIG_NET_MEDIATEK_SOC_WED
+       struct mtk_wed_device *wed = &dev->mt76.mmio.wed;
+       int ret;
+
+       if (!wed_enable)
+               return 0;
+
+       wed->wlan.pci_dev = pdev;
+       wed->wlan.wpdma_phys = pci_resource_start(pdev, 0) +
+                              MT_WFDMA_EXT_CSR_BASE;
+       wed->wlan.nbuf = 4096;
+       wed->wlan.token_start = MT7915_TOKEN_SIZE - wed->wlan.nbuf;
+       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;
+
+       if (mtk_wed_device_attach(wed) != 0)
+               return 0;
+
+       *irq = wed->irq;
+       dev->mt76.dma_dev = wed->dev;
+
+       ret = dma_set_mask(wed->dev, DMA_BIT_MASK(32));
+       if (ret)
+               return ret;
+
+       return 1;
+#else
+       return 0;
+#endif
+}
+
 static int mt7915_mmio_init(struct mt76_dev *mdev,
                            void __iomem *mem_base,
                            u32 device_id)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index c90a148d6239e6804cb8856f3f722016d5378853..1c1e4058d04809a209be92f2277338d5b764f8fa 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -591,5 +591,7 @@ bool mt7915_debugfs_rx_log(struct mt7915_dev *dev, const void *data, int len);
 void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                            struct ieee80211_sta *sta, struct dentry *dir);
 #endif
+int mt7915_mmio_wed_init(struct mt7915_dev *dev, struct pci_dev *pdev,
+                        int *irq);
 
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
index 728a879c3b008fd6e56500e56efeb054d7b40052..d73b78bba3e5eadba72a3dbe35403c866eeb4591 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
@@ -12,9 +12,6 @@
 #include "mac.h"
 #include "../trace.h"
 
-static bool wed_enable = false;
-module_param(wed_enable, bool, 0644);
-
 static LIST_HEAD(hif_list);
 static DEFINE_SPINLOCK(hif_lock);
 static u32 hif_idx;
@@ -95,94 +92,6 @@ static int mt7915_pci_hif2_probe(struct pci_dev *pdev)
        return 0;
 }
 
-#ifdef CONFIG_NET_MEDIATEK_SOC_WED
-static int mt7915_wed_offload_enable(struct mtk_wed_device *wed)
-{
-       struct mt7915_dev *dev;
-       struct mt7915_phy *phy;
-       int ret;
-
-       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);
-
-       ret = wait_event_timeout(dev->mt76.tx_wait,
-                                !dev->mt76.wed_token_count, HZ);
-       if (!ret)
-               return -EAGAIN;
-
-       phy = &dev->phy;
-       mt76_set(dev, MT_AGG_ACR4(phy->band_idx), MT_AGG_ACR_PPDU_TXS2H);
-
-       phy = dev->mt76.phys[MT_BAND1] ? dev->mt76.phys[MT_BAND1]->priv : NULL;
-       if (phy)
-               mt76_set(dev, MT_AGG_ACR4(phy->band_idx),
-                        MT_AGG_ACR_PPDU_TXS2H);
-
-       return 0;
-}
-
-static void mt7915_wed_offload_disable(struct mtk_wed_device *wed)
-{
-       struct mt7915_dev *dev;
-       struct mt7915_phy *phy;
-
-       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);
-
-       /* MT_TXD5_TX_STATUS_HOST (MPDU format) has higher priority than
-        * MT_AGG_ACR_PPDU_TXS2H (PPDU format) even though ACR bit is set.
-        */
-       phy = &dev->phy;
-       mt76_clear(dev, MT_AGG_ACR4(phy->band_idx), MT_AGG_ACR_PPDU_TXS2H);
-
-       phy = dev->mt76.phys[MT_BAND1] ? dev->mt76.phys[MT_BAND1]->priv : NULL;
-       if (phy)
-               mt76_clear(dev, MT_AGG_ACR4(phy->band_idx),
-                          MT_AGG_ACR_PPDU_TXS2H);
-}
-#endif
-
-static int
-mt7915_pci_wed_init(struct mt7915_dev *dev, struct pci_dev *pdev, int *irq)
-{
-#ifdef CONFIG_NET_MEDIATEK_SOC_WED
-       struct mtk_wed_device *wed = &dev->mt76.mmio.wed;
-       int ret;
-
-       if (!wed_enable)
-               return 0;
-
-       wed->wlan.pci_dev = pdev;
-       wed->wlan.wpdma_phys = pci_resource_start(pdev, 0) +
-                              MT_WFDMA_EXT_CSR_BASE;
-       wed->wlan.nbuf = 4096;
-       wed->wlan.token_start = MT7915_TOKEN_SIZE - wed->wlan.nbuf;
-       wed->wlan.init_buf = mt7915_wed_init_buf;
-       wed->wlan.offload_enable = mt7915_wed_offload_enable;
-       wed->wlan.offload_disable = mt7915_wed_offload_disable;
-
-       if (mtk_wed_device_attach(wed) != 0)
-               return 0;
-
-       *irq = wed->irq;
-       dev->mt76.dma_dev = wed->dev;
-
-       ret = dma_set_mask(wed->dev, DMA_BIT_MASK(32));
-       if (ret)
-               return ret;
-
-       return 1;
-#else
-       return 0;
-#endif
-}
-
 static int mt7915_pci_probe(struct pci_dev *pdev,
                            const struct pci_device_id *id)
 {
@@ -220,7 +129,7 @@ static int mt7915_pci_probe(struct pci_dev *pdev,
        mt7915_wfsys_reset(dev);
        hif2 = mt7915_pci_init_hif2(pdev);
 
-       ret = mt7915_pci_wed_init(dev, pdev, &irq);
+       ret = mt7915_mmio_wed_init(dev, pdev, &irq);
        if (ret < 0)
                goto free_wed_or_irq_vector;