ath9k: rx dma stop check

diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index bba85d1a6cd1bc44852d1845bede4918bc2b5ec7..ebbee8f1713007a695317ffe4967bb1a25210221 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -693,7 +693,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
 {
 #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
        struct ath_common *common = ath9k_hw_common(ah);
-       u32 mac_status, last_mac_status = 0;
+       u32 mac_status = 0, last_mac_status = 0;
        int i;
 
        /* Enable access to the DMA observation bus */
@@ -723,6 +723,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
        }
 
        if (i == 0) {
+               if (!AR_SREV_9300_20_OR_LATER(ah) &&
+                   (mac_status & 0x700) == 0) {
+                       /*
+                        * DMA is idle but the MAC is still stuck
+                        * processing events
+                        */
+                       *reset = true;
+                       return true;
+               }
+
                ath_err(common,
                        "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
                        AH_RX_STOP_DMA_TIMEOUT / 1000,