2012-07-15 01:48:49 +08:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/mac.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/mac.c
|
2013-12-15 01:07:08 +08:00
|
|
|
@@ -700,7 +700,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
|
2012-07-15 23:20:26 +08:00
|
|
|
{
|
|
|
|
|
#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 */
|
2013-12-15 01:07:08 +08:00
|
|
|
@@ -730,6 +730,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
|
2012-07-15 01:48:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i == 0) {
|
2012-07-15 23:20:26 +08:00
|
|
|
+ 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;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
2012-07-15 01:48:49 +08:00
|
|
|
ath_err(common,
|
|
|
|
|
"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
|
2012-07-15 23:20:26 +08:00
|
|
|
AH_RX_STOP_DMA_TIMEOUT / 1000,
|
