From: Mohit Kumar Parjapat <[email protected]>
Defer inbound CPT LF IRQ setup to nix_inl_cpt_cq_inb_setup() when
CQ is enabled so the same MSI-X vector is not registered twice.
Fixes: 42a7770cd0c9 ("common/cnxk: use one interrupt handle per vector")
Signed-off-by: Mohit Kumar Parjapat <[email protected]>
---
drivers/common/cnxk/roc_nix_inl_dev.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/common/cnxk/roc_nix_inl_dev.c
b/drivers/common/cnxk/roc_nix_inl_dev.c
index bfdeef2688..f0703f3154 100644
--- a/drivers/common/cnxk/roc_nix_inl_dev.c
+++ b/drivers/common/cnxk/roc_nix_inl_dev.c
@@ -420,6 +420,18 @@ nix_inl_nix_ipsec_cfg(struct nix_inl_dev *inl_dev, bool
ena)
return rc;
}
+/*
+ * With CPT CQ enabled, inbound LF IRQs are registered later by
+ * nix_inl_cpt_cq_inb_setup() with the CQ-aware done callback.
+ */
+static bool
+nix_inl_cpt_irq_defer(struct nix_inl_dev *inl_dev, int lf_id)
+{
+ return roc_feature_nix_has_cpt_cq_support() && inl_dev->cpt_cq_ena &&
+ lf_id >= inl_dev->inb_cpt_lf_id &&
+ lf_id < inl_dev->inb_cpt_lf_id + inl_dev->nb_inb_cptlfs;
+}
+
static int
nix_inl_cpt_setup(struct nix_inl_dev *inl_dev, bool inl_dev_sso)
{
@@ -458,7 +470,7 @@ nix_inl_cpt_setup(struct nix_inl_dev *inl_dev, bool
inl_dev_sso)
lf->msixoff = inl_dev->cpt_msixoff[i];
lf->pci_dev = inl_dev->pci_dev;
- rc = cpt_lf_init(lf, false);
+ rc = cpt_lf_init(lf, nix_inl_cpt_irq_defer(inl_dev, i));
if (rc) {
plt_err("Failed to initialize CPT LF, rc=%d", rc);
goto lf_free;
@@ -485,7 +497,7 @@ nix_inl_cpt_setup(struct nix_inl_dev *inl_dev, bool
inl_dev_sso)
lf_fini:
for (i = 0; i < inl_dev->nb_cptlf; i++) {
struct roc_cpt_lf *lf = &inl_dev->cpt_lf[i];
- cpt_lf_fini(lf, false);
+ cpt_lf_fini(lf, nix_inl_cpt_irq_defer(inl_dev, i));
}
lf_free:
rc |= cpt_lfs_free(dev);
--
2.43.0