Commit a55a0c70 authored by YN Chen's avatar YN Chen Committed by Felix Fietkau

mt76: mt7921s: fix firmware download random fail

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

Fixes: 78b21758 ("mt76: mt7921s: fix bus hang with wrong privilege")
Signed-off-by: default avatarYN Chen <yn.chen@mediatek.com>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 45b6f9cb
...@@ -583,13 +583,6 @@ static int mt7921_load_patch(struct mt7921_dev *dev) ...@@ -583,13 +583,6 @@ static int mt7921_load_patch(struct mt7921_dev *dev)
if (ret) if (ret)
dev_err(dev->mt76.dev, "Failed to start patch\n"); 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: out:
sem = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, false); sem = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, false);
switch (sem) { switch (sem) {
...@@ -600,6 +593,14 @@ static int mt7921_load_patch(struct mt7921_dev *dev) ...@@ -600,6 +593,14 @@ static int mt7921_load_patch(struct mt7921_dev *dev)
dev_err(dev->mt76.dev, "Failed to release patch semaphore\n"); dev_err(dev->mt76.dev, "Failed to release patch semaphore\n");
break; 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); release_firmware(fw);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment