net/hns3: fix VF configuration after abnormal exit
[dpdk.git] / drivers / crypto / octeontx / otx_cryptodev_ops.c
index 23f9659..ba56b21 100644 (file)
@@ -6,80 +6,25 @@
 #include <rte_bus_pci.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_errno.h>
 #include <rte_malloc.h>
-
-#include "cpt_pmd_logs.h"
-#include "cpt_pmd_ops_helper.h"
-#include "cpt_ucode.h"
-#include "cpt_request_mgr.h"
+#include <rte_mempool.h>
 
 #include "otx_cryptodev.h"
 #include "otx_cryptodev_capabilities.h"
 #include "otx_cryptodev_hw_access.h"
+#include "otx_cryptodev_mbox.h"
 #include "otx_cryptodev_ops.h"
 
-static int otx_cryptodev_probe_count;
-static rte_spinlock_t otx_probe_count_lock = RTE_SPINLOCK_INITIALIZER;
-
-static struct rte_mempool *otx_cpt_meta_pool;
-static int otx_cpt_op_mlen;
-static int otx_cpt_op_sb_mlen;
+#include "cpt_pmd_logs.h"
+#include "cpt_ucode.h"
+#include "cpt_ucode_asym.h"
 
 /* Forward declarations */
 
 static int
 otx_cpt_que_pair_release(struct rte_cryptodev *dev, uint16_t que_pair_id);
 
-/*
- * Initializes global variables used by fast-path code
- *
- * @return
- *   - 0 on success, errcode on error
- */
-static int
-init_global_resources(void)
-{
-       /* Get meta len for scatter gather mode */
-       otx_cpt_op_mlen = cpt_pmd_ops_helper_get_mlen_sg_mode();
-
-       /* Extra 4B saved for future considerations */
-       otx_cpt_op_mlen += 4 * sizeof(uint64_t);
-
-       otx_cpt_meta_pool = rte_mempool_create("cpt_metabuf-pool", 4096 * 16,
-                                              otx_cpt_op_mlen, 512, 0,
-                                              NULL, NULL, NULL, NULL,
-                                              SOCKET_ID_ANY, 0);
-       if (!otx_cpt_meta_pool) {
-               CPT_LOG_ERR("cpt metabuf pool not created");
-               return -ENOMEM;
-       }
-
-       /* Get meta len for direct mode */
-       otx_cpt_op_sb_mlen = cpt_pmd_ops_helper_get_mlen_direct_mode();
-
-       /* Extra 4B saved for future considerations */
-       otx_cpt_op_sb_mlen += 4 * sizeof(uint64_t);
-
-       return 0;
-}
-
-void
-cleanup_global_resources(void)
-{
-       /* Take lock */
-       rte_spinlock_lock(&otx_probe_count_lock);
-
-       /* Decrement the cryptodev count */
-       otx_cryptodev_probe_count--;
-
-       /* Free buffers */
-       if (otx_cpt_meta_pool && otx_cryptodev_probe_count == 0)
-               rte_mempool_free(otx_cpt_meta_pool);
-
-       /* Free lock */
-       rte_spinlock_unlock(&otx_probe_count_lock);
-}
-
 /* Alarm routines */
 
 static void
