wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation
Subsystems (3)
PATCH v2 1/1 wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation
Fix ath9k_hw_verify_hang()/ar9003_hw_detect_mac_hang() register offset calculation (do not overflow the shift for the second register/queues above five, use the register layout described in the comments above ath9k_hw_verify_hang() instead).
---
Changes v1 -> v2:
- fix c&p error in ath9k_hw_verify_hang (i vs. queue), thanks to Simon Horman for review
Notes:
- tested with MikroTik R11e-5HnD/Atheros AR9300 Rev:4 (lspci: 168c:0033 Qualcomm Atheros AR958x 802.11abgn Wireless Network Adapter (rev 01)) card
--- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_hw.c +18 -9
@@ -1099,17 +1099,22 @@ static bool ath9k_hw_verify_hang(struct ath_hw *ah, unsigned int queue) {u32 dma_dbg_chain, dma_dbg_complete;u8 dcu_chain_state, dcu_complete_state; +unsigned int dbg_reg, reg_offset;int i; -for (i =0 ; i <NUM_STATUS_READS ; i++) { -if (queue <6 ) - dma_dbg_chain =REG_READ (ah,AR_DMADBG_4 ); -else - dma_dbg_chain =REG_READ (ah,AR_DMADBG_5 ); +if (queue <6 ) { + dbg_reg =AR_DMADBG_4 ; + reg_offset = queue *5 ; + }else { + dbg_reg =AR_DMADBG_5 ; + reg_offset = (queue -6 ) *5 ; + } +for (i =0 ; i <NUM_STATUS_READS ; i++) { + dma_dbg_chain =REG_READ (ah, dbg_reg); dma_dbg_complete =REG_READ (ah,AR_DMADBG_6 ); - dcu_chain_state = (dma_dbg_chain >> (5 * queue)) &0x1f ; + dcu_chain_state = (dma_dbg_chain >> reg_offset) &0x1f ; dcu_complete_state = dma_dbg_complete &0x3 ;if ((dcu_chain_state !=0x6 ) || (dcu_complete_state !=0x1 ))
@@ -1128,6 +1133,7 @@ static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah)u8 dcu_chain_state, dcu_complete_state;bool dcu_wait_frdone = false;unsigned long chk_dcu =0 ; +unsigned int reg_offset;unsigned int i =0 ; dma_dbg_4 =REG_READ (ah,AR_DMADBG_4 );
@@ -1139,12 +1145,15 @@ static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah) goto exit;for (i =0 ; i <ATH9K_NUM_TX_QUEUES ; i++) { -if (i <6 ) +if (i <6 ) { chk_dbg = dma_dbg_4; -else + reg_offset = i *5 ; + }else { chk_dbg = dma_dbg_5; + reg_offset = (i -6 ) *5 ; + } - dcu_chain_state = (chk_dbg >> (5 * i)) &0x1f ; + dcu_chain_state = (chk_dbg >> reg_offset) &0x1f ;if (dcu_chain_state ==0x6 ) { dcu_wait_frdone = true; chk_dcu |=BIT (i);
Signature · 1 line
2.40.0
Quoted 10 lines · Peter Seiderer
Fix ath9k_hw_verify_hang()/ar9003_hw_detect_mac_hang() register offset calculation (do not overflow the shift for the second register/queues above five, use the register layout described in the comments above
ath9k_hw_verify_hang()instead).Fixes 222e04830ff0 ("ath9k: Fix MAC HW hang check for AR9003")
Alright, better, thanks! Let's try this again:
Simon Horman
Reviewed-byQuoted 11 lines · Toke Høiland-Jørgensen
[You don't often get email from [email protected]. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
Quoted 7 lines · Peter Seiderer
Fix ath9k_hw_verify_hang()/ar9003_hw_detect_mac_hang() register offset calculation (do not overflow the shift for the second register/queues above five, use the register layout described in the comments above
ath9k_hw_verify_hang()instead).Fixes 222e04830ff0 ("ath9k: Fix MAC HW hang check for AR9003")
Quoted 7 lines
Quoted 3 lines
Alright, better, thanks! Let's try this again:
Thanks, looks good to me too.
Quoted 5 lines · Peter Seiderer
Fix ath9k_hw_verify_hang()/ar9003_hw_detect_mac_hang() register offset calculation (do not overflow the shift for the second register/queues above five, use the register layout described in the comments above
ath9k_hw_verify_hang()instead).
Quoted 8 lines
Fixes 222e04830ff0 ("ath9k: Fix MAC HW hang check for AR9003")Reported-by Gregg Wonderly <[email protected]>Signed-off-by Peter Seiderer <[email protected]>Reviewed-by Simon Horman <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
3e56c80931c7 wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches