mt7603: improve reliability of the PSE reset

Signed-off-by: Felix Fietkau <nbd@nbd.name>
openwrt · Mar 21, 2017 · 38bae1d · 38bae1d
1 parent d1769e3
commit 38bae1d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mt7603_mac.c b/mt7603_mac.c
@@ -1013,9 +1013,13 @@ void mt7603_mac_reset(struct mt7603_dev *dev)
 	u32 addr = mt7603_reg_map(dev, MT_CLIENT_BASE_PHYS_ADDR);
 
 	/* Reset PSE */
+	mt76_clear(dev, MT_PSE_RESET, MT_PSE_RESET_SW_S);
 	mt76_set(dev, MT_PSE_RESET, MT_PSE_RESET_SW);
-	mt76_poll_msec(dev, MT_PSE_RESET, MT_PSE_RESET_SW_S,
-		       MT_PSE_RESET_SW_S, 500);
+	if (!mt76_poll_msec(dev, MT_PSE_RESET, MT_PSE_RESET_SW_S,
+			    MT_PSE_RESET_SW_S, 500)) {
+		mt76_clear(dev, MT_PSE_RESET, MT_PSE_RESET_SW);
+		return;
+	}
 	mt76_clear(dev, MT_PSE_RESET, MT_PSE_RESET_SW_S);
 
 	mt76_set(dev, addr + MT_CLIENT_RESET_TX, MT_CLIENT_RESET_TX_R_E_1);