Skip to content

Commit 78ae1ba

Browse files
Mani-SadhasivamSasha Levin
authored andcommitted
wifi: ath12k: Clear affinity hint before calling ath12k_pci_free_irq() in error path
commit b43b1e2 upstream. If a shared IRQ is used by the driver due to platform limitation, then the IRQ affinity hint is set right after the allocation of IRQ vectors in ath12k_pci_msi_alloc(). This does no harm unless one of the functions requesting the IRQ fails and attempt to free the IRQ. This may end up with a warning from the IRQ core that is expecting the affinity hint to be cleared before freeing the IRQ: kernel/irq/manage.c: /* make sure affinity_hint is cleaned up */ if (WARN_ON_ONCE(desc->affinity_hint)) desc->affinity_hint = NULL; So to fix this issue, clear the IRQ affinity hint before calling ath12k_pci_free_irq() in the error path. The affinity will be cleared once again further down the error path due to code organization, but that does no harm. Fixes: a3012f2 ("wifi: ath12k: set IRQ affinity to CPU0 in case of one MSI vector") Signed-off-by: Manivannan Sadhasivam <[email protected]> Reviewed-by: Baochen Qiang <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jeff Johnson <[email protected]> Signed-off-by: Wenshan Lan <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ff1d1d2 commit 78ae1ba

File tree

1 file changed

+2
-0
lines changed
  • drivers/net/wireless/ath/ath12k

1 file changed

+2
-0
lines changed

drivers/net/wireless/ath/ath12k/pci.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,8 @@ static int ath12k_pci_probe(struct pci_dev *pdev,
15061506
return 0;
15071507

15081508
err_free_irq:
1509+
/* __free_irq() expects the caller to have cleared the affinity hint */
1510+
ath12k_pci_set_irq_affinity_hint(ab_pci, NULL);
15091511
ath12k_pci_free_irq(ab);
15101512

15111513
err_ce_free:

0 commit comments

Comments
 (0)