Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4b5a803 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by John W. Linville
Browse files

wil6210: fix for HW bug in interrupt setup logic 



Hardware bug triggered by the MSI init while INTx asserted for some reason.
De-assert INTx prior to MSI set-up

Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 98a65b59

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

+17 −0
Original line number Diff line number Diff line
@@ -493,6 +493,23 @@ static int wil6210_request_3msi(struct wil6210_priv *wil, int irq) 


	return rc;

}

/* can't use wil_ioread32_and_clear because ICC value is not ser yet */

static inline void wil_clear32(void __iomem *addr)

{

	u32 x = ioread32(addr);



	iowrite32(x, addr);

}



void wil6210_clear_irq(struct wil6210_priv *wil)

{

	wil_clear32(wil->csr + HOSTADDR(RGF_DMA_EP_RX_ICR) +

		    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_DMA_EP_MISC_ICR) +

		    offsetof(struct RGF_ICR, ICR));

}



int wil6210_init_irq(struct wil6210_priv *wil, int irq)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	pci_set_drvdata(pdev, wil);

	wil->pdev = pdev;



	wil6210_clear_irq(wil);

	/* FW should raise IRQ when ready */

	rc = wil_if_pcie_enable(wil);

	if (rc) {

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ int wmi_rxon(struct wil6210_priv *wil, bool on); 
int wmi_get_temperature(struct wil6210_priv *wil, u32 *t_m, u32 *t_r);

int wmi_disconnect_sta(struct wil6210_priv *wil, const u8 *mac, u16 reason);



void wil6210_clear_irq(struct wil6210_priv *wil);

int wil6210_init_irq(struct wil6210_priv *wil, int irq);

void wil6210_fini_irq(struct wil6210_priv *wil, int irq);

void wil6210_disable_irq(struct wil6210_priv *wil);