| Message ID | 20250225053447.16824-1-manivannan.sadhasivam@linaro.org |
|---|---|
| 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: Reviewed-by: Baochen Qiang <quic_bqiang@quicinc.com>
On Tue, 25 Feb 2025 11:04:44 +0530, Manivannan Sadhasivam wrote: > This series fixes a warning from kernel IRQ core that gets triggered in the > error path of QCA6390 probe. While fixing that I also noticed the same issue in > the ath12k driver, so added an untested patch for the same. > > Finally, updated the irq_set_affinity_hint() API in both drivers as it was > deprecated. > > [...] Applied, thanks! [1/3] wifi: ath11k: Clear affinity hint before calling ath11k_pcic_free_irq() in error path commit: 68410c5bd381a81bcc92b808e7dc4e6b9ed25d11 [2/3] wifi: ath12k: Clear affinity hint before calling ath12k_pci_free_irq() in error path commit: b43b1e2c52db77c872bd60d30cdcc72c47df70c7 [3/3] wifi: ath11k/ath12k: Replace irq_set_affinity_hint() with irq_set_affinity_and_hint() commit: 6f2d839d11b36c630dbcad2c68613f15409de392 Best regards,
Hi, This series fixes a warning from kernel IRQ core that gets triggered in the error path of QCA6390 probe. While fixing that I also noticed the same issue in the ath12k driver, so added an untested patch for the same. Finally, updated the irq_set_affinity_hint() API in both drivers as it was deprecated. - Mani Changes in v2: - Instead of moving the affinity setting, cleared the affinity hint in the error path before freeing the IRQs - Rebased on top of v6.14-rc1 Manivannan Sadhasivam (3): wifi: ath11k: Clear affinity hint before calling ath11k_pcic_free_irq() in error path wifi: ath12k: Clear affinity hint before calling ath12k_pci_free_irq() in error path wifi: ath11k/ath12k: Replace irq_set_affinity_hint() with irq_set_affinity_and_hint() drivers/net/wireless/ath/ath11k/pci.c | 4 +++- drivers/net/wireless/ath/ath12k/pci.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)