mt76: mt7921s: fix bus hang with wrong privilege

Accroding to chip hw flow, mt7921s need to re-acquire privilege
again before normal running. Otherwise, the bus may be stuck in
an abnormal status.

Tested-by: Leon Yen <Leon.Yen@mediatek.com>
Co-developed-by: Eric-SY Chang <Eric-SY.Chang@mediatek.com>
Signed-off-by: Eric-SY Chang <Eric-SY.Chang@mediatek.com>
Co-developed-by: YN Chen <YN.Chen@mediatek.com>
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>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 6ada1eb..1227d62 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -720,6 +720,17 @@ 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)
+                       return ret;
+
+               ret = __mt7921_mcu_drv_pmctrl(dev);
+               if (ret)
+                       return ret;
+       }
+
 out:
        sem = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, false);
        switch (sem) {