mt76: mt7921: move mt7921_init_hw in a dedicated work

Firmware initialization can take a while. Move mt7921_init_hw routine in
a dedicated work in order to not slow down bootstrap process.

Tested-by: Deren Wu <deren.wu@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/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index ceb22653e4bbd7ecb0c5e5ab24fe2ba7c6d6e8c8..91fc41922d959d8a45fb71290d85456d3b9cae6f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -165,7 +165,7 @@ out:
 
 static int mt7921_init_hardware(struct mt7921_dev *dev)
 {
-       int ret, idx, i;
+       int ret, i;
 
        set_bit(MT76_STATE_INITIALIZED, &dev->mphy.state);
 
@@ -182,6 +182,13 @@ static int mt7921_init_hardware(struct mt7921_dev *dev)
                return ret;
        }
 
+       return 0;
+}
+
+static int mt7921_init_wcid(struct mt7921_dev *dev)
+{
+       int idx;
+
        /* Beacon and mgmt frames should occupy wcid 0 */
        idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7921_WTBL_STA - 1);
        if (idx)
@@ -195,6 +202,38 @@ static int mt7921_init_hardware(struct mt7921_dev *dev)
        return 0;
 }
 
+static void mt7921_init_work(struct work_struct *work)
+{
+       struct mt7921_dev *dev = container_of(work, struct mt7921_dev,
+                                             init_work);
+       int ret;
+
+       ret = mt7921_init_hardware(dev);
+       if (ret)
+               return;
+
+       mt76_set_stream_caps(&dev->mphy, true);
+       mt7921_set_stream_he_caps(&dev->phy);
+
+       ret = mt76_register_device(&dev->mt76, true, mt76_rates,
+                                  ARRAY_SIZE(mt76_rates));
+       if (ret) {
+               dev_err(dev->mt76.dev, "register device failed\n");
+               return;
+       }
+
+       ret = mt7921_init_debugfs(dev);
+       if (ret) {
+               dev_err(dev->mt76.dev, "register debugfs failed\n");
+               return;
+       }
+
+       /* we support chip reset now */
+       dev->hw_init_done = true;
+
+       mt76_connac_mcu_set_deep_sleep(&dev->mt76, dev->pm.ds_enable);
+}
+
 int mt7921_register_device(struct mt7921_dev *dev)
 {
        struct ieee80211_hw *hw = mt76_hw(dev);
@@ -222,6 +261,7 @@ int mt7921_register_device(struct mt7921_dev *dev)
        spin_lock_init(&dev->sta_poll_lock);
 
        INIT_WORK(&dev->reset_work, mt7921_mac_reset_work);
+       INIT_WORK(&dev->init_work, mt7921_init_work);
 
        dev->pm.idle_timeout = MT7921_PM_TIMEOUT;
        dev->pm.stats.last_wake_event = jiffies;
@@ -236,7 +276,7 @@ int mt7921_register_device(struct mt7921_dev *dev)
        if (!mt76_is_mmio(&dev->mt76))
                hw->extra_tx_headroom += MT_SDIO_TXD_SIZE + MT_SDIO_HDR_SIZE;
 
-       ret = mt7921_init_hardware(dev);
+       ret = mt7921_init_wcid(dev);
        if (ret)
                return ret;
 
@@ -264,23 +304,7 @@ int mt7921_register_device(struct mt7921_dev *dev)
        dev->mphy.hw->wiphy->available_antennas_rx = dev->mphy.chainmask;
        dev->mphy.hw->wiphy->available_antennas_tx = dev->mphy.chainmask;
 
-       mt76_set_stream_caps(&dev->mphy, true);
-       mt7921_set_stream_he_caps(&dev->phy);
-
-       ret = mt76_register_device(&dev->mt76, true, mt76_rates,
-                                  ARRAY_SIZE(mt76_rates));
-       if (ret)
-               return ret;
-
-       ret = mt7921_init_debugfs(dev);
-       if (ret)
-               return ret;
-
-       ret = mt76_connac_mcu_set_deep_sleep(&dev->mt76, dev->pm.ds_enable);
-       if (ret)
-               return ret;
-
-       dev->hw_init_done = true;
+       queue_work(system_wq, &dev->init_work);
 
        return 0;
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 1ea781429d49d7d1d856f9a537169dddccd532a5..7690364bc079b3302e0713700cc0d1c5ceb70b8b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -205,6 +205,8 @@ struct mt7921_dev {
        struct list_head sta_poll_list;
        spinlock_t sta_poll_lock;
 
+       struct work_struct init_work;
+
        u8 fw_debug;
 
        struct mt76_connac_pm pm;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
index a0c82d19c4d9b05e87b9cfd346e865be2a897c8a..1a01d025bbe59d1134509d2abb846e8e297faa61 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
@@ -105,6 +105,7 @@ static void mt7921e_unregister_device(struct mt7921_dev *dev)
        int i;
        struct mt76_connac_pm *pm = &dev->pm;
 
+       cancel_work_sync(&dev->init_work);
        mt76_unregister_device(&dev->mt76);
        mt76_for_each_q_rx(&dev->mt76, i)
                napi_disable(&dev->mt76.napi[i]);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
index 9b2bc0b11492e3a91ef54f0d3a69b117f3ead84e..af26d59fa2f04463c4ee4c74016725bc3138836d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
@@ -41,6 +41,7 @@ static void mt7921s_unregister_device(struct mt7921_dev *dev)
 {
        struct mt76_connac_pm *pm = &dev->pm;
 
+       cancel_work_sync(&dev->init_work);
        mt76_unregister_device(&dev->mt76);
        cancel_delayed_work_sync(&pm->ps_work);
        cancel_work_sync(&pm->wake_work);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
index 0f99d059d3191cf1f40b16a4d304183bcab57aba..b7771e9f1fcd0e7243179687bc8d31c1114a86ac 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
@@ -275,6 +275,7 @@ static void mt7921u_disconnect(struct usb_interface *usb_intf)
 {
        struct mt7921_dev *dev = usb_get_intfdata(usb_intf);
 
+       cancel_work_sync(&dev->init_work);
        if (!test_bit(MT76_STATE_INITIALIZED, &dev->mphy.state))
                return;