]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wifi: ath12k: Clear affinity hint before calling ath12k_pci_free_irq() in error path
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Tue, 25 Feb 2025 05:34:46 +0000 (11:04 +0530)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Thu, 27 Feb 2025 17:05:28 +0000 (09:05 -0800)
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: a3012f206d07 ("wifi: ath12k: set IRQ affinity to CPU0 in case of one MSI vector")
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Baochen Qiang <quic_bqiang@quicinc.com>
Link: https://patch.msgid.link/20250225053447.16824-3-manivannan.sadhasivam@linaro.org
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath12k/pci.c

index 7126cc361deff77739d5d5a4358ab7630bb0d451..213a0f21d58803e3638137ecdd12b1ee70a22a9d 100644 (file)
@@ -1697,6 +1697,8 @@ static int ath12k_pci_probe(struct pci_dev *pdev,
        return 0;
 
 err_free_irq:
+       /* __free_irq() expects the caller to have cleared the affinity hint */
+       ath12k_pci_set_irq_affinity_hint(ab_pci, NULL);
        ath12k_pci_free_irq(ab);
 
 err_ce_free: