mirror of
https://github.com/outbackdingo/mt76.git
synced 2026-10-24 13:26:48 +00:00
mt76: mt7921s: fix firmware download random fail
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 <[email protected]>
Signed-off-by: Deren Wu <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
+8
-7
@@ -583,13 +583,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) {
|
||||
@@ -600,6 +593,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;
|
||||
|
||||
Reference in New Issue
Block a user