ath9k_hw: check if the chip failed to wake up
authorFelix Fietkau <nbd@nbd.name>
Thu, 2 Feb 2017 09:14:51 +0000 (10:14 +0100)
committerKalle Valo <kvalo@qca.qualcomm.com>
Tue, 7 Feb 2017 09:00:21 +0000 (11:00 +0200)
In an RFC patch, Sven Eckelmann and Simon Wunderlich reported:

"QCA 802.11n chips (especially AR9330/AR9340) sometimes end up in a
state in which a read of AR_CFG always returns 0xdeadbeef.
This should not happen when when the power_mode of the device is
ATH9K_PM_AWAKE."

Include the check for the default register state in the existing MAC
hang check.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath9k/hw.c

index ac36873d6da4da9a5ee323ed2bebed45be2a5beb..8c5c2dd8fa7f13c4d12ebb98fa354deff212e124 100644 (file)
@@ -1603,6 +1603,10 @@ bool ath9k_hw_check_alive(struct ath_hw *ah)
        int count = 50;
        u32 reg, last_val;
 
+       /* Check if chip failed to wake up */
+       if (REG_READ(ah, AR_CFG) == 0xdeadbeef)
+               return false;
+
        if (AR_SREV_9300(ah))
                return !ath9k_hw_detect_mac_hang(ah);