This is a note to let you know that I've just added the patch titled
mt76: mt7921: continue to probe driver when fw already downloaded
to the 5.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mt76-mt7921-continue-to-probe-driver-when-fw-already-downloaded.patch
and it can be found in the queue-5.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c34269041185dad1bab7a34f42ef9fab967a1684 Mon Sep 17 00:00:00 2001
From: Aaron Ma <aaron.ma@xxxxxxxxxxxxx>
Date: Thu, 8 Jul 2021 21:17:10 +0800
Subject: mt76: mt7921: continue to probe driver when fw already downloaded
From: Aaron Ma <aaron.ma@xxxxxxxxxxxxx>
commit c34269041185dad1bab7a34f42ef9fab967a1684 upstream.
When reboot system, no power cycles, firmware is already downloaded,
return -EIO will break driver as error:
mt7921e: probe of 0000:03:00.0 failed with error -5
Skip firmware download and continue to probe.
Signed-off-by: Aaron Ma <aaron.ma@xxxxxxxxxxxxx>
Fixes: 1c099ab44727c ("mt76: mt7921: add MCU support")
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -921,7 +921,7 @@ static int mt7921_load_firmware(struct m
ret = mt76_get_field(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_N9_RDY);
if (ret) {
dev_dbg(dev->mt76.dev, "Firmware is already download\n");
- return -EIO;
+ goto fw_loaded;
}
ret = mt7921_load_patch(dev);
@@ -939,6 +939,7 @@ static int mt7921_load_firmware(struct m
return -EIO;
}
+fw_loaded:
mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[MT_MCUQ_FWDL], false);
#ifdef CONFIG_PM
Patches currently in stable-queue which might be from aaron.ma@xxxxxxxxxxxxx are
queue-5.13/mt76-mt7921-continue-to-probe-driver-when-fw-already-downloaded.patch
