Commit 59396366 authored by Sebastian Gottschall's avatar Sebastian Gottschall Committed by Jeff Johnson
Browse files

wil6210: fix support for sparrow chipsets 



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

Signed-off-by: default avatarSebastian Gottschall <s.gottschall@dd-wrt.com>
Link: https://patch.msgid.link/20250304012131.25970-2-s.gottschall@dd-wrt.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent dc9c4252

drivers/net/wireless/ath/wil6210/interrupt.c

+16 −10
Original line number Diff line number Diff line
@@ -179,8 +179,10 @@ void wil_mask_irq(struct wil6210_priv *wil) 
	wil_dbg_irq(wil, "mask_irq\n");



	wil6210_mask_irq_tx(wil);

	if (wil->use_enhanced_dma_hw)

		wil6210_mask_irq_tx_edma(wil);

	wil6210_mask_irq_rx(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");



	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));

	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 */