ath9k_hw: fix stopping rx DMA during resets
PATCH v2 1/1 ath9k_hw: fix stopping rx DMA during resets
During PHY errors, the MAC can sometimes fail to enter an idle state on older hardware (before AR9380) after an rx stop has been requested.
This typically shows up in the kernel log with messages like these:
ath: Could not stop RX, we could be confusing the DMA engine when we start RX up
------------[ cut here ]------------ WARNING: at drivers/net/wireless/ath/ath9k/recv.c:504 ath_stoprecv+0xcc/0xf0 [ath9k]() Call Trace: [<8023f0e8>] dump_stack+0x8/0x34 [<80075050>] warn_slowpath_common+0x78/0xa4 [<80075094>] warn_slowpath_null+0x18/0x24 [<80d66d60>] ath_stoprecv+0xcc/0xf0 [ath9k] [<80d642cc>] ath_set_channel+0xbc/0x270 [ath9k] [<80d65254>] ath_radio_disable+0x4a4/0x7fc [ath9k]
When this happens, the state that the MAC enters is easy to identify and does not result in bogus DMA traffic, however to ensure a working state after a channel change, the hardware should still be reset.
This patch adds detection for this specific MAC state, after which the above warnings completely disappear in my tests.
---
v2: remove a redundant ath9k_hw_stopdmarecv call, print the MAC DMA state when the error still occurs
drivers/net/wireless/ath/ath9k/hw.c | 9 --------- drivers/net/wireless/ath/ath9k/mac.c | 25 ++++++++++++++++++++++--- drivers/net/wireless/ath/ath9k/mac.h | 2 +- drivers/net/wireless/ath/ath9k/recv.c | 6 +++--- 4 files changed, 26 insertions(+), 16 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +0 -8
@@ -1249,15 +1249,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, ah->txchainmask = common->tx_chainmask; ah->rxchainmask = common->rx_chainmask; - if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) { -ath9k_hw_abortpcurecv (ah); -if (!ath9k_hw_stopdmarecv (ah)) { -ath_dbg (common,ATH_DBG_XMIT , -"Failed to stop receive dma\n" ); - bChannelChange = false; - } - } -if (!ath9k_hw_setpower (ah,ATH9K_PM_AWAKE ))return -EIO ; diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 6f431cb..1968c67 100644
drivers/net/wireless/ath/ath9k/mac.c +21 -2
@@ -710,27 +710,46 @@ void ath9k_hw_abortpcurecv(struct ath_hw *ah) }EXPORT_SYMBOL (ath9k_hw_abortpcurecv); -bool ath9k_hw_stopdmarecv(struct ath_hw *ah) +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 ;int i; +/* Enable access to the DMA observation bus */ +REG_WRITE (ah,AR_MACMISC , + ((AR_MACMISC_DMA_OBS_LINE_8 <<AR_MACMISC_DMA_OBS_S ) | + (AR_MACMISC_MISC_OBS_BUS_1 << +AR_MACMISC_MISC_OBS_BUS_MSB_S ))); +REG_WRITE (ah,AR_CR ,AR_CR_RXD );/* Wait for rx enable bit to go low */ for (i =AH_RX_STOP_DMA_TIMEOUT /AH_TIME_QUANTUM ; i !=0 ; i--) {if ((REG_READ (ah,AR_CR ) &AR_CR_RXE ) ==0 )break ; + +if (!AR_SREV_9300_20_OR_LATER (ah)) { + mac_status =REG_READ (ah,AR_DMADBG_7 ) &0x7f0 ; +if (mac_status ==0x1c0 && mac_status == last_mac_status) { + *reset = true; +break ; + } + + last_mac_status = mac_status; + } +udelay (AH_TIME_QUANTUM ); }if (i ==0 ) {ath_err (common, -"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n" , +"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 ,REG_READ (ah,AR_CR ), -REG_READ (ah,AR_DIAG_SW )); +REG_READ (ah,AR_DIAG_SW ), +REG_READ (ah,AR_DMADBG_7 ));return false; }else {return true;
drivers/net/wireless/ath/ath9k/mac.h +1 -1
@@ -695,7 +695,7 @@ bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set);void ath9k_hw_putrxbuf (struct ath_hw *ah,u32 rxdp);void ath9k_hw_startpcureceive (struct ath_hw *ah,bool is_scanning);void ath9k_hw_abortpcurecv (struct ath_hw *ah); -bool ath9k_hw_stopdmarecv (struct ath_hw *ah); +bool ath9k_hw_stopdmarecv (struct ath_hw *ah,bool *reset);int ath9k_hw_beaconq_setup (struct ath_hw *ah);/* Interrupt Handling */
drivers/net/wireless/ath/ath9k/recv.c +3 -3
@@ -483,12 +483,12 @@ start_recv:bool ath_stoprecv (struct ath_softc *sc) {struct ath_hw *ah = sc->sc_ah; -bool stopped; +bool stopped, reset = false;spin_lock_bh (&sc->rx.rxbuflock);ath9k_hw_abortpcurecv (ah);ath9k_hw_setrxfilter (ah,0 ); - stopped =ath9k_hw_stopdmarecv (ah); + stopped =ath9k_hw_stopdmarecv (ah, &reset);if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_EDMA )ath_edma_stop_recv (sc);
@@ -503,7 +503,7 @@ bool ath_stoprecv(struct ath_softc *sc) "confusing the DMA engine when we start RX up\n");ATH_DBG_WARN_ON_ONCE (!stopped); } -return stopped; +return stopped || reset; }void ath_flushrecv (struct ath_softc *sc)
Signature · 1 line
1.7.3.2
Quoted 41 lines · Felix Fietkau
During PHY errors, the MAC can sometimes fail to enter an idle state on older hardware (before AR9380) after an rx stop has been requested.
This typically shows up in the kernel log with messages like these:
ath: Could not stop RX, we could be confusing the DMA engine when we start RX up
------------[ cut here ]------------ WARNING: at drivers/net/wireless/ath/ath9k/recv.c:504 ath_stoprecv+0xcc/0xf0 [ath9k]() Call Trace: [<8023f0e8>] dump_stack+0x8/0x34 [<80075050>] warn_slowpath_common+0x78/0xa4 [<80075094>] warn_slowpath_null+0x18/0x24 [<80d66d60>] ath_stoprecv+0xcc/0xf0 [ath9k] [<80d642cc>] ath_set_channel+0xbc/0x270 [ath9k] [<80d65254>] ath_radio_disable+0x4a4/0x7fc [ath9k]When this happens, the state that the MAC enters is easy to identify and does not result in bogus DMA traffic, however to ensure a working state after a channel change, the hardware should still be reset.
This patch adds detection for this specific MAC state, after which the above warnings completely disappear in my tests.
Signed-off-by Felix Fietkau <[email protected]>Cc Kyungwan Nam <[email protected]>---
v2: remove a redundantath9k_hw_stopdmarecvcall, print the MAC DMA state when the error still occursdrivers/net/wireless/ath/ath9k/hw.c | 9 --------- drivers/net/wireless/ath/ath9k/mac.c | 25 ++++++++++++++++++++++--- drivers/net/wireless/ath/ath9k/mac.h | 2 +- drivers/net/wireless/ath/ath9k/recv.c | 6 +++--- 4 files changed, 26 insertions(+), 16 deletions(-)drivers/net/wireless/ath/ath9k/hw.c +0
-0
drivers/net/wireless/ath/ath9k/hw.c int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, · line 1251
Quoted 3 lines
drivers/net/wireless/ath/ath9k/hw.c +0
-0@@ -1249,15 +1249,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, ah->txchainmask = common->tx_chainmask; ah->rxchainmask = common->rx_chainmask; - if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) {
This patch seems a bit busted...? I tried to fix it up manually but the errors just keep coming...
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
Quoted 46 lines · John W. Linville
Quoted 36 lines · Felix Fietkau
During PHY errors, the MAC can sometimes fail to enter an idle state on older hardware (before AR9380) after an rx stop has been requested.
This typically shows up in the kernel log with messages like these:
ath: Could not stop RX, we could be confusing the DMA engine when we start RX up
------------[ cut here ]------------ WARNING: at drivers/net/wireless/ath/ath9k/recv.c:504 ath_stoprecv+0xcc/0xf0 [ath9k]() Call Trace: [<8023f0e8>] dump_stack+0x8/0x34 [<80075050>] warn_slowpath_common+0x78/0xa4 [<80075094>] warn_slowpath_null+0x18/0x24 [<80d66d60>] ath_stoprecv+0xcc/0xf0 [ath9k] [<80d642cc>] ath_set_channel+0xbc/0x270 [ath9k] [<80d65254>] ath_radio_disable+0x4a4/0x7fc [ath9k]When this happens, the state that the MAC enters is easy to identify and does not result in bogus DMA traffic, however to ensure a working state after a channel change, the hardware should still be reset.
This patch adds detection for this specific MAC state, after which the above warnings completely disappear in my tests.
Signed-off-by Felix Fietkau<[email protected]>Cc Kyungwan Nam<[email protected]>---
v2: remove a redundantath9k_hw_stopdmarecvcall, print the MAC DMA state when the error still occursdrivers/net/wireless/ath/ath9k/hw.c | 9 --------- drivers/net/wireless/ath/ath9k/mac.c | 25 ++++++++++++++++++++++--- drivers/net/wireless/ath/ath9k/mac.h | 2 +- drivers/net/wireless/ath/ath9k/recv.c | 6 +++--- 4 files changed, 26 insertions(+), 16 deletions(-)Quoted 8 lines
diff --git
a/drivers/net/wireless/ath/ath9k/hw.cb/drivers/net/wireless/ath/ath9k/hw.cindex 1b5bd13..c8a2d0d 100644
---a/drivers/net/wireless/ath/ath9k/hw.c
+++b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1249,15 +1249,6 @@ int ath9k_hw_reset(structath_hw*ah, structath9k_channel*chan,
ah->txchainmask=common->tx_chainmask;
ah->rxchainmask=common->rx_chainmask;
- if ((common->bus_ops->ath_bus_type!= ATH_USB)&& !ah->chip_fullsleep) {
Quoted 2 lines
This patch seems a bit busted...? I tried to fix it up manually but the errors just keep coming...
Hm, you're right. No idea what my email client did there. I'll resend...
- Felix
PATCH v3 1/1 ath9k_hw: fix stopping rx DMA during resets
In reply to Felix FietkauDuring PHY errors, the MAC can sometimes fail to enter an idle state on older hardware (before AR9380) after an rx stop has been requested.
This typically shows up in the kernel log with messages like these:
ath: Could not stop RX, we could be confusing the DMA engine when we start RX up
------------[ cut here ]------------ WARNING: at drivers/net/wireless/ath/ath9k/recv.c:504 ath_stoprecv+0xcc/0xf0 [ath9k]() Call Trace: [<8023f0e8>] dump_stack+0x8/0x34 [<80075050>] warn_slowpath_common+0x78/0xa4 [<80075094>] warn_slowpath_null+0x18/0x24 [<80d66d60>] ath_stoprecv+0xcc/0xf0 [ath9k] [<80d642cc>] ath_set_channel+0xbc/0x270 [ath9k] [<80d65254>] ath_radio_disable+0x4a4/0x7fc [ath9k]
When this happens, the state that the MAC enters is easy to identify and does not result in bogus DMA traffic, however to ensure a working state after a channel change, the hardware should still be reset.
This patch adds detection for this specific MAC state, after which the above warnings completely disappear in my tests.
--- drivers/net/wireless/ath/ath9k/hw.c | 9 --------- drivers/net/wireless/ath/ath9k/mac.c | 25 ++++++++++++++++++++++--- drivers/net/wireless/ath/ath9k/mac.h | 2 +- drivers/net/wireless/ath/ath9k/recv.c | 6 +++--- 4 files changed, 26 insertions(+), 16 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +0 -9
@@ -1249,15 +1249,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, ah->txchainmask = common->tx_chainmask; ah->rxchainmask = common->rx_chainmask; -if ((common->bus_ops->ath_bus_type !=ATH_USB ) && !ah->chip_fullsleep) { -ath9k_hw_abortpcurecv (ah); -if (!ath9k_hw_stopdmarecv (ah)) { -ath_dbg (common,ATH_DBG_XMIT , -"Failed to stop receive dma\n" ); - bChannelChange = false; - } - } -if (!ath9k_hw_setpower (ah,ATH9K_PM_AWAKE ))return -EIO ;
drivers/net/wireless/ath/ath9k/mac.c +22 -3
@@ -710,27 +710,46 @@ void ath9k_hw_abortpcurecv(struct ath_hw *ah) }EXPORT_SYMBOL (ath9k_hw_abortpcurecv); -bool ath9k_hw_stopdmarecv (struct ath_hw *ah) +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 ;int i; +/* Enable access to the DMA observation bus */ +REG_WRITE (ah,AR_MACMISC , + ((AR_MACMISC_DMA_OBS_LINE_8 <<AR_MACMISC_DMA_OBS_S ) | + (AR_MACMISC_MISC_OBS_BUS_1 << +AR_MACMISC_MISC_OBS_BUS_MSB_S ))); +REG_WRITE (ah,AR_CR ,AR_CR_RXD );/* Wait for rx enable bit to go low */ for (i =AH_RX_STOP_DMA_TIMEOUT /AH_TIME_QUANTUM ; i !=0 ; i--) {if ((REG_READ (ah,AR_CR ) &AR_CR_RXE ) ==0 )break ; + +if (!AR_SREV_9300_20_OR_LATER (ah)) { + mac_status =REG_READ (ah,AR_DMADBG_7 ) &0x7f0 ; +if (mac_status ==0x1c0 && mac_status == last_mac_status) { + *reset = true; +break ; + } + + last_mac_status = mac_status; + } +udelay (AH_TIME_QUANTUM ); }if (i ==0 ) {ath_err (common, -"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n" , +"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 ,REG_READ (ah,AR_CR ), -REG_READ (ah,AR_DIAG_SW )); +REG_READ (ah,AR_DIAG_SW ), +REG_READ (ah,AR_DMADBG_7 ));return false; }else {return true;
drivers/net/wireless/ath/ath9k/mac.h +1 -1
@@ -695,7 +695,7 @@ bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set);void ath9k_hw_putrxbuf (struct ath_hw *ah,u32 rxdp);void ath9k_hw_startpcureceive (struct ath_hw *ah,bool is_scanning);void ath9k_hw_abortpcurecv (struct ath_hw *ah); -bool ath9k_hw_stopdmarecv (struct ath_hw *ah); +bool ath9k_hw_stopdmarecv (struct ath_hw *ah,bool *reset);int ath9k_hw_beaconq_setup (struct ath_hw *ah);/* Interrupt Handling */
drivers/net/wireless/ath/ath9k/recv.c +3 -3
@@ -483,12 +483,12 @@ start_recv:bool ath_stoprecv (struct ath_softc *sc) {struct ath_hw *ah = sc->sc_ah; -bool stopped; +bool stopped, reset = false;spin_lock_bh (&sc->rx.rxbuflock);ath9k_hw_abortpcurecv (ah);ath9k_hw_setrxfilter (ah,0 ); - stopped =ath9k_hw_stopdmarecv (ah); + stopped =ath9k_hw_stopdmarecv (ah, &reset);if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_EDMA )ath_edma_stop_recv (sc);
@@ -503,7 +503,7 @@ bool ath_stoprecv(struct ath_softc *sc) "confusing the DMA engine when we start RX up\n");ATH_DBG_WARN_ON_ONCE (!stopped); } -return stopped; +return stopped || reset; }void ath_flushrecv (struct ath_softc *sc)
Signature · 1 line
1.7.3.2