mt76: mt7921s: fix firmware download random fail

[ Upstream commit a55a0c701c129f8e448f0ec1eb811dba728ace64 ]

To avoid racing problems in chip, mt7921s should reacquire drv-own after
firmware semaphore is released.

Fixes: 78b217580c509 ("mt76: mt7921s: fix bus hang with wrong privilege")
Signed-off-by: YN Chen <yn.chen@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@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/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index da2be050ed7c48ead82849eae8110005b79a81f0..2a609b25561c7a3c48f537e5149a5c3a758bff73 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -538,13 +538,6 @@ static int mt7921_load_patch(struct mt7921_dev *dev)
        if (ret)
                dev_err(dev->mt76.dev, "Failed to start patch\n");
 
-       if (mt76_is_sdio(&dev->mt76)) {
-               /* activate again */
-               ret = __mt7921_mcu_fw_pmctrl(dev);
-               if (!ret)
-                       ret = __mt7921_mcu_drv_pmctrl(dev);
-       }
-
 out:
        sem = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, false);
        switch (sem) {
@@ -555,6 +548,14 @@ out:
                dev_err(dev->mt76.dev, "Failed to release patch semaphore\n");
                break;
        }
+
+       if (!ret && mt76_is_sdio(&dev->mt76)) {
+               /* activate again */
+               ret = __mt7921_mcu_fw_pmctrl(dev);
+               if (!ret)
+                       ret = __mt7921_mcu_drv_pmctrl(dev);
+       }
+
        release_firmware(fw);
 
        return ret;