@@ -161,7 +106,7 @@ otx_cpt_dev_info_get(struct rte_cryptodev *dev, struct rte_cryptodev_info *info)
        if (info != NULL) {
                info->max_nb_queue_pairs = CPT_NUM_QS_PER_VF;
                info->feature_flags = dev->feature_flags;
-               info->capabilities = otx_get_capabilities();
+               info->capabilities = otx_get_capabilities(info->feature_flags);
                info->sym.max_nb_sessions = 0;
                info->driver_id = otx_cryptodev_driver_id;
                info->min_mbuf_headroom_req = OTX_CPT_MIN_HEADROOM_REQ;
@@ -186,10 +131,8 @@ static int
 otx_cpt_que_pair_setup(struct rte_cryptodev *dev,
                       uint16_t que_pair_id,
                       const struct rte_cryptodev_qp_conf *qp_conf,
-                      int socket_id __rte_unused,
-                      struct rte_mempool *session_pool __rte_unused)
+                      int socket_id __rte_unused)
 {
-       void *cptvf = dev->data->dev_private;
        struct cpt_instance *instance = NULL;
        struct rte_pci_device *pci_dev;
        int ret = -1;
@@ -215,14 +158,16 @@ otx_cpt_que_pair_setup(struct rte_cryptodev *dev,
                return -EIO;
        }
 
-       ret = otx_cpt_get_resource(cptvf, 0, &instance);
-       if (ret != 0) {
+       ret = otx_cpt_get_resource(dev, 0, &instance, que_pair_id);
+       if (ret != 0 || instance == NULL) {
                CPT_LOG_ERR("Error getting instance handle from device %s : "
                            "ret = %d", dev->data->name, ret);
                return ret;
        }
 
        instance->queue_id = que_pair_id;
+       instance->sess_mp = qp_conf->mp_session;
+       instance->sess_mp_priv = qp_conf->mp_session_private;
        dev->data->queue_pairs[que_pair_id] = instance;
 
        return 0;
@@ -341,11 +286,299 @@ otx_cpt_session_clear(struct rte_cryptodev *dev,
        }
 }
 
-static uint16_t
-otx_cpt_pkt_enqueue(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
+static unsigned int
+otx_cpt_asym_session_size_get(struct rte_cryptodev *dev __rte_unused)
+{
+       return sizeof(struct cpt_asym_sess_misc);
+}
+
+static int
+otx_cpt_asym_session_cfg(struct rte_cryptodev *dev,
+                        struct rte_crypto_asym_xform *xform __rte_unused,
+                        struct rte_cryptodev_asym_session *sess,
+                        struct rte_mempool *pool)
+{
+       struct cpt_asym_sess_misc *priv;
+       int ret;
+
+       CPT_PMD_INIT_FUNC_TRACE();
+
+       if (rte_mempool_get(pool, (void **)&priv)) {
+               CPT_LOG_ERR("Could not allocate session private data");
+               return -ENOMEM;
+       }
+
+       memset(priv, 0, sizeof(struct cpt_asym_sess_misc));
+
+       ret = cpt_fill_asym_session_parameters(priv, xform);
+       if (ret) {
+               CPT_LOG_ERR("Could not configure session parameters");
+
+               /* Return session to mempool */
+               rte_mempool_put(pool, priv);
+               return ret;
+       }
+
+       set_asym_session_private_data(sess, dev->driver_id, priv);
+       return 0;
+}
+
+static void
+otx_cpt_asym_session_clear(struct rte_cryptodev *dev,
+                          struct rte_cryptodev_asym_session *sess)
+{
+       struct cpt_asym_sess_misc *priv;
+       struct rte_mempool *sess_mp;
+
+       CPT_PMD_INIT_FUNC_TRACE();
+
+       priv = get_asym_session_private_data(sess, dev->driver_id);
+
+       if (priv == NULL)
+               return;
+
+       /* Free resources allocated during session configure */
+       cpt_free_asym_session_parameters(priv);
+       memset(priv, 0, otx_cpt_asym_session_size_get(dev));
+       sess_mp = rte_mempool_from_obj(priv);
+       set_asym_session_private_data(sess, dev->driver_id, NULL);
+       rte_mempool_put(sess_mp, priv);
+}
+
+static __rte_always_inline int32_t __hot
+otx_cpt_request_enqueue(struct cpt_instance *instance,
+                       struct pending_queue *pqueue,
+                       void *req)
+{
+       struct cpt_request_info *user_req = (struct cpt_request_info *)req;
+
+       if (unlikely(pqueue->pending_count >= DEFAULT_CMD_QLEN))
+               return -EAGAIN;
+
+       fill_cpt_inst(instance, req);
+
+       CPT_LOG_DP_DEBUG("req: %p op: %p ", req, user_req->op);
+
+       /* Fill time_out cycles */
+       user_req->time_out = rte_get_timer_cycles() +
+                       DEFAULT_COMMAND_TIMEOUT * rte_get_timer_hz();
+       user_req->extra_time = 0;
+
+       /* Default mode of software queue */
+       mark_cpt_inst(instance);
+
+       pqueue->rid_queue[pqueue->enq_tail].rid = (uintptr_t)user_req;
+
+       /* We will use soft queue length here to limit requests */
+       MOD_INC(pqueue->enq_tail, DEFAULT_CMD_QLEN);
+       pqueue->pending_count += 1;
+
+       CPT_LOG_DP_DEBUG("Submitted NB cmd with request: %p "
+                        "op: %p", user_req, user_req->op);
+       return 0;
+}
+
+static __rte_always_inline int __hot
+otx_cpt_enq_single_asym(struct cpt_instance *instance,
+                       struct rte_crypto_op *op,
+                       struct pending_queue *pqueue)
+{
+       struct cpt_qp_meta_info *minfo = &instance->meta_info;
+       struct rte_crypto_asym_op *asym_op = op->asym;
+       struct asym_op_params params = {0};
+       struct cpt_asym_sess_misc *sess;
+       uintptr_t *cop;
+       void *mdata;
+       int ret;
+
+       if (unlikely(rte_mempool_get(minfo->pool, &mdata) < 0)) {
+               CPT_LOG_DP_ERR("Could not allocate meta buffer for request");
+               return -ENOMEM;
+       }
+
+       sess = get_asym_session_private_data(asym_op->session,
+                                            otx_cryptodev_driver_id);
+
+       /* Store phys_addr of the mdata to meta_buf */
+       params.meta_buf = rte_mempool_virt2iova(mdata);
+
+       cop = mdata;
+       cop[0] = (uintptr_t)mdata;
+       cop[1] = (uintptr_t)op;
+       cop[2] = cop[3] = 0ULL;
+
+       params.req = RTE_PTR_ADD(cop, 4 * sizeof(uintptr_t));
+       params.req->op = cop;
+
+       /* Adjust meta_buf by crypto_op data  and request_info struct */
+       params.meta_buf += (4 * sizeof(uintptr_t)) +
+                          sizeof(struct cpt_request_info);
+
+       switch (sess->xfrm_type) {
+       case RTE_CRYPTO_ASYM_XFORM_MODEX:
+               ret = cpt_modex_prep(&params, &sess->mod_ctx);
+               if (unlikely(ret))
+                       goto req_fail;
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_RSA:
+               ret = cpt_enqueue_rsa_op(op, &params, sess);
+               if (unlikely(ret))
+                       goto req_fail;
+               break;
+       default:
+               op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+               ret = -EINVAL;
+               goto req_fail;
+       }
+
+       ret = otx_cpt_request_enqueue(instance, pqueue, params.req);
+
+       if (unlikely(ret)) {
+               CPT_LOG_DP_ERR("Could not enqueue crypto req");
+               goto req_fail;
+       }
+
+       return 0;
+
+req_fail:
+       free_op_meta(mdata, minfo->pool);
+
+       return ret;
+}
+
+static __rte_always_inline int __hot
+otx_cpt_enq_single_sym(struct cpt_instance *instance,
+                      struct rte_crypto_op *op,
+                      struct pending_queue *pqueue)
+{
+       struct cpt_sess_misc *sess;
+       struct rte_crypto_sym_op *sym_op = op->sym;
+       void *prep_req, *mdata = NULL;
+       int ret = 0;
+       uint64_t cpt_op;
+
+       sess = (struct cpt_sess_misc *)
+                       get_sym_session_private_data(sym_op->session,
+                                                    otx_cryptodev_driver_id);
+
+       cpt_op = sess->cpt_op;
+
+       if (likely(cpt_op & CPT_OP_CIPHER_MASK))
+               ret = fill_fc_params(op, sess, &instance->meta_info, &mdata,
+                                    &prep_req);
+       else
+               ret = fill_digest_params(op, sess, &instance->meta_info,
+                                        &mdata, &prep_req);
+
+       if (unlikely(ret)) {
+               CPT_LOG_DP_ERR("prep cryto req : op %p, cpt_op 0x%x "
+                              "ret 0x%x", op, (unsigned int)cpt_op, ret);
+               return ret;
+       }
+
+       /* Enqueue prepared instruction to h/w */
+       ret = otx_cpt_request_enqueue(instance, pqueue, prep_req);
+
+       if (unlikely(ret)) {
+               /* Buffer allocated for request preparation need to be freed */
+               free_op_meta(mdata, instance->meta_info.pool);
+               return ret;
+       }
+
+       return 0;
+}
+
+static __rte_always_inline int __hot
+otx_cpt_enq_single_sym_sessless(struct cpt_instance *instance,
+                               struct rte_crypto_op *op,
+                               struct pending_queue *pqueue)
+{
+       struct cpt_sess_misc *sess;
+       struct rte_crypto_sym_op *sym_op = op->sym;
+       int ret;
+       void *sess_t = NULL;
+       void *sess_private_data_t = NULL;
+
+       /* Create tmp session */
+
+       if (rte_mempool_get(instance->sess_mp, (void **)&sess_t)) {
+               ret = -ENOMEM;
+               goto exit;
+       }
+
+       if (rte_mempool_get(instance->sess_mp_priv,
+                       (void **)&sess_private_data_t)) {
+               ret = -ENOMEM;
+               goto free_sess;
+       }
+
+       sess = (struct cpt_sess_misc *)sess_private_data_t;
+
+       sess->ctx_dma_addr = rte_mempool_virt2iova(sess) +
+                       sizeof(struct cpt_sess_misc);
+
+       ret = instance_session_cfg(sym_op->xform, (void *)sess);
+       if (unlikely(ret)) {
+               ret = -EINVAL;
+               goto free_sess_priv;
+       }
+
+       /* Save tmp session in op */
+
+       sym_op->session = (struct rte_cryptodev_sym_session *)sess_t;
+       set_sym_session_private_data(sym_op->session, otx_cryptodev_driver_id,
+                                    sess_private_data_t);
+
+       /* Enqueue op with the tmp session set */
+       ret = otx_cpt_enq_single_sym(instance, op, pqueue);
+
+       if (unlikely(ret))
+               goto free_sess_priv;
+
+       return 0;
+
+free_sess_priv:
+       rte_mempool_put(instance->sess_mp_priv, sess_private_data_t);
+free_sess:
+       rte_mempool_put(instance->sess_mp, sess_t);
+exit:
+       return ret;
+}
+
+#define OP_TYPE_SYM            0
+#define OP_TYPE_ASYM           1
+
+static __rte_always_inline int __hot
+otx_cpt_enq_single(struct cpt_instance *inst,
+                  struct rte_crypto_op *op,
+                  struct pending_queue *pqueue,
+                  const uint8_t op_type)
+{
+       /* Check for the type */
+
+       if (op_type == OP_TYPE_SYM) {
+               if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)
+                       return otx_cpt_enq_single_sym(inst, op, pqueue);
+               else
+                       return otx_cpt_enq_single_sym_sessless(inst, op,
+                                                              pqueue);
+       }
+
+       if (op_type == OP_TYPE_ASYM) {
+               if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)
+                       return otx_cpt_enq_single_asym(inst, op, pqueue);
+       }
+
+       /* Should not reach here */
+       return -ENOTSUP;
+}
+
+static  __rte_always_inline uint16_t __hot
+otx_cpt_pkt_enqueue(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops,
+                   const uint8_t op_type)
 {
        struct cpt_instance *instance = (struct cpt_instance *)qptr;
-       uint16_t count = 0;
+       uint16_t count;
        int ret;
        struct cpt_vf *cptvf = (struct cpt_vf *)instance;
        struct pending_queue *pqueue = &cptvf->pqueue;
@@ -356,8 +589,10 @@ otx_cpt_pkt_enqueue(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
 
        count = 0;
        while (likely(count < nb_ops)) {
-               ret = cpt_pmd_crypto_operation(instance, ops[count], pqueue,
-                                               otx_cryptodev_driver_id);
+
+               /* Enqueue single op */
+               ret = otx_cpt_enq_single(instance, ops[count], pqueue, op_type);
+
                if (unlikely(ret))
                        break;
                count++;
@@ -367,50 +602,228 @@ otx_cpt_pkt_enqueue(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
 }
 
 static uint16_t
-otx_cpt_pkt_dequeue(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
+otx_cpt_enqueue_asym(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
+{
+       return otx_cpt_pkt_enqueue(qptr, ops, nb_ops, OP_TYPE_ASYM);
+}
+
+static uint16_t
+otx_cpt_enqueue_sym(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
+{
+       return otx_cpt_pkt_enqueue(qptr, ops, nb_ops, OP_TYPE_SYM);
+}
+
+static inline void
+otx_cpt_asym_rsa_op(struct rte_crypto_op *cop, struct cpt_request_info *req,
+                   struct rte_crypto_rsa_xform *rsa_ctx)
+
+{
+       struct rte_crypto_rsa_op_param *rsa = &cop->asym->rsa;
+
+       switch (rsa->op_type) {
+       case RTE_CRYPTO_ASYM_OP_ENCRYPT:
+               rsa->cipher.length = rsa_ctx->n.length;
+               memcpy(rsa->cipher.data, req->rptr, rsa->cipher.length);
+               break;
+       case RTE_CRYPTO_ASYM_OP_DECRYPT:
+               if (rsa->pad == RTE_CRYPTO_RSA_PADDING_NONE)
+                       rsa->message.length = rsa_ctx->n.length;
+               else {
+                       /* Get length of decrypted output */
+                       rsa->message.length = rte_cpu_to_be_16
+                                       (*((uint16_t *)req->rptr));
+
+                       /* Offset data pointer by length fields */
+                       req->rptr += 2;
+               }
+               memcpy(rsa->message.data, req->rptr, rsa->message.length);
+               break;
+       case RTE_CRYPTO_ASYM_OP_SIGN:
+               rsa->sign.length = rsa_ctx->n.length;
+               memcpy(rsa->sign.data, req->rptr, rsa->sign.length);
+               break;
+       case RTE_CRYPTO_ASYM_OP_VERIFY:
+               if (rsa->pad == RTE_CRYPTO_RSA_PADDING_NONE)
+                       rsa->sign.length = rsa_ctx->n.length;
+               else {
+                       /* Get length of decrypted output */
+                       rsa->sign.length = rte_cpu_to_be_16
+                                       (*((uint16_t *)req->rptr));
+
+                       /* Offset data pointer by length fields */
+                       req->rptr += 2;
+               }
+               memcpy(rsa->sign.data, req->rptr, rsa->sign.length);
+
+               if (memcmp(rsa->sign.data, rsa->message.data,
+                          rsa->message.length)) {
+                       CPT_LOG_DP_ERR("RSA verification failed");
+                       cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               }
+               break;
+       default:
+               CPT_LOG_DP_DEBUG("Invalid RSA operation type");
+               cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+               break;
+       }
+}
+
+static __rte_always_inline void __hot
+otx_cpt_asym_post_process(struct rte_crypto_op *cop,
+                         struct cpt_request_info *req)
+{
+       struct rte_crypto_asym_op *op = cop->asym;
+       struct cpt_asym_sess_misc *sess;
+
+       sess = get_asym_session_private_data(op->session,
+                                            otx_cryptodev_driver_id);
+
+       switch (sess->xfrm_type) {
+       case RTE_CRYPTO_ASYM_XFORM_RSA:
+               otx_cpt_asym_rsa_op(cop, req, &sess->rsa_ctx);
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_MODEX:
+               op->modex.result.length = sess->mod_ctx.modulus.length;
+               memcpy(op->modex.result.data, req->rptr,
+                      op->modex.result.length);
+               break;
+       default:
+               CPT_LOG_DP_DEBUG("Invalid crypto xform type");
+               cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+               break;
+       }
+}
+
+static __rte_always_inline void __hot
+otx_cpt_dequeue_post_process(struct rte_crypto_op *cop, uintptr_t *rsp,
+                            const uint8_t op_type)
+{
+       /* H/w has returned success */
+       cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+
+       /* Perform further post processing */
+
+       if ((op_type == OP_TYPE_SYM) &&
+           (cop->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC)) {
+               /* Check if auth verify need to be completed */
+               if (unlikely(rsp[2]))
+                       compl_auth_verify(cop, (uint8_t *)rsp[2], rsp[3]);
+               return;
+       }
+
+       if ((op_type == OP_TYPE_ASYM) &&
+           (cop->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC)) {
+               rsp = RTE_PTR_ADD(rsp, 4 * sizeof(uintptr_t));
+               otx_cpt_asym_post_process(cop, (struct cpt_request_info *)rsp);
+       }
+
+       return;
+}
+
+static __rte_always_inline uint16_t __hot
+otx_cpt_pkt_dequeue(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops,
+                   const uint8_t op_type)
 {
        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;
+       int nb_completed;
        struct pending_queue *pqueue = &cptvf->pqueue;
-       uint16_t nb_completed, i = 0;
-       uint8_t compcode[nb_ops];
+       struct rte_crypto_op *cop;
+       void *metabuf;
+       uintptr_t *rsp;
+
+       pcount = pqueue->pending_count;
+       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);
+
+               if (likely((i+1) < count))
+                       rte_prefetch_non_temporal((void *)rid_e[1].rid);
 
-       nb_completed = cpt_dequeue_burst(instance, nb_ops,
-                                        (void **)ops, compcode, pqueue);
-       while (likely(i < nb_completed)) {
-               struct rte_crypto_op *cop;
-               void *metabuf;
-               uintptr_t *rsp;
-               uint8_t status;
+               ret = check_nb_command_id(user_req, instance);
+
+               if (unlikely(ret == ERR_REQ_PENDING)) {
+                       /* Stop checking for completions */
+                       break;
+               }
+
+               /* Return completion code and op handle */
+               cc[i] = ret;
+               ops[i] = user_req->op;
+
+               CPT_LOG_DP_DEBUG("Request %p Op %p completed with code %d",
+                                user_req, user_req->op, ret);
+
+               MOD_INC(pqueue->deq_head, DEFAULT_CMD_QLEN);
+               pqueue->pending_count -= 1;
+       }
+
+       nb_completed = i;
+
+       for (i = 0; i < nb_completed; i++) {
 
                rsp = (void *)ops[i];
-               status = compcode[i];
+
                if (likely((i + 1) < nb_completed))
                        rte_prefetch0(ops[i+1]);
+
                metabuf = (void *)rsp[0];
                cop = (void *)rsp[1];
 
                ops[i] = cop;
 
-               if (likely(status == 0)) {
-                       if (likely(!rsp[2]))
-                               cop->status =
-                                       RTE_CRYPTO_OP_STATUS_SUCCESS;
-                       else
-                               compl_auth_verify(cop, (uint8_t *)rsp[2],
-                                                 rsp[3]);
-               } else if (status == ERR_GC_ICV_MISCOMPARE) {
-                       /*auth data mismatch */
+               /* Check completion code */
+
+               if (likely(cc[i] == 0)) {
+                       /* H/w success pkt. Post process */
+                       otx_cpt_dequeue_post_process(cop, rsp, op_type);
+               } else if (cc[i] == ERR_GC_ICV_MISCOMPARE) {
+                       /* auth data mismatch */
                        cop->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
                } else {
+                       /* Error */
                        cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
                }
-               free_op_meta(metabuf, cptvf->meta_info.cptvf_meta_pool);
-               i++;
+
+               if (unlikely(cop->sess_type == RTE_CRYPTO_OP_SESSIONLESS)) {
+                       void *sess_private_data_t =
+                               get_sym_session_private_data(cop->sym->session,
+                                               otx_cryptodev_driver_id);
+                       memset(sess_private_data_t, 0,
+                                       cpt_get_session_size());
+                       memset(cop->sym->session, 0,
+                       rte_cryptodev_sym_get_existing_header_session_size(
+                                       cop->sym->session));
+                       rte_mempool_put(instance->sess_mp_priv,
+                                       sess_private_data_t);
+                       rte_mempool_put(instance->sess_mp, cop->sym->session);
+                       cop->sym->session = NULL;
+               }
+               free_op_meta(metabuf, instance->meta_info.pool);
        }
+
        return nb_completed;
 }
 
+static uint16_t
+otx_cpt_dequeue_asym(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
+{
+       return otx_cpt_pkt_dequeue(qptr, ops, nb_ops, OP_TYPE_ASYM);
+}
+
+static uint16_t
+otx_cpt_dequeue_sym(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
+{
+       return otx_cpt_pkt_dequeue(qptr, ops, nb_ops, OP_TYPE_SYM);
+}
+
 static struct rte_cryptodev_ops cptvf_ops = {
        /* Device related operations */
        .dev_configure = otx_cpt_dev_config,
@@ -428,16 +841,12 @@ static struct rte_cryptodev_ops cptvf_ops = {
        /* Crypto related operations */
        .sym_session_get_size = otx_cpt_get_session_size,
        .sym_session_configure = otx_cpt_session_cfg,
-       .sym_session_clear = otx_cpt_session_clear
-};
+       .sym_session_clear = otx_cpt_session_clear,
 
-static void
-otx_cpt_common_vars_init(struct cpt_vf *cptvf)
-{
-       cptvf->meta_info.cptvf_meta_pool = otx_cpt_meta_pool;
-       cptvf->meta_info.cptvf_op_mlen = otx_cpt_op_mlen;
-       cptvf->meta_info.cptvf_op_sb_mlen = otx_cpt_op_sb_mlen;
-}
+       .asym_session_get_size = otx_cpt_asym_session_size_get,
+       .asym_session_configure = otx_cpt_asym_session_cfg,
+       .asym_session_clear = otx_cpt_asym_session_clear,
+};
 
 int
 otx_cpt_dev_create(struct rte_cryptodev *c_dev)
@@ -483,42 +892,48 @@ otx_cpt_dev_create(struct rte_cryptodev *c_dev)
                goto fail;
        }
 
-       /* Start off timer for mailbox interrupts */
-       otx_cpt_periodic_alarm_start(cptvf);
-
-       rte_spinlock_lock(&otx_probe_count_lock);
-       if (!otx_cryptodev_probe_count) {
-               ret = init_global_resources();
-               if (ret) {
-                       rte_spinlock_unlock(&otx_probe_count_lock);
-                       goto init_fail;
-               }
+       switch (cptvf->vftype) {
+       case OTX_CPT_VF_TYPE_AE:
+               /* Set asymmetric cpt feature flags */
+               c_dev->feature_flags = RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |
+                               RTE_CRYPTODEV_FF_HW_ACCELERATED |
+                               RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT;
+               break;
+       case OTX_CPT_VF_TYPE_SE:
+               /* Set symmetric cpt feature flags */
+               c_dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
+                               RTE_CRYPTODEV_FF_HW_ACCELERATED |
+                               RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
+                               RTE_CRYPTODEV_FF_IN_PLACE_SGL |
+                               RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |
+                               RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT;
+               break;
+       default:
+               /* Feature not supported. Abort */
+               CPT_LOG_ERR("VF type not supported by %s", dev_name);
+               ret = -EIO;
+               goto deinit_dev;
        }
-       otx_cryptodev_probe_count++;
-       rte_spinlock_unlock(&otx_probe_count_lock);
 
-       /* Initialize data path variables used by common code */
-       otx_cpt_common_vars_init(cptvf);
+       /* Start off timer for mailbox interrupts */
+       otx_cpt_periodic_alarm_start(cptvf);
 
        c_dev->dev_ops = &cptvf_ops;
 
-       c_dev->enqueue_burst = otx_cpt_pkt_enqueue;
-       c_dev->dequeue_burst = otx_cpt_pkt_dequeue;
-
-       c_dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
-                       RTE_CRYPTODEV_FF_HW_ACCELERATED |
-                       RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
-                       RTE_CRYPTODEV_FF_IN_PLACE_SGL |
-                       RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |
-                       RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT;
+       if (c_dev->feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) {
+               c_dev->enqueue_burst = otx_cpt_enqueue_sym;
+               c_dev->dequeue_burst = otx_cpt_dequeue_sym;
+       } else {
+               c_dev->enqueue_burst = otx_cpt_enqueue_asym;
+               c_dev->dequeue_burst = otx_cpt_dequeue_asym;
+       }
 
        /* Save dev private data */
        c_dev->data->dev_private = cptvf;
 
        return 0;
 
-init_fail:
-       otx_cpt_periodic_alarm_stop(cptvf);
+deinit_dev:
        otx_cpt_deinit_device(cptvf);
 
 fail: