Skip to contentSkip to conversation

mt76: mt7615: retry if mt7615_mcu_init returns -EAGAIN

PATCH New Chuanhong Guo 1 participant 1 message Sep 23, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mt76: mt7615: retry if mt7615_mcu_init returns -EAGAIN

mt7615_load_patch in mt7615/mcu.c sometimes fails with:
mt7622-wmac 18000000.wmac: Failed to get patch semaphore and returns -EAGAIN. But this error is returned all the way up to mt7615_init_work with no actual retrial performed, leaving a broken wireless phy.
Wait a bit and retry for up to 10 times before giving up.

---
On my mt7622 board mt7615_load_patch always fails the first time and it then succeeded on the first retry added by this patch. "10 times" is an arbitarily picked value and it'll still leave a broken phy behind if all 10 retries failed. I don't know if that's okay. Suggestions are welcome!

 drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c +8 -1
index 7224a00782115..2272f6bcaafe7 100644
@@ -16,8 +16,15 @@ static void mt7615_init_work(struct work_struct *work)
 {
 	struct mt7615_dev *dev = container_of(work, struct mt7615_dev,
 					      mcu_work);
+	int i, ret;
 
-	if (mt7615_mcu_init(dev))
+	ret = mt7615_mcu_init(dev);
+	for (i = 0; (ret == -EAGAIN) && (i < 10); i++) {
+		msleep(200);
+		ret = mt7615_mcu_init(dev);
+	}
+
+	if (ret)
 		return;
 
 	mt7615_mcu_set_eeprom(dev);
Signature · 1 line
2.26.2