wifi: mt76: mt7921e: fix race issue between reset and suspend/resume

[ Upstream commit ff6c4a6449793e9718ef2e9ad46864b63022648e ]

It is unexpected that the reset work is running simultaneously with
the suspend or resume context and it is possible that reset work is still
running even after mt7921 is suspended if we don't fix the race issue.

Thus, the suspend procedure should be waiting until the reset is completed
at the beginning and ignore the subsequent the reset requests.

In case there is an error that happens during either suspend or resume
handler, we will schedule a reset task to recover the error before
returning the error code to ensure we can immediately fix the error there.

Fixes: 0c1ce9884607 ("mt76: mt7921: add wifi reset support")
Co-developed-by: YN Chen <YN.Chen@mediatek.com>
Signed-off-by: YN Chen <YN.Chen@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 47f0aa81ab0280d323a84ec773e210ecde8f2b79..6bd9fc9228a27320b6979361900192811d3a93cc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -780,6 +780,7 @@ void mt7921_mac_reset_work(struct work_struct *work)
 void mt7921_reset(struct mt76_dev *mdev)
 {
        struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);
+       struct mt76_connac_pm *pm = &dev->pm;
 
        if (!dev->hw_init_done)
                return;
@@ -787,8 +788,12 @@ void mt7921_reset(struct mt76_dev *mdev)
        if (dev->hw_full_reset)
                return;
 
+       if (pm->suspended)
+               return;
+
        queue_work(dev->mt76.wq, &dev->reset_work);
 }
+EXPORT_SYMBOL_GPL(mt7921_reset);
 
 void mt7921_mac_update_mib_stats(struct mt7921_phy *phy)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
index ea3069d18c35f3c4efe062004414e5aa2f57dc39..2b015dacbba2241a9e72cdb09a44c8dedf0b690b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
@@ -367,6 +367,7 @@ static int mt7921_pci_suspend(struct device *device)
        int i, err;
 
        pm->suspended = true;
+       flush_work(&dev->reset_work);
        cancel_delayed_work_sync(&pm->ps_work);
        cancel_work_sync(&pm->wake_work);
 
@@ -428,6 +429,9 @@ restore_napi:
 restore_suspend:
        pm->suspended = false;
 
+       if (err < 0)
+               mt7921_reset(&dev->mt76);
+
        return err;
 }
 
@@ -441,7 +445,7 @@ static int mt7921_pci_resume(struct device *device)
 
        err = mt7921_mcu_drv_pmctrl(dev);
        if (err < 0)
-               return err;
+               goto failed;
 
        mt7921_wpdma_reinit_cond(dev);
 
@@ -471,11 +475,12 @@ static int mt7921_pci_resume(struct device *device)
                mt76_connac_mcu_set_deep_sleep(&dev->mt76, false);
 
        err = mt76_connac_mcu_set_hif_suspend(mdev, false);
-       if (err)
-               return err;
-
+failed:
        pm->suspended = false;
 
+       if (err < 0)
+               mt7921_reset(&dev->mt76);
+
        return err;
 }