app/testpmd: fix topology error message

[dpdk.git] / drivers / crypto / aesni_mb / rte_aesni_mb_pmd_ops.c

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
index e697cd9..3b3ef0c 100644 (file)
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
@@ -247,6 +247,48 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                        }, }
                }, }
        },
+       {       /* DES CBC */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_DES_CBC,
+                               .block_size = 8,
+                               .key_size = {
+                                       .min = 8,
+                                       .max = 8,
+                                       .increment = 0
+                               },
+                               .iv_size = {
+                                       .min = 8,
+                                       .max = 8,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
+       {       /* DES DOCSIS BPI */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_DES_DOCSISBPI,
+                               .block_size = 8,
+                               .key_size = {
+                                       .min = 8,
+                                       .max = 8,
+                                       .increment = 0
+                               },
+                               .iv_size = {
+                                       .min = 8,
+                                       .max = 8,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
+
+
 
        RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
 };
@@ -355,7 +397,7 @@ aesni_mb_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
                        "aesni_mb_pmd_%u_qp_%u",
                        dev->data->dev_id, qp->id);
 
-       if (n > sizeof(qp->name))
+       if (n >= sizeof(qp->name))
                return -1;
 
        return 0;
@@ -373,7 +415,7 @@ aesni_mb_pmd_qp_create_processed_ops_ring(struct aesni_mb_qp *qp,
                                "%s_%s",
                                qp->name, str);
 
-       if (n > sizeof(ring_name))
+       if (n >= sizeof(ring_name))
                return NULL;
 
        r = rte_ring_lookup(ring_name);
@@ -430,6 +472,11 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 
        memset(&qp->stats, 0, sizeof(qp->stats));
 
+       char mp_name[RTE_MEMPOOL_NAMESIZE];
+
+       snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
+                               "digest_mp_%u_%u", dev->data->dev_id, qp_id);
+
        /* Initialise multi-buffer manager */
        (*qp->op_fns->job.init_mgr)(&qp->mb_mgr);
        return 0;
@@ -480,25 +527,27 @@ aesni_mb_pmd_session_configure(struct rte_cryptodev *dev,
 {
        void *sess_private_data;
        struct aesni_mb_private *internals = dev->data->dev_private;
+       int ret;
 
        if (unlikely(sess == NULL)) {
                MB_LOG_ERR("invalid session struct");
-               return -1;
+               return -EINVAL;
        }
 
        if (rte_mempool_get(mempool, &sess_private_data)) {
                CDEV_LOG_ERR(
                        "Couldn't get object from session mempool");
-               return -1;
+               return -ENOMEM;
        }
 
-       if (aesni_mb_set_session_parameters(&job_ops[internals->vector_mode],
-                       sess_private_data, xform) != 0) {
+       ret = aesni_mb_set_session_parameters(&job_ops[internals->vector_mode],
+                       sess_private_data, xform);
+       if (ret != 0) {
                MB_LOG_ERR("failed configure session parameters");
 
                /* Return session to mempool */
                rte_mempool_put(mempool, sess_private_data);
-               return -1;
+               return ret;
        }
 
        set_session_private_data(sess, dev->driver_id,