wil6210: fix support for sparrow chipsets
cover wil6210: fix support for sparrow chipsets
From: Sebastian Gottschall <[email protected]>
the wil6210 driver irq handling code is unconditionally writing edma irq registers which are supposed to be only used on Talyn chipsets. This however leade to a chipset hang on the older sparrow chipset generation and firmware will not even boot.
Fix that by simply checking for edma support before handling these registers.
Tested on Netgear R9000
Sebastian Gottschall (1):
wil6210: fix support for sparrow chipsets
drivers/net/wireless/ath/wil6210/interrupt.c | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-)
Signature · 1 line
2.35.3
PATCH 1/1 wil6210: fix support for sparrow chipsets
From: Sebastian Gottschall <[email protected]>
the wil6210 driver irq handling code is unconditionally writing edma irq registers which are supposed to be only used on Talyn chipsets. This however leade to a chipset hang on the older sparrow chipset generation and firmware will not even boot.
Fix that by simply checking for edma support before handling these registers.
Tested on Netgear R9000
--- drivers/net/wireless/ath/wil6210/interrupt.c | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/wil6210/interrupt.c +16 -10
@@ -179,9 +179,11 @@ void wil_mask_irq(struct wil6210_priv *wil)wil_dbg_irq (wil,"mask_irq\n" );wil6210_mask_irq_tx (wil); -wil6210_mask_irq_tx_edma (wil); +if (wil->use_enhanced_dma_hw) +wil6210_mask_irq_tx_edma (wil);wil6210_mask_irq_rx (wil); -wil6210_mask_irq_rx_edma (wil); +if (wil->use_enhanced_dma_hw) +wil6210_mask_irq_rx_edma (wil);wil6210_mask_irq_misc (wil, true);wil6210_mask_irq_pseudo (wil); }
@@ -190,10 +192,12 @@ void wil_unmask_irq(struct wil6210_priv *wil) {wil_dbg_irq (wil,"unmask_irq\n" ); -wil_w (wil,RGF_DMA_EP_RX_ICR + offsetof(struct RGF_ICR , ICC), -WIL_ICR_ICC_VALUE ); -wil_w (wil,RGF_DMA_EP_TX_ICR + offsetof(struct RGF_ICR , ICC), -WIL_ICR_ICC_VALUE ); +if (wil->use_enhanced_dma_hw) { +wil_w (wil,RGF_DMA_EP_RX_ICR + offsetof(struct RGF_ICR , ICC), +WIL_ICR_ICC_VALUE ); +wil_w (wil,RGF_DMA_EP_TX_ICR + offsetof(struct RGF_ICR , ICC), +WIL_ICR_ICC_VALUE ); + }wil_w (wil,RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR , ICC),WIL_ICR_ICC_MISC_VALUE ); wil_w(wil, RGF_INT_GEN_TX_ICR + offsetof(struct RGF_ICR, ICC),
@@ -845,10 +849,12 @@ void wil6210_clear_irq(struct wil6210_priv *wil) offsetof(struct RGF_ICR, ICR));wil_clear32 (wil->csr +HOSTADDR (RGF_DMA_EP_TX_ICR ) + offsetof(struct RGF_ICR , ICR)); -wil_clear32 (wil->csr +HOSTADDR (RGF_INT_GEN_RX_ICR ) + - offsetof(struct RGF_ICR , ICR)); -wil_clear32 (wil->csr +HOSTADDR (RGF_INT_GEN_TX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +if (wil->use_enhanced_dma_hw) { +wil_clear32 (wil->csr +HOSTADDR (RGF_INT_GEN_RX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +wil_clear32 (wil->csr +HOSTADDR (RGF_INT_GEN_TX_ICR ) + + offsetof(struct RGF_ICR , ICR)); + }wil_clear32 (wil->csr +HOSTADDR (RGF_DMA_EP_MISC_ICR ) + offsetof(struct RGF_ICR , ICR));wmb ();/* make sure write completed */
Signature · 1 line
2.35.3
Jeff Johnson
AppliedQuoted 8 lines · On Tue, 04 Mar 2025 08:21:30 +0700, [email protected] wrote:
the wil6210 driver irq handling code is unconditionally writing edma irq registers which are supposed to be only used on Talyn chipsets. This however leade to a chipset hang on the older sparrow chipset generation and firmware will not even boot.
Fix that by simply checking for edma support before handling these registers.[...]
Applied, thanks!
[1/1] wil6210: fix support for sparrow chipsets
commit: 593963660919a97a4546acfd706dac93625724f5
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>