git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
crypto/cnxk: move IPsec SA creation to common
[dpdk.git] / drivers / common / cnxk / roc_nix_irq.c
diff --git a/drivers/common/cnxk/roc_nix_irq.c b/drivers/common/cnxk/roc_nix_irq.c
index 32be64a..71971ef 100644 (file)
--- a/drivers/common/cnxk/roc_nix_irq.c
+++ b/drivers/common/cnxk/roc_nix_irq.c
@@ -82,7 +82,7 @@ nix_lf_err_irq(void *param)
 static int
 nix_lf_register_err_irq(struct nix *nix)
 {
-       struct plt_intr_handle *handle = &nix->pci_dev->intr_handle;
+       struct plt_intr_handle *handle = nix->pci_dev->intr_handle;
        int rc, vec;
 
        vec = nix->msixoff + NIX_LF_INT_VEC_ERR_INT;
@@ -99,7 +99,7 @@ nix_lf_register_err_irq(struct nix *nix)
 static void
 nix_lf_unregister_err_irq(struct nix *nix)
 {
-       struct plt_intr_handle *handle = &nix->pci_dev->intr_handle;
+       struct plt_intr_handle *handle = nix->pci_dev->intr_handle;
        int vec;
 
        vec = nix->msixoff + NIX_LF_INT_VEC_ERR_INT;
@@ -131,7 +131,7 @@ nix_lf_ras_irq(void *param)
 static int
 nix_lf_register_ras_irq(struct nix *nix)
 {
-       struct plt_intr_handle *handle = &nix->pci_dev->intr_handle;
+       struct plt_intr_handle *handle = nix->pci_dev->intr_handle;
        int rc, vec;
 
        vec = nix->msixoff + NIX_LF_INT_VEC_POISON;
@@ -148,7 +148,7 @@ nix_lf_register_ras_irq(struct nix *nix)
 static void
 nix_lf_unregister_ras_irq(struct nix *nix)
 {
-       struct plt_intr_handle *handle = &nix->pci_dev->intr_handle;
+       struct plt_intr_handle *handle = nix->pci_dev->intr_handle;
        int vec;
 
        vec = nix->msixoff + NIX_LF_INT_VEC_POISON;
@@ -196,15 +196,42 @@ nix_lf_sq_irq_get_and_clear(struct nix *nix, uint16_t sq)
        return nix_lf_q_irq_get_and_clear(nix, sq, NIX_LF_SQ_OP_INT, ~0x1ff00);
 }
 
-static inline void
+static inline bool
+nix_lf_is_sqb_null(struct dev *dev, int q)
+{
+       bool is_sqb_null = false;
+       volatile void *ctx;
+       int rc;
+
+       rc = nix_q_ctx_get(dev, NIX_AQ_CTYPE_SQ, q, &ctx);
+       if (rc) {
+               plt_err("Failed to get sq context");
+       } else {
+               is_sqb_null =
+                       roc_model_is_cn9k() ?
+                               (((__io struct nix_sq_ctx_s *)ctx)->next_sqb ==
+                                0) :
+                               (((__io struct nix_cn10k_sq_ctx_s *)ctx)
+                                        ->next_sqb == 0);
+       }
+
+       return is_sqb_null;
+}
+
+static inline uint8_t
 nix_lf_sq_debug_reg(struct nix *nix, uint32_t off)
 {
+       uint8_t err = 0;
        uint64_t reg;
 
        reg = plt_read64(nix->base + off);
-       if (reg & BIT_ULL(44))
-               plt_err("SQ=%d err_code=0x%x", (int)((reg >> 8) & 0xfffff),
-                       (uint8_t)(reg & 0xff));
+       if (reg & BIT_ULL(44)) {
+               err = reg & 0xff;
+               /* Clear valid bit */
+               plt_write64(BIT_ULL(44), nix->base + off);
+       }
+
+       return err;
 }
 
 static void
@@ -226,6 +253,7 @@ nix_lf_q_irq(void *param)
        struct dev *dev = &nix->dev;
        int q, cq, rq, sq;
        uint64_t intr;
+       uint8_t rc;
 
        intr = plt_read64(nix->base + NIX_LF_QINTX_INT(qintx));
        if (intr == 0)
@@ -266,22 +294,25 @@ nix_lf_q_irq(void *param)
                sq = q % nix->qints;
                irq = nix_lf_sq_irq_get_and_clear(nix, sq);
 
-               if (irq & BIT_ULL(NIX_SQINT_LMT_ERR)) {
-                       plt_err("SQ=%d NIX_SQINT_LMT_ERR", sq);
-                       nix_lf_sq_debug_reg(nix, NIX_LF_SQ_OP_ERR_DBG);
-               }
-               if (irq & BIT_ULL(NIX_SQINT_MNQ_ERR)) {
-                       plt_err("SQ=%d NIX_SQINT_MNQ_ERR", sq);
-                       nix_lf_sq_debug_reg(nix, NIX_LF_MNQ_ERR_DBG);
-               }
-               if (irq & BIT_ULL(NIX_SQINT_SEND_ERR)) {
-                       plt_err("SQ=%d NIX_SQINT_SEND_ERR", sq);
-                       nix_lf_sq_debug_reg(nix, NIX_LF_SEND_ERR_DBG);
-               }
-               if (irq & BIT_ULL(NIX_SQINT_SQB_ALLOC_FAIL)) {
+               /* Detect LMT store error */
+               rc = nix_lf_sq_debug_reg(nix, NIX_LF_SQ_OP_ERR_DBG);
+               if (rc)
+                       plt_err("SQ=%d NIX_SQINT_LMT_ERR, errcode %x", sq, rc);
+
+               /* Detect Meta-descriptor enqueue error */
+               rc = nix_lf_sq_debug_reg(nix, NIX_LF_MNQ_ERR_DBG);
+               if (rc)
+                       plt_err("SQ=%d NIX_SQINT_MNQ_ERR, errcode %x", sq, rc);
+
+               /* Detect Send error */
+               rc = nix_lf_sq_debug_reg(nix, NIX_LF_SEND_ERR_DBG);
+               if (rc)
+                       plt_err("SQ=%d NIX_SQINT_SEND_ERR, errcode %x", sq, rc);
+
+               /* Detect SQB fault, read SQ context to check SQB NULL case */
+               if (irq & BIT_ULL(NIX_SQINT_SQB_ALLOC_FAIL) ||
+                   nix_lf_is_sqb_null(dev, q))
                        plt_err("SQ=%d NIX_SQINT_SQB_ALLOC_FAIL", sq);
-                       nix_lf_sq_debug_reg(nix, NIX_LF_SEND_ERR_DBG);
-               }
        }
 
        /* Clear interrupt */
@@ -300,7 +331,7 @@ roc_nix_register_queue_irqs(struct roc_nix *roc_nix)
        struct nix *nix;
 
        nix = roc_nix_to_nix_priv(roc_nix);
-       handle = &nix->pci_dev->intr_handle;
+       handle = nix->pci_dev->intr_handle;
 
        /* Figure out max qintx required */
        rqs = PLT_MIN(nix->qints, nix->nb_rx_queues);
@@ -352,7 +383,7 @@ roc_nix_unregister_queue_irqs(struct roc_nix *roc_nix)
        int vec, q;
 
        nix = roc_nix_to_nix_priv(roc_nix);
-       handle = &nix->pci_dev->intr_handle;
+       handle = nix->pci_dev->intr_handle;
 
        for (q = 0; q < nix->configured_qints; q++) {
                vec = nix->msixoff + NIX_LF_INT_VEC_QINT_START + q;
@@ -382,7 +413,7 @@ roc_nix_register_cq_irqs(struct roc_nix *roc_nix)
        struct nix *nix;
 
        nix = roc_nix_to_nix_priv(roc_nix);
-       handle = &nix->pci_dev->intr_handle;
+       handle = nix->pci_dev->intr_handle;
 
        nix->configured_cints = PLT_MIN(nix->cints, nix->nb_rx_queues);
 
@@ -414,19 +445,19 @@ roc_nix_register_cq_irqs(struct roc_nix *roc_nix)
                        return rc;
                }
 
-               if (!handle->intr_vec) {
-                       handle->intr_vec = plt_zmalloc(
-                               nix->configured_cints * sizeof(int), 0);
-                       if (!handle->intr_vec) {
-                               plt_err("Failed to allocate %d rx intr_vec",
-                                       nix->configured_cints);
-                               return -ENOMEM;
-                       }
+               rc = plt_intr_vec_list_alloc(handle, "cnxk",
+                                            nix->configured_cints);
+               if (rc) {
+                       plt_err("Fail to allocate intr vec list, rc=%d",
+                               rc);
+                       return rc;
                }
-               /* VFIO vector zero is resereved for misc interrupt so
+               /* VFIO vector zero is reserved for misc interrupt so
                 * doing required adjustment. (b13bfab4cd)
                 */
-               handle->intr_vec[q] = PLT_INTR_VEC_RXTX_OFFSET + vec;
+               if (plt_intr_vec_list_index_set(handle, q,
+                                               PLT_INTR_VEC_RXTX_OFFSET + vec))
+                       return -1;
 
                /* Configure CQE interrupt coalescing parameters */
                plt_write64(((CQ_CQE_THRESH_DEFAULT) |
@@ -450,7 +481,7 @@ roc_nix_unregister_cq_irqs(struct roc_nix *roc_nix)
        int vec, q;
 
        nix = roc_nix_to_nix_priv(roc_nix);
-       handle = &nix->pci_dev->intr_handle;
+       handle = nix->pci_dev->intr_handle;
 
        for (q = 0; q < nix->configured_cints; q++) {
                vec = nix->msixoff + NIX_LF_INT_VEC_CINT_START + q;
@@ -465,6 +496,8 @@ roc_nix_unregister_cq_irqs(struct roc_nix *roc_nix)
                dev_irq_unregister(handle, nix_lf_cq_irq, &nix->cints_mem[q],
                                   vec);
        }
+
+       plt_intr_vec_list_free(handle);
        plt_free(nix->cints_mem);
 }
 
DPDK repo used for reviews