Imported Upstream version 17.05

[deb_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 3d49e2a..d1bc28e 100644 (file)
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
@@ -227,13 +227,35 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                        }, }
                }, }
        },
+       {       /* AES DOCSIS BPI */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
+                               .block_size = 16,
+                               .key_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               },
+                               .iv_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
+
        RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
 };
 
 
 /** Configure device */
 static int
-aesni_mb_pmd_config(__rte_unused struct rte_cryptodev *dev)
+aesni_mb_pmd_config(__rte_unused struct rte_cryptodev *dev,
+               __rte_unused struct rte_cryptodev_config *config)
 {
        return 0;
 }
@@ -342,24 +364,32 @@ aesni_mb_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
 /** Create a ring to place processed operations on */
 static struct rte_ring *
 aesni_mb_pmd_qp_create_processed_ops_ring(struct aesni_mb_qp *qp,
-               unsigned ring_size, int socket_id)
+               const char *str, unsigned int ring_size, int socket_id)
 {
        struct rte_ring *r;
+       char ring_name[RTE_CRYPTODEV_NAME_LEN];
+
+       unsigned int n = snprintf(ring_name, sizeof(ring_name),
+                               "%s_%s",
+                               qp->name, str);
+
+       if (n > sizeof(ring_name))
+               return NULL;
 
-       r = rte_ring_lookup(qp->name);
+       r = rte_ring_lookup(ring_name);
        if (r) {
-               if (r->prod.size >= ring_size) {
+               if (rte_ring_get_size(r) >= ring_size) {
                        MB_LOG_INFO("Reusing existing ring %s for processed ops",
-                                        qp->name);
+                       ring_name);
                        return r;
                }
 
                MB_LOG_ERR("Unable to reuse existing ring %s for processed ops",
-                                qp->name);
+                       ring_name);
                return NULL;
        }
 
-       return rte_ring_create(qp->name, ring_size, socket_id,
+       return rte_ring_create(ring_name, ring_size, socket_id,
                        RING_F_SP_ENQ | RING_F_SC_DEQ);
 }
 
@@ -388,11 +418,12 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        if (aesni_mb_pmd_qp_set_unique_name(dev, qp))
                goto qp_setup_cleanup;
 
-       qp->ops = &job_ops[internals->vector_mode];
 
-       qp->processed_ops = aesni_mb_pmd_qp_create_processed_ops_ring(qp,
-                       qp_conf->nb_descriptors, socket_id);
-       if (qp->processed_ops == NULL)
+       qp->op_fns = &job_ops[internals->vector_mode];
+
+       qp->ingress_queue = aesni_mb_pmd_qp_create_processed_ops_ring(qp,
+                       "ingress", qp_conf->nb_descriptors, socket_id);
+       if (qp->ingress_queue == NULL)
                goto qp_setup_cleanup;
 
        qp->sess_mp = dev->data->session_pool;
@@ -400,8 +431,7 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        memset(&qp->stats, 0, sizeof(qp->stats));
 
        /* Initialise multi-buffer manager */
-       (*qp->ops->job.init_mgr)(&qp->mb_mgr);
-
+       (*qp->op_fns->job.init_mgr)(&qp->mb_mgr);
        return 0;
 
 qp_setup_cleanup: