| Message ID | 20250225053447.16824-2-manivannan.sadhasivam@linaro.org (mailing list archive) |
|---|---|
| State | Under Review |
| Delegated to: | Jeff Johnson |
| Headers | show |
| Series | wifi: ath11k/ath12k: IRQ affinity fixes | expand |
On 2/25/2025 1:34 PM, Manivannan Sadhasivam wrote: > 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 > ath11k_pci_alloc_msi(). This does no harm unless one of the functions > requesting the IRQ fails and attempt to free the IRQ. This results in the > below warning: > > WARNING: CPU: 7 PID: 349 at kernel/irq/manage.c:1929 free_irq+0x278/0x29c > Call trace: > free_irq+0x278/0x29c > ath11k_pcic_free_irq+0x70/0x10c [ath11k] > ath11k_pci_probe+0x800/0x820 [ath11k_pci] > local_pci_probe+0x40/0xbc > > The warning is due to not clearing the affinity hint before freeing the > IRQs. > > So to fix this issue, clear the IRQ affinity hint before calling > ath11k_pcic_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. > > Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-05266-QCAHSTSWPLZ_V2_TO_X86-1 > > Cc: Baochen Qiang <quic_bqiang@quicinc.com> > Fixes: 39564b475ac5 ("wifi: ath11k: fix boot failure with one MSI vector") > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > drivers/net/wireless/ath/ath11k/pci.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c > index b93f04973ad7..eaac9eabcc70 100644 > --- a/drivers/net/wireless/ath/ath11k/pci.c > +++ b/drivers/net/wireless/ath/ath11k/pci.c > @@ -939,6 +939,8 @@ static int ath11k_pci_probe(struct pci_dev *pdev, > return 0; > > err_free_irq: > + /* __free_irq() expects the caller to have cleared the affinity hint */ > + ath11k_pci_set_irq_affinity_hint(ab_pci, NULL); > ath11k_pcic_free_irq(ab); > > err_ce_free: LGTM
On 2/24/2025 11:23 PM, Baochen Qiang wrote:
> LGTM
Suggest you reply with an official Reviewed-by: tag
This helps build your reputation.
On 2/25/2025 1:34 PM, Manivannan Sadhasivam wrote: > 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 > ath11k_pci_alloc_msi(). This does no harm unless one of the functions > requesting the IRQ fails and attempt to free the IRQ. This results in the > below warning: > > WARNING: CPU: 7 PID: 349 at kernel/irq/manage.c:1929 free_irq+0x278/0x29c > Call trace: > free_irq+0x278/0x29c > ath11k_pcic_free_irq+0x70/0x10c [ath11k] > ath11k_pci_probe+0x800/0x820 [ath11k_pci] > local_pci_probe+0x40/0xbc > > The warning is due to not clearing the affinity hint before freeing the > IRQs. > > So to fix this issue, clear the IRQ affinity hint before calling > ath11k_pcic_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. > > Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-05266-QCAHSTSWPLZ_V2_TO_X86-1 > > Cc: Baochen Qiang <quic_bqiang@quicinc.com> > Fixes: 39564b475ac5 ("wifi: ath11k: fix boot failure with one MSI vector") > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > drivers/net/wireless/ath/ath11k/pci.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c > index b93f04973ad7..eaac9eabcc70 100644 > --- a/drivers/net/wireless/ath/ath11k/pci.c > +++ b/drivers/net/wireless/ath/ath11k/pci.c > @@ -939,6 +939,8 @@ static int ath11k_pci_probe(struct pci_dev *pdev, > return 0; > > err_free_irq: > + /* __free_irq() expects the caller to have cleared the affinity hint */ > + ath11k_pci_set_irq_affinity_hint(ab_pci, NULL); > ath11k_pcic_free_irq(ab); > > err_ce_free: Reviewed-by: Baochen Qiang <quic_bqiang@quicinc.com>
diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c index b93f04973ad7..eaac9eabcc70 100644 --- a/drivers/net/wireless/ath/ath11k/pci.c +++ b/drivers/net/wireless/ath/ath11k/pci.c @@ -939,6 +939,8 @@ static int ath11k_pci_probe(struct pci_dev *pdev, return 0; err_free_irq: + /* __free_irq() expects the caller to have cleared the affinity hint */ + ath11k_pci_set_irq_affinity_hint(ab_pci, NULL); ath11k_pcic_free_irq(ab); err_ce_free:
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 ath11k_pci_alloc_msi(). This does no harm unless one of the functions requesting the IRQ fails and attempt to free the IRQ. This results in the below warning: WARNING: CPU: 7 PID: 349 at kernel/irq/manage.c:1929 free_irq+0x278/0x29c Call trace: free_irq+0x278/0x29c ath11k_pcic_free_irq+0x70/0x10c [ath11k] ath11k_pci_probe+0x800/0x820 [ath11k_pci] local_pci_probe+0x40/0xbc The warning is due to not clearing the affinity hint before freeing the IRQs. So to fix this issue, clear the IRQ affinity hint before calling ath11k_pcic_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. Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-05266-QCAHSTSWPLZ_V2_TO_X86-1 Cc: Baochen Qiang <quic_bqiang@quicinc.com> Fixes: 39564b475ac5 ("wifi: ath11k: fix boot failure with one MSI vector") Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> --- drivers/net/wireless/ath/ath11k/pci.c | 2 ++ 1 file changed, 2 insertions(+)