event/dlb2: add v2.5 start domain

[dpdk.git] / drivers / crypto / octeontx / otx_cryptodev_ops.c

diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c
index b1ff214..d75f4b5 100644 (file)
--- a/drivers/crypto/octeontx/otx_cryptodev_ops.c
+++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c
@@ -205,12 +205,16 @@ sym_xform_verify(struct rte_crypto_sym_xform *xform)
        if (xform->next) {
                if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
                    xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
-                   xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT)
+                   xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT &&
+                   (xform->auth.algo != RTE_CRYPTO_AUTH_SHA1_HMAC ||
+                    xform->next->cipher.algo != RTE_CRYPTO_CIPHER_AES_CBC))
                        return -ENOTSUP;
 
                if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
                    xform->cipher.op == RTE_CRYPTO_CIPHER_OP_DECRYPT &&
-                   xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH)
+                   xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
+                   (xform->cipher.algo != RTE_CRYPTO_CIPHER_AES_CBC ||
+                    xform->next->auth.algo != RTE_CRYPTO_AUTH_SHA1_HMAC))
                        return -ENOTSUP;
 
                if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
@@ -430,7 +434,7 @@ otx_cpt_request_enqueue(struct cpt_instance *instance,
        /* Default mode of software queue */
        mark_cpt_inst(instance);
 
-       pqueue->rid_queue[pqueue->enq_tail].rid = (uintptr_t)user_req;
+       pqueue->req_queue[pqueue->enq_tail] = (uintptr_t)user_req;
 
        /* We will use soft queue length here to limit requests */
        MOD_INC(pqueue->enq_tail, DEFAULT_CMD_QLEN);
@@ -577,8 +581,8 @@ otx_cpt_enq_single_sym_sessless(struct cpt_instance *instance,
        int ret;
 
        /* Create temporary session */
-
-       if (rte_mempool_get(instance->sess_mp, (void **)&sess))
+       sess = rte_cryptodev_sym_session_create(instance->sess_mp);
+       if (sess == NULL)
                return -ENOMEM;
 
        ret = sym_session_configure(driver_id, sym_op->xform, sess,
@@ -823,7 +827,6 @@ otx_cpt_pkt_dequeue(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops,
        struct cpt_instance *instance = (struct cpt_instance *)qptr;
        struct cpt_request_info *user_req;
        struct cpt_vf *cptvf = (struct cpt_vf *)instance;
-       struct rid *rid_e;
        uint8_t cc[nb_ops];
        int i, count, pcount;
        uint8_t ret;
@@ -837,11 +840,13 @@ otx_cpt_pkt_dequeue(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops,
        count = (nb_ops > pcount) ? pcount : nb_ops;
 
        for (i = 0; i < count; i++) {
-               rid_e = &pqueue->rid_queue[pqueue->deq_head];
-               user_req = (struct cpt_request_info *)(rid_e->rid);
+               user_req = (struct cpt_request_info *)
+                               pqueue->req_queue[pqueue->deq_head];
 
-               if (likely((i+1) < count))
-                       rte_prefetch_non_temporal((void *)rid_e[1].rid);
+               if (likely((i+1) < count)) {
+                       rte_prefetch_non_temporal(
+                               (void *)pqueue->req_queue[i+1]);
+               }
 
                ret = check_nb_command_id(user_req, instance);
 
@@ -1003,7 +1008,8 @@ otx_cpt_dev_create(struct rte_cryptodev *c_dev)
                                RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
                                RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |
                                RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT |
-                               RTE_CRYPTODEV_FF_SYM_SESSIONLESS;
+                               RTE_CRYPTODEV_FF_SYM_SESSIONLESS |
+                               RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED;
                break;
        default:
                /* Feature not supported. Abort */