| Message ID | 20210708131710.695595-1-aaron.ma@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | mt76: mt7921: continue to probe driver when fw already downloaded | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 8 Jul 2021 21:17:10 +0800 you wrote: > 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@canonical.com> > > [...] Here is the summary with links: - mt76: mt7921: continue to probe driver when fw already downloaded https://git.kernel.org/netdev/net/c/c34269041185 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index c2c4dc196802..cd690c64f65b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -931,7 +931,7 @@ static int mt7921_load_firmware(struct mt7921_dev *dev) 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); @@ -949,6 +949,7 @@ static int mt7921_load_firmware(struct mt7921_dev *dev) return -EIO; } +fw_loaded: mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[MT_MCUQ_FWDL], false); #ifdef CONFIG_PM
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@canonical.com> --- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)