From: Sowmiya Sree Elavalagan Configure and request external MSI interrupts for DP ring groups on the QCN6432 platform. Create a NAPI context for each active external interrupt group and disable the corresponding IRQs while NAPI polling is in progress. Re-enable the IRQs after completing the NAPI poll. Handle allocation and cleanup of NAPI contexts and external IRQs during configuration failure and driver removal. Also disable external DP interrupts from the AHB IRQ disable path. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01243-QCAHKSWPL_SILICONZ-1 Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.6-01322-QCAHKSWPL_SILICONZ-1 Tested-on: QCN6432 hw1.0 AHB WLAN.WBE.1.6-01322-QCAHKSWPL_SILICONZ-1 Signed-off-by: Sowmiya Sree Elavalagan Co-developed-by: Aaradhana Sahu Signed-off-by: Aaradhana Sahu --- drivers/net/wireless/ath/ath12k/ahb.c | 1 + drivers/net/wireless/ath/ath12k/core.h | 2 + drivers/net/wireless/ath/ath12k/pci.c | 6 +- drivers/net/wireless/ath/ath12k/pcic.c | 121 +++++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c index 78367126f49f..892872f70b2f 100644 --- a/drivers/net/wireless/ath/ath12k/ahb.c +++ b/drivers/net/wireless/ath/ath12k/ahb.c @@ -558,6 +558,7 @@ static void ath12k_ahb_disable_irq(struct ath12k_base *ab) } ath12k_ahb_ce_irqs_disable(ab); + ath12k_ahb_ext_irq_disable(ab); } static void ath12k_ahb_ce_workqueue(struct work_struct *work) diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h index 21332aeb0c22..bbbde9f05ea9 100644 --- a/drivers/net/wireless/ath/ath12k/core.h +++ b/drivers/net/wireless/ath/ath12k/core.h @@ -165,6 +165,7 @@ enum ath12k_hw_rev { #define ATH12K_EXT_IRQ_NUM_MAX 16 #define ATH12K_MAX_TCL_RING_NUM 3 #define ATH12K_MAX_MSI_VECTOR 32 +#define ATH12K_EXT_IRQ_NAME_LEN 32 struct ath12k_ext_irq_grp { struct ath12k_base *ab; @@ -175,6 +176,7 @@ struct ath12k_ext_irq_grp { bool napi_enabled; struct napi_struct napi; struct net_device *napi_ndev; + char irq_name[ATH12K_EXT_IRQ_NAME_LEN]; }; enum ath12k_smbios_cc_type { diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c index a26fdb3c0ad2..4bb14a95aec9 100644 --- a/drivers/net/wireless/ath/ath12k/pci.c +++ b/drivers/net/wireless/ath/ath12k/pci.c @@ -348,11 +348,15 @@ void ath12k_pci_free_ext_irq(struct ath12k_base *ab, int num_ext_irq_grp) for (i = 0; i < num_ext_irq_grp; i++) { struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; + if (!irq_grp->napi_ndev) + continue; + for (j = 0; j < irq_grp->num_irq; j++) free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp); netif_napi_del(&irq_grp->napi); free_netdev(irq_grp->napi_ndev); + irq_grp->napi_ndev = NULL; } } @@ -1118,7 +1122,7 @@ void ath12k_pci_ext_irq_enable(struct ath12k_base *ab) for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) { struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; - if (!irq_grp->napi_enabled) { + if (irq_grp->napi_ndev && !irq_grp->napi_enabled) { napi_enable(&irq_grp->napi); irq_grp->napi_enabled = true; } diff --git a/drivers/net/wireless/ath/ath12k/pcic.c b/drivers/net/wireless/ath/ath12k/pcic.c index fea284c3707b..06178b4f20d1 100644 --- a/drivers/net/wireless/ath/ath12k/pcic.c +++ b/drivers/net/wireless/ath/ath12k/pcic.c @@ -181,6 +181,112 @@ static irqreturn_t ath12k_pcic_ce_interrupt_handler(int irq, void *arg) return IRQ_HANDLED; } +static void ath12k_pcic_ext_grp_enable(struct ath12k_ext_irq_grp *irq_grp) +{ + int i; + + for (i = 0; i < irq_grp->num_irq; i++) + enable_irq(irq_grp->ab->irq_num[irq_grp->irqs[i]]); +} + +static int ath12k_pcic_ext_grp_napi_poll(struct napi_struct *napi, int budget) +{ + struct ath12k_ext_irq_grp *irq_grp = container_of(napi, + struct ath12k_ext_irq_grp, + napi); + struct ath12k_base *ab = irq_grp->ab; + int work_done; + + work_done = ath12k_dp_service_srng(ab->dp, irq_grp, budget); + if (work_done < budget) { + if (likely(napi_complete_done(napi, work_done))) + ath12k_pcic_ext_grp_enable(irq_grp); + } + + if (work_done > budget) + work_done = budget; + + return work_done; +} + +static int ath12k_pcic_ext_irq_config(struct ath12k_base *ab, + struct msi_desc **msi_desc, int num_msi) +{ + struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab); + struct ath12k_ext_irq_grp *irq_grp; + int j, i, k, vec_idx = 0, ret = 0; + u8 userpd_id = ab_ahb->userpd_id; + u32 num_irq, base_idx; + struct msi_desc *desc; + + base_idx = ATH12K_MSI_IRQ_CE0_OFFSET + CE_COUNT_MAX; + + for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) { + num_irq = 0; + desc = msi_desc[vec_idx]; + irq_grp = &ab->ext_irq_grp[i]; + irq_grp->ab = ab; + irq_grp->grp_id = i; + + if (ab->hw_params->ring_mask->tx[i] || + ab->hw_params->ring_mask->rx[i] || + ab->hw_params->ring_mask->rx_err[i] || + ab->hw_params->ring_mask->rx_wbm_rel[i] || + ab->hw_params->ring_mask->reo_status[i] || + ab->hw_params->ring_mask->host2rxdma[i] || + ab->hw_params->ring_mask->rx_mon_dest[i]) { + num_irq = 1; + } + + if (!num_irq) + continue; + + irq_grp->napi_ndev = alloc_netdev_dummy(0); + if (!irq_grp->napi_ndev) { + ret = -ENOMEM; + goto fail_allocate; + } + + netif_napi_add(irq_grp->napi_ndev, &irq_grp->napi, + ath12k_pcic_ext_grp_napi_poll); + irq_grp->num_irq = num_irq; + irq_grp->irqs[0] = base_idx + i; + + for (j = 0; j < irq_grp->num_irq; j++) { + int irq_idx = irq_grp->irqs[j]; + + scnprintf(irq_grp->irq_name, sizeof(irq_grp->irq_name), + "pcic%u_wlan_dp_%u", userpd_id, i); + irq_set_status_flags(desc->irq, IRQ_DISABLE_UNLAZY); + ret = request_irq(desc->irq, ath12k_pci_ext_interrupt_handler, + IRQF_SHARED, irq_grp->irq_name, irq_grp); + if (ret) { + ath12k_err(ab, "failed request irq %d, for group %d : %d\n", + desc->irq, irq_grp->grp_id, ret); + + for (k = 0; k < j; k++) + free_irq(ab->irq_num[irq_grp->irqs[k]], irq_grp); + + netif_napi_del(&irq_grp->napi); + free_netdev(irq_grp->napi_ndev); + irq_grp->napi_ndev = NULL; + goto fail_allocate; + } + + ab->irq_num[irq_idx] = desc->irq; + disable_irq_nosync(ab->irq_num[irq_idx]); + } + + vec_idx = (vec_idx + 1) % num_msi; + } + + return 0; + +fail_allocate: + ath12k_pci_free_ext_irq(ab, i); + return ret; +} + static int ath12k_pcic_ce_irq_config(struct ath12k_base *ab, struct msi_desc **msi_desc, int num_msi) { @@ -294,9 +400,23 @@ int ath12k_pcic_config_irq(struct ath12k_base *ab) goto free_msi; } + ret = ath12k_pci_get_user_msi_assignment(ab, "DP", &num_vectors, + &user_base_data, &base_vector); + if (ret) + goto free_ce_irq; + + ret = ath12k_pcic_request_msi_irqs(ab, base_vector, num_vectors, + ath12k_pcic_ext_irq_config); + if (ret) { + ath12k_err(ab, "failed to config DP irq\n"); + goto free_ce_irq; + } + set_bit(ATH12K_FLAG_MULTI_MSI_VECTORS, &ab->dev_flags); return 0; +free_ce_irq: + ath12k_pci_free_ce_irq(ab, ab->hw_params->ce_count); free_msi: platform_device_msi_free_irqs_all(&pdev->dev); return ret; @@ -307,5 +427,6 @@ void ath12k_pcic_free_irq(struct ath12k_base *ab) struct platform_device *pdev = ab->pdev; ath12k_pci_free_ce_irq(ab, ab->hw_params->ce_count); + ath12k_pci_free_ext_irq(ab, ATH12K_EXT_IRQ_GRP_NUM_MAX); platform_device_msi_free_irqs_all(&pdev->dev); } -- 2.34.1