Commit 0253429b authored by Felix Fietkau's avatar Felix Fietkau Committed by Ben Hutchings

ath9k: fix DMA stop sequence for AR9003+

commit 300f77c0 upstream.

AR93xx and newer needs to stop rx before tx to avoid getting the DMA
engine or MAC into a stuck state.
This should reduce/fix the occurence of "Failed to stop Tx DMA" logspam.
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
[bwh: Backported to 3.2:
 - Also move initialisation of ret to match upstream
 - ath_drain_all_txq() takes a second parameter]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent a3602c4c
......@@ -235,7 +235,7 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
{
struct ath_hw *ah = sc->sc_ah;
struct ath_common *common = ath9k_hw_common(ah);
bool ret;
bool ret = true;
ieee80211_stop_queues(sc->hw);
......@@ -245,10 +245,13 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
ath9k_debug_samp_bb_mac(sc);
ath9k_hw_disable_interrupts(ah);
ret = ath_drain_all_txq(sc, retry_tx);
if (!ath_stoprecv(sc))
ret = false;
if (AR_SREV_9300_20_OR_LATER(ah)) {
ret &= ath_stoprecv(sc);
ret &= ath_drain_all_txq(sc, retry_tx);
} else {
ret &= ath_drain_all_txq(sc, retry_tx);
ret &= ath_stoprecv(sc);
}
if (!flush) {
if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment