Commit 4efcfd5c authored by Felix Fietkau's avatar Felix Fietkau

mt76: mt7615: load ROM patch before checking patch semaphore status

For MT7663, the availability of the patch files is used to detect, which
corresponding firmware is going to be used (AP firmware or STA offload
firmware). If the ROM patch was already applied, it could attempt to
load the wrong firmware (without considering the alternative).
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5c7d3744
...@@ -1341,25 +1341,26 @@ static int mt7615_load_patch(struct mt7615_dev *dev, u32 addr, const char *name) ...@@ -1341,25 +1341,26 @@ static int mt7615_load_patch(struct mt7615_dev *dev, u32 addr, const char *name)
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
int len, ret, sem; int len, ret, sem;
ret = firmware_request_nowarn(&fw, name, dev->mt76.dev);
if (ret)
return ret;
if (!fw || !fw->data || fw->size < sizeof(*hdr)) {
dev_err(dev->mt76.dev, "Invalid firmware\n");
ret = -EINVAL;
goto release_fw;
}
sem = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, true); sem = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, true);
switch (sem) { switch (sem) {
case PATCH_IS_DL: case PATCH_IS_DL:
return 0; goto release_fw;
case PATCH_NOT_DL_SEM_SUCCESS: case PATCH_NOT_DL_SEM_SUCCESS:
break; break;
default: default:
dev_err(dev->mt76.dev, "Failed to get patch semaphore\n"); dev_err(dev->mt76.dev, "Failed to get patch semaphore\n");
return -EAGAIN; ret = -EAGAIN;
} goto release_fw;
ret = firmware_request_nowarn(&fw, name, dev->mt76.dev);
if (ret)
goto out;
if (!fw || !fw->data || fw->size < sizeof(*hdr)) {
dev_err(dev->mt76.dev, "Invalid firmware\n");
ret = -EINVAL;
goto out;
} }
hdr = (const struct mt7615_patch_hdr *)(fw->data); hdr = (const struct mt7615_patch_hdr *)(fw->data);
...@@ -1388,8 +1389,6 @@ static int mt7615_load_patch(struct mt7615_dev *dev, u32 addr, const char *name) ...@@ -1388,8 +1389,6 @@ static int mt7615_load_patch(struct mt7615_dev *dev, u32 addr, const char *name)
dev_err(dev->mt76.dev, "Failed to start patch\n"); dev_err(dev->mt76.dev, "Failed to start patch\n");
out: out:
release_firmware(fw);
sem = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, false); sem = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, false);
switch (sem) { switch (sem) {
case PATCH_REL_SEM_SUCCESS: case PATCH_REL_SEM_SUCCESS:
...@@ -1400,6 +1399,9 @@ static int mt7615_load_patch(struct mt7615_dev *dev, u32 addr, const char *name) ...@@ -1400,6 +1399,9 @@ static int mt7615_load_patch(struct mt7615_dev *dev, u32 addr, const char *name)
break; break;
} }
release_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