wifi: mt76: mt7921: move runtime-pm pci code in mt792x-lib

Move the following runtime-pm pci routines in mt792x-lib since they are
shared between mt7921 and mt7925 chipsets:
- __mt7921e_mcu_drv_pmctrl
- mt7921e_mcu_drv_pmctrl
- mt7921e_mcu_fw_pmctrl

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index c47fb07fcb2eaa5f09d781692316fdbfee26d4cc..3ff0205919c292e307251e3c54e556badf095877 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -128,7 +128,7 @@ static int mt7921_init_hardware(struct mt792x_dev *dev)
 
        set_bit(MT76_STATE_INITIALIZED, &dev->mphy.state);
 
-       for (i = 0; i < MT7921_MCU_INIT_RETRY_COUNT; i++) {
+       for (i = 0; i < MT792x_MCU_INIT_RETRY_COUNT; i++) {
                ret = __mt7921_init_hardware(dev);
                if (!ret)
                        break;
@@ -136,7 +136,7 @@ static int mt7921_init_hardware(struct mt792x_dev *dev)
                mt792x_init_reset(dev);
        }
 
-       if (i == MT7921_MCU_INIT_RETRY_COUNT) {
+       if (i == MT792x_MCU_INIT_RETRY_COUNT) {
                dev_err(dev->mt76.dev, "hardware init failed\n");
                return ret;
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 4a3416a287112bba143d548385e836277ec33f6e..0c60a15590417be9c6a07babcca6aff607acbc45 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -18,10 +18,6 @@
 #define MT7921_RX_RING_SIZE            1536
 #define MT7921_RX_MCU_RING_SIZE                512
 
-#define MT7921_DRV_OWN_RETRY_COUNT     10
-#define MT7921_MCU_INIT_RETRY_COUNT    10
-#define MT7921_WFSYS_INIT_RETRY_COUNT  2
-
 #define MT7921_FIRMWARE_WM             "mediatek/WIFI_RAM_CODE_MT7961_1.bin"
 #define MT7921_ROM_PATCH               "mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin"
 
@@ -312,9 +308,6 @@ int mt7921e_mcu_init(struct mt792x_dev *dev);
 int mt7921s_wfsys_reset(struct mt792x_dev *dev);
 int mt7921s_mac_reset(struct mt792x_dev *dev);
 int mt7921s_init_reset(struct mt792x_dev *dev);
-int __mt7921e_mcu_drv_pmctrl(struct mt792x_dev *dev);
-int mt7921e_mcu_drv_pmctrl(struct mt792x_dev *dev);
-int mt7921e_mcu_fw_pmctrl(struct mt792x_dev *dev);
 
 int mt7921s_mcu_init(struct mt792x_dev *dev);
 int mt7921s_mcu_drv_pmctrl(struct mt792x_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
index 7419076b77cb99ac7994aef20da88cad62b82cd4..c3f22ce9f5c46848bf180612f4751c3e4ba61178 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
@@ -181,8 +181,8 @@ static int mt7921_pci_probe(struct pci_dev *pdev,
                .init_reset = mt7921e_init_reset,
                .reset = mt7921e_mac_reset,
                .mcu_init = mt7921e_mcu_init,
-               .drv_own = mt7921e_mcu_drv_pmctrl,
-               .fw_own = mt7921e_mcu_fw_pmctrl,
+               .drv_own = mt792xe_mcu_drv_pmctrl,
+               .fw_own = mt792xe_mcu_fw_pmctrl,
        };
        static const struct mt792x_irq_map irq_map = {
                .host_irq_enable = MT_WFDMA0_HOST_INT_ENA,
@@ -268,11 +268,11 @@ static int mt7921_pci_probe(struct pci_dev *pdev,
        bus_ops->rmw = mt7921_rmw;
        dev->mt76.bus = bus_ops;
 
-       ret = mt7921e_mcu_fw_pmctrl(dev);
+       ret = mt792xe_mcu_fw_pmctrl(dev);
        if (ret)
                goto err_free_dev;
 
-       ret = __mt7921e_mcu_drv_pmctrl(dev);
+       ret = __mt792xe_mcu_drv_pmctrl(dev);
        if (ret)
                goto err_free_dev;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
index bd3f004d1a186f3cb6b10bd516086d9b434a6bc7..e7a995e7e70a33db803854bf2299e0b56fc41b9f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
@@ -57,7 +57,7 @@ int mt7921e_mac_reset(struct mt792x_dev *dev)
 {
        int i, err;
 
-       mt7921e_mcu_drv_pmctrl(dev);
+       mt792xe_mcu_drv_pmctrl(dev);
 
        mt76_connac_free_pending_tx_skbs(&dev->pm, NULL);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
index 57bd02746f5f5db144cf64d7b3c3e75296452dd1..4cf1f2f0f9688c31dbec85d73901de48ad43134b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
@@ -61,68 +61,3 @@ int mt7921e_mcu_init(struct mt792x_dev *dev)
 
        return err;
 }
-
-int __mt7921e_mcu_drv_pmctrl(struct mt792x_dev *dev)
-{
-       int i, err = 0;
-
-       for (i = 0; i < MT7921_DRV_OWN_RETRY_COUNT; i++) {
-               mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_CLR_OWN);
-               if (mt76_poll_msec_tick(dev, MT_CONN_ON_LPCTL,
-                                       PCIE_LPCR_HOST_OWN_SYNC, 0, 50, 1))
-                       break;
-       }
-
-       if (i == MT7921_DRV_OWN_RETRY_COUNT) {
-               dev_err(dev->mt76.dev, "driver own failed\n");
-               err = -EIO;
-       }
-
-       return err;
-}
-
-int mt7921e_mcu_drv_pmctrl(struct mt792x_dev *dev)
-{
-       struct mt76_phy *mphy = &dev->mt76.phy;
-       struct mt76_connac_pm *pm = &dev->pm;
-       int err;
-
-       err = __mt7921e_mcu_drv_pmctrl(dev);
-       if (err < 0)
-               goto out;
-
-       mt792x_wpdma_reinit_cond(dev);
-       clear_bit(MT76_STATE_PM, &mphy->state);
-
-       pm->stats.last_wake_event = jiffies;
-       pm->stats.doze_time += pm->stats.last_wake_event -
-                              pm->stats.last_doze_event;
-out:
-       return err;
-}
-
-int mt7921e_mcu_fw_pmctrl(struct mt792x_dev *dev)
-{
-       struct mt76_phy *mphy = &dev->mt76.phy;
-       struct mt76_connac_pm *pm = &dev->pm;
-       int i;
-
-       for (i = 0; i < MT7921_DRV_OWN_RETRY_COUNT; i++) {
-               mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_SET_OWN);
-               if (mt76_poll_msec_tick(dev, MT_CONN_ON_LPCTL,
-                                       PCIE_LPCR_HOST_OWN_SYNC, 4, 50, 1))
-                       break;
-       }
-
-       if (i == MT7921_DRV_OWN_RETRY_COUNT) {
-               dev_err(dev->mt76.dev, "firmware own failed\n");
-               clear_bit(MT76_STATE_PM, &mphy->state);
-               return -EIO;
-       }
-
-       pm->stats.last_doze_event = jiffies;
-       pm->stats.awake_time += pm->stats.last_doze_event -
-                               pm->stats.last_wake_event;
-
-       return 0;
-}

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c
index f612873c704bff99f4df73990d7ce08e8484c649..f7cb6c542af5483c396a050cddb29e39b5dd0b3b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c
@@ -166,7 +166,7 @@ int mt7921u_wfsys_reset(struct mt792x_dev *dev)
        mt7921u_uhw_wr(&dev->mt76, MT_CBTOP_RGU_WF_SUBSYS_RST, val);
 
        mt7921u_uhw_wr(&dev->mt76, MT_UDMA_CONN_INFRA_STATUS_SEL, 0);
-       for (i = 0; i < MT7921_WFSYS_INIT_RETRY_COUNT; i++) {
+       for (i = 0; i < MT792x_WFSYS_INIT_RETRY_COUNT; i++) {
                val = mt7921u_uhw_rr(&dev->mt76, MT_UDMA_CONN_INFRA_STATUS);
                if (val & MT_UDMA_CONN_WFSYS_INIT_DONE)
                        break;
@@ -174,7 +174,7 @@ int mt7921u_wfsys_reset(struct mt792x_dev *dev)
                msleep(100);
        }
 
-       if (i == MT7921_WFSYS_INIT_RETRY_COUNT)
+       if (i == MT792x_WFSYS_INIT_RETRY_COUNT)
                return -ETIMEDOUT;
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 470017f6f9829e742c148372a01b4994340455d2..54ff9627530f0937aba8b10febed6a32ddcd5003 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -26,6 +26,10 @@
 
 #define MT792x_WATCHDOG_TIME   (HZ / 4)
 
+#define MT792x_DRV_OWN_RETRY_COUNT     10
+#define MT792x_MCU_INIT_RETRY_COUNT    10
+#define MT792x_WFSYS_INIT_RETRY_COUNT  2
+
 struct mt792x_vif;
 struct mt792x_sta;
 
@@ -289,4 +293,8 @@ int mt792x_init_wcid(struct mt792x_dev *dev);
 int mt792x_mcu_drv_pmctrl(struct mt792x_dev *dev);
 int mt792x_mcu_fw_pmctrl(struct mt792x_dev *dev);
 
+int __mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev);
+int mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev);
+int mt792xe_mcu_fw_pmctrl(struct mt792x_dev *dev);
+
 #endif /* __MT7925_H */

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
index 234aac4e37425986e2811867eea737e3ee4bb804..f7dfc2189cc834413babfe880e07f81552d61609 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
@@ -736,5 +736,73 @@ out:
 }
 EXPORT_SYMBOL_GPL(mt792x_mcu_fw_pmctrl);
 
+int __mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev)
+{
+       int i, err = 0;
+
+       for (i = 0; i < MT792x_DRV_OWN_RETRY_COUNT; i++) {
+               mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_CLR_OWN);
+               if (mt76_poll_msec_tick(dev, MT_CONN_ON_LPCTL,
+                                       PCIE_LPCR_HOST_OWN_SYNC, 0, 50, 1))
+                       break;
+       }
+
+       if (i == MT792x_DRV_OWN_RETRY_COUNT) {
+               dev_err(dev->mt76.dev, "driver own failed\n");
+               err = -EIO;
+       }
+
+       return err;
+}
+EXPORT_SYMBOL_GPL(__mt792xe_mcu_drv_pmctrl);
+
+int mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev)
+{
+       struct mt76_phy *mphy = &dev->mt76.phy;
+       struct mt76_connac_pm *pm = &dev->pm;
+       int err;
+
+       err = __mt792xe_mcu_drv_pmctrl(dev);
+       if (err < 0)
+               goto out;
+
+       mt792x_wpdma_reinit_cond(dev);
+       clear_bit(MT76_STATE_PM, &mphy->state);
+
+       pm->stats.last_wake_event = jiffies;
+       pm->stats.doze_time += pm->stats.last_wake_event -
+                              pm->stats.last_doze_event;
+out:
+       return err;
+}
+EXPORT_SYMBOL_GPL(mt792xe_mcu_drv_pmctrl);
+
+int mt792xe_mcu_fw_pmctrl(struct mt792x_dev *dev)
+{
+       struct mt76_phy *mphy = &dev->mt76.phy;
+       struct mt76_connac_pm *pm = &dev->pm;
+       int i;
+
+       for (i = 0; i < MT792x_DRV_OWN_RETRY_COUNT; i++) {
+               mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_SET_OWN);
+               if (mt76_poll_msec_tick(dev, MT_CONN_ON_LPCTL,
+                                       PCIE_LPCR_HOST_OWN_SYNC, 4, 50, 1))
+                       break;
+       }
+
+       if (i == MT792x_DRV_OWN_RETRY_COUNT) {
+               dev_err(dev->mt76.dev, "firmware own failed\n");
+               clear_bit(MT76_STATE_PM, &mphy->state);
+               return -EIO;
+       }
+
+       pm->stats.last_doze_event = jiffies;
+       pm->stats.awake_time += pm->stats.last_doze_event -
+                               pm->stats.last_wake_event;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(mt792xe_mcu_fw_pmctrl);
+
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");