crypto/cnxk: move IPsec SA creation to common

[dpdk.git] / drivers / common / cnxk / roc_nix_debug.c

diff --git a/drivers/common/cnxk/roc_nix_debug.c b/drivers/common/cnxk/roc_nix_debug.c
index 266935a..e05e60d 100644 (file)
--- a/drivers/common/cnxk/roc_nix_debug.c
+++ b/drivers/common/cnxk/roc_nix_debug.c
@@ -5,14 +5,14 @@
 #include "roc_api.h"
 #include "roc_priv.h"
 
-#define nix_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__)
+#define nix_dump plt_dump
 #define NIX_REG_INFO(reg)                                                      \
        {                                                                      \
                reg, #reg                                                      \
        }
 #define NIX_REG_NAME_SZ 48
 
-#define nix_dump_no_nl(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__)
+#define nix_dump_no_nl plt_dump_no_nl
 
 struct nix_lf_reg_info {
        uint32_t offset;
@@ -52,7 +52,9 @@ nix_bitmap_dump(struct plt_bitmap *bmp)
        int i;
 
        plt_bitmap_scan_init(bmp);
-       plt_bitmap_scan(bmp, &pos, &slab);
+       if (!plt_bitmap_scan(bmp, &pos, &slab))
+               return;
+
        start_pos = pos;
 
        nix_dump_no_nl("  \t\t[");
@@ -323,6 +325,9 @@ nix_q_ctx_get(struct dev *dev, uint8_t ctype, uint16_t qid, __io void **ctx_p)
                int rc;
 
                aq = mbox_alloc_msg_nix_aq_enq(mbox);
+               if (!aq)
+                       return -ENOSPC;
+
                aq->qidx = qid;
                aq->ctype = ctype;
                aq->op = NIX_AQ_INSTOP_READ;
@@ -341,6 +346,9 @@ nix_q_ctx_get(struct dev *dev, uint8_t ctype, uint16_t qid, __io void **ctx_p)
                struct nix_cn10k_aq_enq_req *aq;
 
                aq = mbox_alloc_msg_nix_cn10k_aq_enq(mbox);
+               if (!aq)
+                       return -ENOSPC;
+
                aq->qidx = qid;
                aq->ctype = ctype;
                aq->op = NIX_AQ_INSTOP_READ;
@@ -818,7 +826,7 @@ roc_nix_rq_dump(struct roc_nix_rq *rq)
        nix_dump("  vwqe_wait_tmo = %ld", rq->vwqe_wait_tmo);
        nix_dump("  vwqe_aura_handle = %ld", rq->vwqe_aura_handle);
        nix_dump("  roc_nix = %p", rq->roc_nix);
-       nix_dump("  inl_dev_ref = %d", rq->inl_dev_ref);
+       nix_dump("  inl_dev_refs = %d", rq->inl_dev_refs);
 }
 
 void
@@ -1235,6 +1243,7 @@ roc_nix_inl_dev_dump(struct roc_nix_inl_dev *roc_inl_dev)
        struct nix_inl_dev *inl_dev =
                (struct nix_inl_dev *)&roc_inl_dev->reserved;
        struct dev *dev = &inl_dev->dev;
+       int i;
 
        nix_dump("nix_inl_dev@%p", inl_dev);
        nix_dump("  pf = %d", dev_get_pf(dev->pf_func));
@@ -1251,15 +1260,15 @@ roc_nix_inl_dev_dump(struct roc_nix_inl_dev *roc_inl_dev)
        nix_dump("  \tssow_msixoff = %d", inl_dev->ssow_msixoff);
        nix_dump("  \tnix_cints = %d", inl_dev->cints);
        nix_dump("  \tnix_qints = %d", inl_dev->qints);
-       nix_dump("  \trq_refs = %d", inl_dev->rq_refs);
        nix_dump("  \tinb_sa_base = 0x%p", inl_dev->inb_sa_base);
        nix_dump("  \tinb_sa_sz = %d", inl_dev->inb_sa_sz);
        nix_dump("  \txaq_buf_size = %u", inl_dev->xaq_buf_size);
        nix_dump("  \txae_waes = %u", inl_dev->xae_waes);
        nix_dump("  \tiue = %u", inl_dev->iue);
-       nix_dump("  \txaq_aura = 0x%" PRIx64, inl_dev->xaq_aura);
-       nix_dump("  \txaq_mem = 0x%p", inl_dev->xaq_mem);
+       nix_dump("  \txaq_aura = 0x%" PRIx64, inl_dev->xaq.aura_handle);
+       nix_dump("  \txaq_mem = 0x%p", inl_dev->xaq.mem);
 
        nix_dump("  \tinl_dev_rq:");
-       roc_nix_rq_dump(&inl_dev->rq);
+       for (i = 0; i < inl_dev->nb_rqs; i++)
+               roc_nix_rq_dump(&inl_dev->rqs[i]);
 }