ath9k: Fix TX queue draining
When TX DMA termination has failed, the HW has to be reset completely. Doing a fast channel change in this case is insufficient. Also, change the debug level of a couple of messages to FATAL. Cc: stable@kernel.org Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
17b182e3db
commit
e8009e9850
|
@ -186,7 +186,7 @@ bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q)
|
||||||
wait = wait_time;
|
wait = wait_time;
|
||||||
while (ath9k_hw_numtxpending(ah, q)) {
|
while (ath9k_hw_numtxpending(ah, q)) {
|
||||||
if ((--wait) == 0) {
|
if ((--wait) == 0) {
|
||||||
ath_print(common, ATH_DBG_QUEUE,
|
ath_print(common, ATH_DBG_FATAL,
|
||||||
"Failed to stop TX DMA in 100 "
|
"Failed to stop TX DMA in 100 "
|
||||||
"msec after killing last frame\n");
|
"msec after killing last frame\n");
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1108,11 +1108,11 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
|
||||||
if (npend) {
|
if (npend) {
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
ath_print(common, ATH_DBG_XMIT,
|
ath_print(common, ATH_DBG_FATAL,
|
||||||
"Unable to stop TxDMA. Reset HAL!\n");
|
"Unable to stop TxDMA. Reset HAL!\n");
|
||||||
|
|
||||||
spin_lock_bh(&sc->sc_resetlock);
|
spin_lock_bh(&sc->sc_resetlock);
|
||||||
r = ath9k_hw_reset(ah, sc->sc_ah->curchan, true);
|
r = ath9k_hw_reset(ah, sc->sc_ah->curchan, false);
|
||||||
if (r)
|
if (r)
|
||||||
ath_print(common, ATH_DBG_FATAL,
|
ath_print(common, ATH_DBG_FATAL,
|
||||||
"Unable to reset hardware; reset status %d\n",
|
"Unable to reset hardware; reset status %d\n",
|
||||||
|
|
Reference in New Issue