diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-02-06 09:57:47 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-02-06 10:00:23 -0500 |
| commit | 27e48a69995096472390d6e9a87d58502c88e47f (patch) | |
| tree | 6435386a09b0381e72ab9b42eacb6207cf0fc619 /ath9k_rx_dma_stop_check.patch | |
| parent | b34201959321fae31bad0eae7cd79289bf8d55f1 (diff) | |
| download | kernel-27e48a69995096472390d6e9a87d58502c88e47f.tar.gz kernel-27e48a69995096472390d6e9a87d58502c88e47f.tar.xz kernel-27e48a69995096472390d6e9a87d58502c88e47f.zip | |
Add patch to fix ath9k dma stop checks (rhbz 892811)
Diffstat (limited to 'ath9k_rx_dma_stop_check.patch')
| -rw-r--r-- | ath9k_rx_dma_stop_check.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/ath9k_rx_dma_stop_check.patch b/ath9k_rx_dma_stop_check.patch new file mode 100644 index 000000000..606eb1c63 --- /dev/null +++ b/ath9k_rx_dma_stop_check.patch @@ -0,0 +1,28 @@ +--- a/drivers/net/wireless/ath/ath9k/mac.c ++++ b/drivers/net/wireless/ath/ath9k/mac.c +@@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw + { + #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 */ +@@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw + } + + 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, |