crypto/dpaa_sec: enable QI physically
[dpdk.git] / drivers / crypto / dpaa_sec / dpaa_sec.c
index a9bfb86..23a94d7 100644 (file)
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2017-2019 NXP
+ *   Copyright 2017-2022 NXP
  *
  */
 
 
 #include <rte_byteorder.h>
 #include <rte_common.h>
-#include <rte_cryptodev_pmd.h>
+#include <cryptodev_pmd.h>
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 #include <rte_security_driver.h>
 #endif
 #include <rte_cycles.h>
 #include <rte_dev.h>
+#include <rte_io.h>
+#include <rte_ip.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
 #include <rte_spinlock.h>
+#include <rte_hexdump.h>
 
 #include <fsl_usd.h>
 #include <fsl_qman.h>
@@ -36,6 +39,7 @@
 #include <desc/algo.h>
 #include <desc/ipsec.h>
 #include <desc/pdcp.h>
+#include <desc/sdap.h>
 
 #include <rte_dpaa_bus.h>
 #include <dpaa_sec.h>
 #include <dpaa_sec_log.h>
 #include <dpaax_iova_table.h>
 
-int dpaa_logtype_sec;
+#define DRIVER_DUMP_MODE "drv_dump_mode"
 
-static uint8_t cryptodev_driver_id;
+/* DPAA_SEC_DP_DUMP levels */
+enum dpaa_sec_dump_levels {
+       DPAA_SEC_DP_NO_DUMP,
+       DPAA_SEC_DP_ERR_DUMP,
+       DPAA_SEC_DP_FULL_DUMP
+};
 
-static __thread struct rte_crypto_op **dpaa_sec_ops;
-static __thread int dpaa_sec_op_nb;
+uint8_t dpaa_sec_dp_dump = DPAA_SEC_DP_ERR_DUMP;
 
-static int
-dpaa_sec_attach_sess_q(struct dpaa_sec_qp *qp, dpaa_sec_session *sess);
+uint8_t dpaa_cryptodev_driver_id;
 
 static inline void
 dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx)
@@ -121,7 +128,7 @@ dpaa_sec_init_rx(struct qman_fq *fq_in, rte_iova_t hwdesc,
 
        qm_fqd_context_a_set64(&fq_opts.fqd, hwdesc);
        fq_opts.fqd.context_b = fqid_out;
-       fq_opts.fqd.dest.channel = qm_channel_caam;
+       fq_opts.fqd.dest.channel = dpaa_get_qm_channel_caam();
        fq_opts.fqd.dest.wq = 0;
 
        fq_in->cb.ern  = ern_sec_fq_handler;
@@ -145,7 +152,7 @@ dqrr_out_fq_cb_rx(struct qman_portal *qm __always_unused,
        struct dpaa_sec_job *job;
        struct dpaa_sec_op_ctx *ctx;
 
-       if (dpaa_sec_op_nb >= DPAA_SEC_BURST)
+       if (DPAA_PER_LCORE_DPAA_SEC_OP_NB >= DPAA_SEC_BURST)
                return qman_cb_dqrr_defer;
 
        if (!(dqrr->stat & QM_DQRR_STAT_FD_VALID))
@@ -176,7 +183,7 @@ dqrr_out_fq_cb_rx(struct qman_portal *qm __always_unused,
                }
                mbuf->data_len = len;
        }
-       dpaa_sec_ops[dpaa_sec_op_nb++] = ctx->op;
+       DPAA_PER_LCORE_RTE_CRYPTO_OP[DPAA_PER_LCORE_DPAA_SEC_OP_NB++] = ctx->op;
        dpaa_sec_op_ending(ctx);
 
        return qman_cb_dqrr_consume;
@@ -234,7 +241,7 @@ static inline int is_decode(dpaa_sec_session *ses)
        return ses->dir == DIR_DEC;
 }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static int
 dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)
 {
@@ -242,7 +249,6 @@ dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)
        struct sec_cdb *cdb = &ses->cdb;
        struct alginfo *p_authdata = NULL;
        int32_t shared_desc_len = 0;
-       int err;
 #if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
        int swap = false;
 #else
@@ -256,10 +262,6 @@ dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)
        cipherdata.algtype = ses->cipher_key.alg;
        cipherdata.algmode = ses->cipher_key.algmode;
 
-       cdb->sh_desc[0] = cipherdata.keylen;
-       cdb->sh_desc[1] = 0;
-       cdb->sh_desc[2] = 0;
-
        if (ses->auth_alg) {
                authdata.key = (size_t)ses->auth_key.data;
                authdata.keylen = ses->auth_key.length;
@@ -269,34 +271,35 @@ dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)
                authdata.algmode = ses->auth_key.algmode;
 
                p_authdata = &authdata;
-
-               cdb->sh_desc[1] = authdata.keylen;
-       }
-
-       err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-                              MIN_JOB_DESC_SIZE,
-                              (unsigned int *)cdb->sh_desc,
-                              &cdb->sh_desc[2], 2);
-       if (err < 0) {
-               DPAA_SEC_ERR("Crypto: Incorrect key lengths");
-               return err;
        }
 
-       if (!(cdb->sh_desc[2] & 1) && cipherdata.keylen) {
-               cipherdata.key =
-                       (size_t)rte_dpaa_mem_vtop((void *)(size_t)cipherdata.key);
-               cipherdata.key_type = RTA_DATA_PTR;
-       }
-       if (!(cdb->sh_desc[2] & (1 << 1)) &&  authdata.keylen) {
-               authdata.key =
-                       (size_t)rte_dpaa_mem_vtop((void *)(size_t)authdata.key);
-               authdata.key_type = RTA_DATA_PTR;
+       if (ses->pdcp.sdap_enabled) {
+               int nb_keys_to_inline =
+                               rta_inline_pdcp_sdap_query(authdata.algtype,
+                                       cipherdata.algtype,
+                                       ses->pdcp.sn_size,
+                                       ses->pdcp.hfn_ovd);
+               if (nb_keys_to_inline >= 1) {
+                       cipherdata.key = (size_t)rte_dpaa_mem_vtop((void *)
+                                               (size_t)cipherdata.key);
+                       cipherdata.key_type = RTA_DATA_PTR;
+               }
+               if (nb_keys_to_inline >= 2) {
+                       authdata.key = (size_t)rte_dpaa_mem_vtop((void *)
+                                               (size_t)authdata.key);
+                       authdata.key_type = RTA_DATA_PTR;
+               }
+       } else {
+               if (rta_inline_pdcp_query(authdata.algtype,
+                                       cipherdata.algtype,
+                                       ses->pdcp.sn_size,
+                                       ses->pdcp.hfn_ovd)) {
+                       cipherdata.key = (size_t)rte_dpaa_mem_vtop((void *)
+                                               (size_t)cipherdata.key);
+                       cipherdata.key_type = RTA_DATA_PTR;
+               }
        }
 
-       cdb->sh_desc[0] = 0;
-       cdb->sh_desc[1] = 0;
-       cdb->sh_desc[2] = 0;
-
        if (ses->pdcp.domain == RTE_SECURITY_PDCP_MODE_CONTROL) {
                if (ses->dir == DIR_ENC)
                        shared_desc_len = cnstr_shdsc_pdcp_c_plane_encap(
@@ -306,8 +309,7 @@ dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)
                                        ses->pdcp.bearer,
                                        ses->pdcp.pkt_dir,
                                        ses->pdcp.hfn_threshold,
-                                       &cipherdata, &authdata,
-                                       0);
+                                       &cipherdata, &authdata);
                else if (ses->dir == DIR_DEC)
                        shared_desc_len = cnstr_shdsc_pdcp_c_plane_decap(
                                        cdb->sh_desc, 1, swap,
@@ -316,27 +318,54 @@ dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)
                                        ses->pdcp.bearer,
                                        ses->pdcp.pkt_dir,
                                        ses->pdcp.hfn_threshold,
-                                       &cipherdata, &authdata,
-                                       0);
+                                       &cipherdata, &authdata);
+       } else if (ses->pdcp.domain == RTE_SECURITY_PDCP_MODE_SHORT_MAC) {
+               shared_desc_len = cnstr_shdsc_pdcp_short_mac(cdb->sh_desc,
+                                                    1, swap, &authdata);
        } else {
-               if (ses->dir == DIR_ENC)
-                       shared_desc_len = cnstr_shdsc_pdcp_u_plane_encap(
-                                       cdb->sh_desc, 1, swap,
-                                       ses->pdcp.sn_size,
-                                       ses->pdcp.hfn,
-                                       ses->pdcp.bearer,
-                                       ses->pdcp.pkt_dir,
-                                       ses->pdcp.hfn_threshold,
-                                       &cipherdata, p_authdata, 0);
-               else if (ses->dir == DIR_DEC)
-                       shared_desc_len = cnstr_shdsc_pdcp_u_plane_decap(
-                                       cdb->sh_desc, 1, swap,
-                                       ses->pdcp.sn_size,
-                                       ses->pdcp.hfn,
-                                       ses->pdcp.bearer,
-                                       ses->pdcp.pkt_dir,
-                                       ses->pdcp.hfn_threshold,
-                                       &cipherdata, p_authdata, 0);
+               if (ses->dir == DIR_ENC) {
+                       if (ses->pdcp.sdap_enabled)
+                               shared_desc_len =
+                                       cnstr_shdsc_pdcp_sdap_u_plane_encap(
+                                               cdb->sh_desc, 1, swap,
+                                               ses->pdcp.sn_size,
+                                               ses->pdcp.hfn,
+                                               ses->pdcp.bearer,
+                                               ses->pdcp.pkt_dir,
+                                               ses->pdcp.hfn_threshold,
+                                               &cipherdata, p_authdata);
+                       else
+                               shared_desc_len =
+                                       cnstr_shdsc_pdcp_u_plane_encap(
+                                               cdb->sh_desc, 1, swap,
+                                               ses->pdcp.sn_size,
+                                               ses->pdcp.hfn,
+                                               ses->pdcp.bearer,
+                                               ses->pdcp.pkt_dir,
+                                               ses->pdcp.hfn_threshold,
+                                               &cipherdata, p_authdata);
+               } else if (ses->dir == DIR_DEC) {
+                       if (ses->pdcp.sdap_enabled)
+                               shared_desc_len =
+                                       cnstr_shdsc_pdcp_sdap_u_plane_decap(
+                                               cdb->sh_desc, 1, swap,
+                                               ses->pdcp.sn_size,
+                                               ses->pdcp.hfn,
+                                               ses->pdcp.bearer,
+                                               ses->pdcp.pkt_dir,
+                                               ses->pdcp.hfn_threshold,
+                                               &cipherdata, p_authdata);
+                       else
+                               shared_desc_len =
+                                       cnstr_shdsc_pdcp_u_plane_decap(
+                                               cdb->sh_desc, 1, swap,
+                                               ses->pdcp.sn_size,
+                                               ses->pdcp.hfn,
+                                               ses->pdcp.bearer,
+                                               ses->pdcp.pkt_dir,
+                                               ses->pdcp.hfn_threshold,
+                                               &cipherdata, p_authdata);
+               }
        }
        return shared_desc_len;
 }
@@ -374,7 +403,7 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)
        cdb->sh_desc[0] = cipherdata.keylen;
        cdb->sh_desc[1] = authdata.keylen;
        err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-                              MIN_JOB_DESC_SIZE,
+                              DESC_JOB_IO_LEN,
                               (unsigned int *)cdb->sh_desc,
                               &cdb->sh_desc[2], 2);
 
@@ -434,7 +463,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
        memset(cdb, 0, sizeof(struct sec_cdb));
 
        switch (ses->ctxt) {
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        case DPAA_SEC_IPSEC:
                shared_desc_len = dpaa_sec_prep_ipsec_cdb(ses);
                break;
@@ -453,6 +482,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
                switch (ses->cipher_alg) {
                case RTE_CRYPTO_CIPHER_AES_CBC:
                case RTE_CRYPTO_CIPHER_3DES_CBC:
+               case RTE_CRYPTO_CIPHER_DES_CBC:
                case RTE_CRYPTO_CIPHER_AES_CTR:
                case RTE_CRYPTO_CIPHER_3DES_CTR:
                        shared_desc_len = cnstr_shdsc_blkcipher(
@@ -487,6 +517,18 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
                alginfo_a.algtype = ses->auth_key.alg;
                alginfo_a.algmode = ses->auth_key.algmode;
                switch (ses->auth_alg) {
+               case RTE_CRYPTO_AUTH_MD5:
+               case RTE_CRYPTO_AUTH_SHA1:
+               case RTE_CRYPTO_AUTH_SHA224:
+               case RTE_CRYPTO_AUTH_SHA256:
+               case RTE_CRYPTO_AUTH_SHA384:
+               case RTE_CRYPTO_AUTH_SHA512:
+                       shared_desc_len = cnstr_shdsc_hash(
+                                               cdb->sh_desc, true,
+                                               swap, SHR_NEVER, &alginfo_a,
+                                               !ses->dir,
+                                               ses->digest_length);
+                       break;
                case RTE_CRYPTO_AUTH_MD5_HMAC:
                case RTE_CRYPTO_AUTH_SHA1_HMAC:
                case RTE_CRYPTO_AUTH_SHA224_HMAC:
@@ -513,6 +555,15 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
                                                !ses->dir,
                                                ses->digest_length);
                        break;
+               case RTE_CRYPTO_AUTH_AES_XCBC_MAC:
+               case RTE_CRYPTO_AUTH_AES_CMAC:
+                       shared_desc_len = cnstr_shdsc_aes_mac(
+                                               cdb->sh_desc,
+                                               true, swap, SHR_NEVER,
+                                               &alginfo_a,
+                                               !ses->dir,
+                                               ses->digest_length);
+                       break;
                default:
                        DPAA_SEC_ERR("unsupported auth alg %u", ses->auth_alg);
                }
@@ -560,7 +611,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
                cdb->sh_desc[0] = alginfo_c.keylen;
                cdb->sh_desc[1] = alginfo_a.keylen;
                err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-                                      MIN_JOB_DESC_SIZE,
+                                      DESC_JOB_IO_LEN,
                                       (unsigned int *)cdb->sh_desc,
                                       &cdb->sh_desc[2], 2);
 
@@ -611,6 +662,139 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
        return 0;
 }
 
+static void
+dpaa_sec_dump(struct dpaa_sec_op_ctx *ctx, struct dpaa_sec_qp *qp)
+{
+       struct dpaa_sec_job *job = &ctx->job;
+       struct rte_crypto_op *op = ctx->op;
+       dpaa_sec_session *sess = NULL;
+       struct sec_cdb c_cdb, *cdb;
+       uint8_t bufsize;
+       struct rte_crypto_sym_op *sym_op;
+       struct qm_sg_entry sg[2];
+
+       if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)
+               sess = (dpaa_sec_session *)
+                       get_sym_session_private_data(
+                                       op->sym->session,
+                                       dpaa_cryptodev_driver_id);
+#ifdef RTE_LIBRTE_SECURITY
+       else if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION)
+               sess = (dpaa_sec_session *)
+                       get_sec_session_private_data(
+                                       op->sym->sec_session);
+#endif
+       if (sess == NULL) {
+               printf("session is NULL\n");
+               goto mbuf_dump;
+       }
+
+       cdb = &sess->cdb;
+       rte_memcpy(&c_cdb, cdb, sizeof(struct sec_cdb));
+#ifdef RTE_LIBRTE_SECURITY
+       printf("\nsession protocol type = %d\n", sess->proto_alg);
+#endif
+       printf("\n****************************************\n"
+               "session params:\n\tContext type:\t%d\n\tDirection:\t%s\n"
+               "\tCipher alg:\t%d\n\tAuth alg:\t%d\n\tAead alg:\t%d\n"
+               "\tCipher key len:\t%"PRIu64"\n\tCipher alg:\t%d\n"
+               "\tCipher algmode:\t%d\n", sess->ctxt,
+               (sess->dir == DIR_ENC) ? "DIR_ENC" : "DIR_DEC",
+               sess->cipher_alg, sess->auth_alg, sess->aead_alg,
+               (uint64_t)sess->cipher_key.length, sess->cipher_key.alg,
+               sess->cipher_key.algmode);
+               rte_hexdump(stdout, "cipher key", sess->cipher_key.data,
+                               sess->cipher_key.length);
+               rte_hexdump(stdout, "auth key", sess->auth_key.data,
+                               sess->auth_key.length);
+       printf("\tAuth key len:\t%"PRIu64"\n\tAuth alg:\t%d\n"
+               "\tAuth algmode:\t%d\n\tIV len:\t\t%d\n\tIV offset:\t%d\n"
+               "\tdigest length:\t%d\n\tauth only len:\t\t%d\n"
+               "\taead cipher text:\t%d\n",
+               (uint64_t)sess->auth_key.length, sess->auth_key.alg,
+               sess->auth_key.algmode,
+               sess->iv.length, sess->iv.offset,
+               sess->digest_length, sess->auth_only_len,
+               sess->auth_cipher_text);
+#ifdef RTE_LIBRTE_SECURITY
+       printf("PDCP session params:\n"
+               "\tDomain:\t\t%d\n\tBearer:\t\t%d\n\tpkt_dir:\t%d\n\thfn_ovd:"
+               "\t%d\n\tsn_size:\t%d\n\tsdap_enabled:\t%d\n\thfn_ovd_offset:"
+               "\t%d\n\thfn:\t\t%d\n"
+               "\thfn_threshold:\t0x%x\n", sess->pdcp.domain,
+               sess->pdcp.bearer, sess->pdcp.pkt_dir, sess->pdcp.hfn_ovd,
+               sess->pdcp.sn_size, sess->pdcp.sdap_enabled,
+               sess->pdcp.hfn_ovd_offset, sess->pdcp.hfn,
+               sess->pdcp.hfn_threshold);
+#endif
+       c_cdb.sh_hdr.hi.word = rte_be_to_cpu_32(c_cdb.sh_hdr.hi.word);
+       c_cdb.sh_hdr.lo.word = rte_be_to_cpu_32(c_cdb.sh_hdr.lo.word);
+       bufsize = c_cdb.sh_hdr.hi.field.idlen;
+
+       printf("cdb = %p\n\n", cdb);
+       printf("Descriptor size = %d\n", bufsize);
+       int m;
+       for (m = 0; m < bufsize; m++)
+               printf("0x%x\n", rte_be_to_cpu_32(c_cdb.sh_desc[m]));
+
+       printf("\n");
+mbuf_dump:
+       sym_op = op->sym;
+       if (sym_op->m_src) {
+               printf("Source mbuf:\n");
+               rte_pktmbuf_dump(stdout, sym_op->m_src,
+                                sym_op->m_src->data_len);
+       }
+       if (sym_op->m_dst) {
+               printf("Destination mbuf:\n");
+               rte_pktmbuf_dump(stdout, sym_op->m_dst,
+                                sym_op->m_dst->data_len);
+       }
+
+       printf("Session address = %p\ncipher offset: %d, length: %d\n"
+               "auth offset: %d, length:  %d\n aead offset: %d, length: %d\n",
+               sym_op->session, sym_op->cipher.data.offset,
+               sym_op->cipher.data.length,
+               sym_op->auth.data.offset, sym_op->auth.data.length,
+               sym_op->aead.data.offset, sym_op->aead.data.length);
+       printf("\n");
+
+       printf("******************************************************\n");
+       printf("ctx info:\n");
+       printf("job->sg[0] output info:\n");
+       memcpy(&sg[0], &job->sg[0], sizeof(sg[0]));
+       printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textention = %d"
+               "\n\tbpid = %d\n\toffset = %d\n",
+               (uint64_t)sg[0].addr, sg[0].length, sg[0].final,
+               sg[0].extension, sg[0].bpid, sg[0].offset);
+       printf("\njob->sg[1] input info:\n");
+       memcpy(&sg[1], &job->sg[1], sizeof(sg[1]));
+       hw_sg_to_cpu(&sg[1]);
+       printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textention = %d"
+               "\n\tbpid = %d\n\toffset = %d\n",
+               (uint64_t)sg[1].addr, sg[1].length, sg[1].final,
+               sg[1].extension, sg[1].bpid, sg[1].offset);
+
+       printf("\nctx pool addr = %p\n", ctx->ctx_pool);
+       if (ctx->ctx_pool)
+               printf("ctx pool available counts = %d\n",
+                       rte_mempool_avail_count(ctx->ctx_pool));
+
+       printf("\nop pool addr = %p\n", op->mempool);
+       if (op->mempool)
+               printf("op pool available counts = %d\n",
+                       rte_mempool_avail_count(op->mempool));
+
+       printf("********************************************************\n");
+       printf("Queue data:\n");
+       printf("\tFQID = 0x%x\n\tstate = %d\n\tnb_desc = %d\n"
+               "\tctx_pool = %p\n\trx_pkts = %d\n\ttx_pkts"
+              "= %d\n\trx_errs = %d\n\ttx_errs = %d\n\n",
+               qp->outq.fqid, qp->outq.state, qp->outq.nb_desc,
+               qp->ctx_pool, qp->rx_pkts, qp->tx_pkts,
+               qp->rx_errs, qp->tx_errs);
+}
+
 /* qp is lockless, should be accessed by only one thread */
 static int
 dpaa_sec_deq(struct dpaa_sec_qp *qp, struct rte_crypto_op **ops, int nb_ops)
@@ -678,12 +862,17 @@ dpaa_sec_deq(struct dpaa_sec_qp *qp, struct rte_crypto_op **ops, int nb_ops)
                if (!ctx->fd_status) {
                        op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
                } else {
-                       DPAA_SEC_DP_WARN("SEC return err:0x%x", ctx->fd_status);
+                       if (dpaa_sec_dp_dump > DPAA_SEC_DP_NO_DUMP) {
+                               DPAA_SEC_DP_WARN("SEC return err:0x%x\n",
+                                                 ctx->fd_status);
+                               if (dpaa_sec_dp_dump > DPAA_SEC_DP_ERR_DUMP)
+                                       dpaa_sec_dump(ctx, qp);
+                       }
                        op->status = RTE_CRYPTO_OP_STATUS_ERROR;
                }
                ops[pkts++] = op;
 
-               /* report op status to sym->op and then free the ctx memeory */
+               /* report op status to sym->op and then free the ctx memory */
                rte_mempool_put(ctx->ctx_pool, (void *)ctx);
 
                qman_dqrr_consume(fq, dq);
@@ -774,7 +963,7 @@ build_auth_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
                sg++;
        }
 
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->offset = data_offset;
 
        if (data_len <= (mbuf->data_len - data_offset)) {
@@ -787,7 +976,7 @@ build_auth_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
                       (mbuf = mbuf->next)) {
                        cpu_to_hw_sg(sg);
                        sg++;
-                       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+                       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                        if (data_len > mbuf->data_len)
                                sg->length = mbuf->data_len;
                        else
@@ -892,7 +1081,7 @@ build_auth_only(struct rte_crypto_op *op, dpaa_sec_session *ses)
                sg++;
        }
 
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->offset = data_offset;
        sg->length = data_len;
 
@@ -972,7 +1161,7 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
 
        /* 1st seg */
        sg = &cf->sg[2];
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->length = mbuf->data_len - data_offset;
        sg->offset = data_offset;
 
@@ -981,7 +1170,7 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        while (mbuf) {
                cpu_to_hw_sg(sg);
                sg++;
-               qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+               qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                sg->length = mbuf->data_len;
                mbuf = mbuf->next;
        }
@@ -1006,7 +1195,7 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
 
        /* 1st seg */
        sg++;
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->length = mbuf->data_len - data_offset;
        sg->offset = data_offset;
 
@@ -1015,7 +1204,7 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        while (mbuf) {
                cpu_to_hw_sg(sg);
                sg++;
-               qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+               qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                sg->length = mbuf->data_len;
                mbuf = mbuf->next;
        }
@@ -1147,7 +1336,7 @@ build_cipher_auth_gcm_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        cpu_to_hw_sg(out_sg);
 
        /* 1st seg */
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->length = mbuf->data_len - sym->aead.data.offset;
        sg->offset = sym->aead.data.offset;
 
@@ -1156,7 +1345,7 @@ build_cipher_auth_gcm_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        while (mbuf) {
                cpu_to_hw_sg(sg);
                sg++;
-               qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+               qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                sg->length = mbuf->data_len;
                mbuf = mbuf->next;
        }
@@ -1204,7 +1393,7 @@ build_cipher_auth_gcm_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
 
        /* 3rd seg */
        sg++;
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->length = mbuf->data_len - sym->aead.data.offset;
        sg->offset = sym->aead.data.offset;
 
@@ -1213,7 +1402,7 @@ build_cipher_auth_gcm_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        while (mbuf) {
                cpu_to_hw_sg(sg);
                sg++;
-               qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+               qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                sg->length = mbuf->data_len;
                mbuf = mbuf->next;
        }
@@ -1393,7 +1582,7 @@ build_cipher_auth_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        cpu_to_hw_sg(out_sg);
 
        /* 1st seg */
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->length = mbuf->data_len - sym->auth.data.offset;
        sg->offset = sym->auth.data.offset;
 
@@ -1402,7 +1591,7 @@ build_cipher_auth_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        while (mbuf) {
                cpu_to_hw_sg(sg);
                sg++;
-               qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+               qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                sg->length = mbuf->data_len;
                mbuf = mbuf->next;
        }
@@ -1441,7 +1630,7 @@ build_cipher_auth_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
 
        /* 2nd seg */
        sg++;
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->length = mbuf->data_len - sym->auth.data.offset;
        sg->offset = sym->auth.data.offset;
 
@@ -1450,7 +1639,7 @@ build_cipher_auth_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        while (mbuf) {
                cpu_to_hw_sg(sg);
                sg++;
-               qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+               qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                sg->length = mbuf->data_len;
                mbuf = mbuf->next;
        }
@@ -1565,7 +1754,7 @@ build_cipher_auth(struct rte_crypto_op *op, dpaa_sec_session *ses)
        return cf;
 }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static inline struct dpaa_sec_job *
 build_proto(struct rte_crypto_op *op, dpaa_sec_session *ses)
 {
@@ -1581,10 +1770,10 @@ build_proto(struct rte_crypto_op *op, dpaa_sec_session *ses)
        cf = &ctx->job;
        ctx->op = op;
 
-       src_start_addr = rte_pktmbuf_mtophys(sym->m_src);
+       src_start_addr = rte_pktmbuf_iova(sym->m_src);
 
        if (sym->m_dst)
-               dst_start_addr = rte_pktmbuf_mtophys(sym->m_dst);
+               dst_start_addr = rte_pktmbuf_iova(sym->m_dst);
        else
                dst_start_addr = src_start_addr;
 
@@ -1640,7 +1829,7 @@ build_proto_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
 
        /* 1st seg */
        sg = &cf->sg[2];
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->offset = 0;
 
        /* Successive segs */
@@ -1650,7 +1839,7 @@ build_proto_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
                mbuf = mbuf->next;
                cpu_to_hw_sg(sg);
                sg++;
-               qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+               qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                sg->offset = 0;
        }
        sg->length = mbuf->buf_len - mbuf->data_off;
@@ -1672,7 +1861,7 @@ build_proto_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        qm_sg_entry_set64(in_sg, rte_dpaa_mem_vtop(sg));
 
        /* 1st seg */
-       qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+       qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
        sg->length = mbuf->data_len;
        sg->offset = 0;
 
@@ -1681,7 +1870,7 @@ build_proto_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)
        while (mbuf) {
                cpu_to_hw_sg(sg);
                sg++;
-               qm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));
+               qm_sg_entry_set64(sg, rte_pktmbuf_iova(mbuf));
                sg->length = mbuf->data_len;
                sg->offset = 0;
                in_len += sg->length;
@@ -1716,13 +1905,20 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
        uint32_t index, flags[DPAA_SEC_BURST] = {0};
        struct qman_fq *inq[DPAA_SEC_BURST];
 
+       if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
+               if (rte_dpaa_portal_init((void *)0)) {
+                       DPAA_SEC_ERR("Failure in affining portal");
+                       return 0;
+               }
+       }
+
        while (nb_ops) {
                frames_to_send = (nb_ops > DPAA_SEC_BURST) ?
                                DPAA_SEC_BURST : nb_ops;
                for (loop = 0; loop < frames_to_send; loop++) {
                        op = *(ops++);
-                       if (op->sym->m_src->seqn != 0) {
-                               index = op->sym->m_src->seqn - 1;
+                       if (*dpaa_seqn(op->sym->m_src) != 0) {
+                               index = *dpaa_seqn(op->sym->m_src) - 1;
                                if (DPAA_PER_LCORE_DQRR_HELD & (1 << index)) {
                                        /* QM_EQCR_DCA_IDXMASK = 0x0f */
                                        flags[loop] = ((index & 0x0f) << 8);
@@ -1737,10 +1933,10 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
                        case RTE_CRYPTO_OP_WITH_SESSION:
                                ses = (dpaa_sec_session *)
                                        get_sym_session_private_data(
-                                                       op->sym->session,
-                                                       cryptodev_driver_id);
+                                               op->sym->session,
+                                               dpaa_cryptodev_driver_id);
                                break;
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
                        case RTE_CRYPTO_OP_SECURITY_SESSION:
                                ses = (dpaa_sec_session *)
                                        get_sec_session_private_data(
@@ -1787,7 +1983,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
                                  ((op->sym->m_dst == NULL) ||
                                   rte_pktmbuf_is_contiguous(op->sym->m_dst))) {
                                switch (ses->ctxt) {
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
                                case DPAA_SEC_PDCP:
                                case DPAA_SEC_IPSEC:
                                        cf = build_proto(op, ses);
@@ -1821,7 +2017,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
                                }
                        } else {
                                switch (ses->ctxt) {
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
                                case DPAA_SEC_PDCP:
                                case DPAA_SEC_IPSEC:
                                        cf = build_proto_sg(op, ses);
@@ -1878,7 +2074,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
                                        ((auth_tail_len << 16) | auth_hdr_len);
                        }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
                        /* In case of PDCP, per packet HFN is stored in
                         * mbuf priv after sym_op.
                         */
@@ -1916,6 +2112,13 @@ dpaa_sec_dequeue_burst(void *qp, struct rte_crypto_op **ops,
        uint16_t num_rx;
        struct dpaa_sec_qp *dpaa_qp = (struct dpaa_sec_qp *)qp;
 
+       if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
+               if (rte_dpaa_portal_init((void *)0)) {
+                       DPAA_SEC_ERR("Failure in affining portal");
+                       return 0;
+               }
+       }
+
        num_rx = dpaa_sec_deq(dpaa_qp, ops, nb_ops);
 
        dpaa_qp->rx_pkts += num_rx;
@@ -2028,6 +2231,10 @@ dpaa_sec_cipher_init(struct rte_cryptodev *dev __rte_unused,
                session->cipher_key.alg = OP_ALG_ALGSEL_AES;
                session->cipher_key.algmode = OP_ALG_AAI_CBC;
                break;
+       case RTE_CRYPTO_CIPHER_DES_CBC:
+               session->cipher_key.alg = OP_ALG_ALGSEL_DES;
+               session->cipher_key.algmode = OP_ALG_AAI_CBC;
+               break;
        case RTE_CRYPTO_CIPHER_3DES_CBC:
                session->cipher_key.alg = OP_ALG_ALGSEL_3DES;
                session->cipher_key.algmode = OP_ALG_AAI_CBC;
@@ -2060,43 +2267,70 @@ dpaa_sec_auth_init(struct rte_cryptodev *dev __rte_unused,
 {
        session->ctxt = DPAA_SEC_AUTH;
        session->auth_alg = xform->auth.algo;
-       session->auth_key.data = rte_zmalloc(NULL, xform->auth.key.length,
+       session->auth_key.length = xform->auth.key.length;
+       if (xform->auth.key.length) {
+               session->auth_key.data =
+                               rte_zmalloc(NULL, xform->auth.key.length,
                                             RTE_CACHE_LINE_SIZE);
-       if (session->auth_key.data == NULL && xform->auth.key.length > 0) {
-               DPAA_SEC_ERR("No Memory for auth key");
-               return -ENOMEM;
+               if (session->auth_key.data == NULL) {
+                       DPAA_SEC_ERR("No Memory for auth key");
+                       return -ENOMEM;
+               }
+               memcpy(session->auth_key.data, xform->auth.key.data,
+                               xform->auth.key.length);
+
        }
-       session->auth_key.length = xform->auth.key.length;
        session->digest_length = xform->auth.digest_length;
        if (session->cipher_alg == RTE_CRYPTO_CIPHER_NULL) {
                session->iv.offset = xform->auth.iv.offset;
                session->iv.length = xform->auth.iv.length;
        }
 
-       memcpy(session->auth_key.data, xform->auth.key.data,
-              xform->auth.key.length);
-
        switch (xform->auth.algo) {
+       case RTE_CRYPTO_AUTH_SHA1:
+               session->auth_key.alg = OP_ALG_ALGSEL_SHA1;
+               session->auth_key.algmode = OP_ALG_AAI_HASH;
+               break;
        case RTE_CRYPTO_AUTH_SHA1_HMAC:
                session->auth_key.alg = OP_ALG_ALGSEL_SHA1;
                session->auth_key.algmode = OP_ALG_AAI_HMAC;
                break;
+       case RTE_CRYPTO_AUTH_MD5:
+               session->auth_key.alg = OP_ALG_ALGSEL_MD5;
+               session->auth_key.algmode = OP_ALG_AAI_HASH;
+               break;
        case RTE_CRYPTO_AUTH_MD5_HMAC:
                session->auth_key.alg = OP_ALG_ALGSEL_MD5;
                session->auth_key.algmode = OP_ALG_AAI_HMAC;
                break;
+       case RTE_CRYPTO_AUTH_SHA224:
+               session->auth_key.alg = OP_ALG_ALGSEL_SHA224;
+               session->auth_key.algmode = OP_ALG_AAI_HASH;
+               break;
        case RTE_CRYPTO_AUTH_SHA224_HMAC:
                session->auth_key.alg = OP_ALG_ALGSEL_SHA224;
                session->auth_key.algmode = OP_ALG_AAI_HMAC;
                break;
+       case RTE_CRYPTO_AUTH_SHA256:
+               session->auth_key.alg = OP_ALG_ALGSEL_SHA256;
+               session->auth_key.algmode = OP_ALG_AAI_HASH;
+               break;
        case RTE_CRYPTO_AUTH_SHA256_HMAC:
                session->auth_key.alg = OP_ALG_ALGSEL_SHA256;
                session->auth_key.algmode = OP_ALG_AAI_HMAC;
                break;
+       case RTE_CRYPTO_AUTH_SHA384:
+               session->auth_key.alg = OP_ALG_ALGSEL_SHA384;
+               session->auth_key.algmode = OP_ALG_AAI_HASH;
+               break;
        case RTE_CRYPTO_AUTH_SHA384_HMAC:
                session->auth_key.alg = OP_ALG_ALGSEL_SHA384;
                session->auth_key.algmode = OP_ALG_AAI_HMAC;
                break;
+       case RTE_CRYPTO_AUTH_SHA512:
+               session->auth_key.alg = OP_ALG_ALGSEL_SHA512;
+               session->auth_key.algmode = OP_ALG_AAI_HASH;
+               break;
        case RTE_CRYPTO_AUTH_SHA512_HMAC:
                session->auth_key.alg = OP_ALG_ALGSEL_SHA512;
                session->auth_key.algmode = OP_ALG_AAI_HMAC;
@@ -2109,6 +2343,14 @@ dpaa_sec_auth_init(struct rte_cryptodev *dev __rte_unused,
                session->auth_key.alg = OP_ALG_ALGSEL_ZUCA;
                session->auth_key.algmode = OP_ALG_AAI_F9;
                break;
+       case RTE_CRYPTO_AUTH_AES_XCBC_MAC:
+               session->auth_key.alg = OP_ALG_ALGSEL_AES;
+               session->auth_key.algmode = OP_ALG_AAI_XCBC_MAC;
+               break;
+       case RTE_CRYPTO_AUTH_AES_CMAC:
+               session->auth_key.alg = OP_ALG_ALGSEL_AES;
+               session->auth_key.algmode = OP_ALG_AAI_CMAC;
+               break;
        default:
                DPAA_SEC_ERR("Crypto: Unsupported Auth specified %u",
                              xform->auth.algo);
@@ -2190,6 +2432,14 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev __rte_unused,
                session->auth_key.alg = OP_ALG_ALGSEL_SHA512;
                session->auth_key.algmode = OP_ALG_AAI_HMAC;
                break;
+       case RTE_CRYPTO_AUTH_AES_XCBC_MAC:
+               session->auth_key.alg = OP_ALG_ALGSEL_AES;
+               session->auth_key.algmode = OP_ALG_AAI_XCBC_MAC;
+               break;
+       case RTE_CRYPTO_AUTH_AES_CMAC:
+               session->auth_key.alg = OP_ALG_ALGSEL_AES;
+               session->auth_key.algmode = OP_ALG_AAI_CMAC;
+               break;
        default:
                DPAA_SEC_ERR("Crypto: Unsupported Auth specified %u",
                              auth_xform->algo);
@@ -2203,6 +2453,10 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev __rte_unused,
                session->cipher_key.alg = OP_ALG_ALGSEL_AES;
                session->cipher_key.algmode = OP_ALG_AAI_CBC;
                break;
+       case RTE_CRYPTO_CIPHER_DES_CBC:
+               session->cipher_key.alg = OP_ALG_ALGSEL_DES;
+               session->cipher_key.algmode = OP_ALG_AAI_CBC;
+               break;
        case RTE_CRYPTO_CIPHER_3DES_CBC:
                session->cipher_key.alg = OP_ALG_ALGSEL_3DES;
                session->cipher_key.algmode = OP_ALG_AAI_CBC;
@@ -2283,7 +2537,7 @@ dpaa_sec_detach_rxq(struct dpaa_sec_dev_private *qi, struct qman_fq *fq)
        for (i = 0; i < RTE_DPAA_MAX_RX_QUEUE; i++) {
                if (&qi->inq[i] == fq) {
                        if (qman_retire_fq(fq, NULL) != 0)
-                               DPAA_SEC_WARN("Queue is not retired\n");
+                               DPAA_SEC_DEBUG("Queue is not retired\n");
                        qman_oos_fq(fq);
                        qi->inq_attach[i] = 0;
                        return 0;
@@ -2292,7 +2546,7 @@ dpaa_sec_detach_rxq(struct dpaa_sec_dev_private *qi, struct qman_fq *fq)
        return -1;
 }
 
-static int
+int
 dpaa_sec_attach_sess_q(struct dpaa_sec_qp *qp, dpaa_sec_session *sess)
 {
        int ret;
@@ -2303,7 +2557,7 @@ dpaa_sec_attach_sess_q(struct dpaa_sec_qp *qp, dpaa_sec_session *sess)
                DPAA_SEC_ERR("Unable to prepare sec cdb");
                return ret;
        }
-       if (unlikely(!RTE_PER_LCORE(dpaa_io))) {
+       if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
                ret = rte_dpaa_portal_init((void *)0);
                if (ret) {
                        DPAA_SEC_ERR("Failure in affining portal");
@@ -2493,7 +2747,7 @@ dpaa_sec_sym_session_clear(struct rte_cryptodev *dev,
        }
 }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static int
 dpaa_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform,
                        struct rte_security_ipsec_xform *ipsec_xform,
@@ -2621,12 +2875,16 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform,
                break;
        case RTE_CRYPTO_AUTH_AES_CMAC:
                session->auth_key.alg = OP_PCL_IPSEC_AES_CMAC_96;
+               session->auth_key.algmode = OP_ALG_AAI_CMAC;
                break;
        case RTE_CRYPTO_AUTH_NULL:
                session->auth_key.alg = OP_PCL_IPSEC_HMAC_NULL;
                break;
-       case RTE_CRYPTO_AUTH_SHA224_HMAC:
        case RTE_CRYPTO_AUTH_AES_XCBC_MAC:
+               session->auth_key.alg = OP_PCL_IPSEC_AES_XCBC_MAC_96;
+               session->auth_key.algmode = OP_ALG_AAI_XCBC_MAC;
+               break;
+       case RTE_CRYPTO_AUTH_SHA224_HMAC:
        case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
        case RTE_CRYPTO_AUTH_SHA1:
        case RTE_CRYPTO_AUTH_SHA256:
@@ -2652,6 +2910,10 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform,
                session->cipher_key.alg = OP_PCL_IPSEC_AES_CBC;
                session->cipher_key.algmode = OP_ALG_AAI_CBC;
                break;
+       case RTE_CRYPTO_CIPHER_DES_CBC:
+               session->cipher_key.alg = OP_PCL_IPSEC_DES;
+               session->cipher_key.algmode = OP_ALG_AAI_CBC;
+               break;
        case RTE_CRYPTO_CIPHER_3DES_CBC:
                session->cipher_key.alg = OP_PCL_IPSEC_3DES;
                session->cipher_key.algmode = OP_ALG_AAI_CBC;
@@ -2707,6 +2969,12 @@ dpaa_sec_set_ipsec_session(__rte_unused struct rte_cryptodev *dev,
        session->proto_alg = conf->protocol;
        session->ctxt = DPAA_SEC_IPSEC;
 
+       if (ipsec_xform->life.bytes_hard_limit != 0 ||
+           ipsec_xform->life.bytes_soft_limit != 0 ||
+           ipsec_xform->life.packets_hard_limit != 0 ||
+           ipsec_xform->life.packets_soft_limit != 0)
+               return -ENOTSUP;
+
        if (ipsec_xform->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS)
                session->dir = DIR_ENC;
        else
@@ -2785,12 +3053,14 @@ dpaa_sec_set_ipsec_session(__rte_unused struct rte_cryptodev *dev,
                        session->encap_pdb.ip_hdr_len =
                                                sizeof(struct rte_ipv6_hdr);
                }
+
                session->encap_pdb.options =
                        (IPVERSION << PDBNH_ESP_ENCAP_SHIFT) |
                        PDBOPTS_ESP_OIHI_PDB_INL |
                        PDBOPTS_ESP_IVSRC |
-                       PDBHMO_ESP_ENCAP_DTTL |
                        PDBHMO_ESP_SNR;
+               if (ipsec_xform->options.dec_ttl)
+                       session->encap_pdb.options |= PDBHMO_ESP_ENCAP_DTTL;
                if (ipsec_xform->options.esn)
                        session->encap_pdb.options |= PDBOPTS_ESP_ESN;
                session->encap_pdb.spi = ipsec_xform->spi;
@@ -2865,11 +3135,13 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,
        /* find xfrm types */
        if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {
                cipher_xform = &xform->cipher;
-               if (xform->next != NULL)
+               if (xform->next != NULL &&
+                       xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH)
                        auth_xform = &xform->next->auth;
        } else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) {
                auth_xform = &xform->auth;
-               if (xform->next != NULL)
+               if (xform->next != NULL &&
+                       xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER)
                        cipher_xform = &xform->next->cipher;
        } else {
                DPAA_SEC_ERR("Invalid crypto type");
@@ -2975,7 +3247,9 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,
        session->pdcp.hfn = pdcp_xform->hfn;
        session->pdcp.hfn_threshold = pdcp_xform->hfn_threshold;
        session->pdcp.hfn_ovd = pdcp_xform->hfn_ovrd;
-       session->pdcp.hfn_ovd_offset = cipher_xform->iv.offset;
+       session->pdcp.sdap_enabled = pdcp_xform->sdap_enabled;
+       if (cipher_xform)
+               session->pdcp.hfn_ovd_offset = cipher_xform->iv.offset;
 
        rte_spinlock_lock(&dev_priv->lock);
        for (i = 0; i < MAX_DPAA_CORES; i++) {
@@ -3098,7 +3372,7 @@ dpaa_sec_dev_infos_get(struct rte_cryptodev *dev,
                info->feature_flags = dev->feature_flags;
                info->capabilities = dpaa_sec_capabilities;
                info->sym.max_nb_sessions = internals->max_nb_sessions;
-               info->driver_id = cryptodev_driver_id;
+               info->driver_id = dpaa_cryptodev_driver_id;
        }
 }
 
@@ -3210,7 +3484,7 @@ dpaa_sec_process_atomic_event(void *event,
        DPAA_PER_LCORE_DQRR_HELD |= 1 << index;
        DPAA_PER_LCORE_DQRR_MBUF(index) = ctx->op->sym->m_src;
        ev->impl_opaque = index + 1;
-       ctx->op->sym->m_src->seqn = (uint32_t)index + 1;
+       *dpaa_seqn(ctx->op->sym->m_src) = (uint32_t)index + 1;
        *bufs = (void *)ctx->op;
 
        rte_mempool_put(ctx->ctx_pool, (void *)ctx);
@@ -3294,10 +3568,13 @@ static struct rte_cryptodev_ops crypto_ops = {
        .queue_pair_release   = dpaa_sec_queue_pair_release,
        .sym_session_get_size     = dpaa_sec_sym_session_get_size,
        .sym_session_configure    = dpaa_sec_sym_session_configure,
-       .sym_session_clear        = dpaa_sec_sym_session_clear
+       .sym_session_clear        = dpaa_sec_sym_session_clear,
+       /* Raw data-path API related operations */
+       .sym_get_raw_dp_ctx_size = dpaa_sec_get_dp_ctx_size,
+       .sym_configure_raw_dp_ctx = dpaa_sec_configure_raw_dp_ctx,
 };
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static const struct rte_security_capability *
 dpaa_sec_capabilities_get(void *device __rte_unused)
 {
@@ -3332,20 +3609,82 @@ dpaa_sec_uninit(struct rte_cryptodev *dev)
        return 0;
 }
 
+static int
+check_devargs_handler(__rte_unused const char *key, const char *value,
+                     __rte_unused void *opaque)
+{
+       dpaa_sec_dp_dump = atoi(value);
+       if (dpaa_sec_dp_dump > DPAA_SEC_DP_FULL_DUMP) {
+               DPAA_SEC_WARN("WARN: DPAA_SEC_DP_DUMP_LEVEL is not "
+                             "supported, changing to FULL error prints\n");
+               dpaa_sec_dp_dump = DPAA_SEC_DP_FULL_DUMP;
+       }
+
+       return 0;
+}
+
+static void
+dpaa_sec_get_devargs(struct rte_devargs *devargs, const char *key)
+{
+       struct rte_kvargs *kvlist;
+
+       if (!devargs)
+               return;
+
+       kvlist = rte_kvargs_parse(devargs->args, NULL);
+       if (!kvlist)
+               return;
+
+       if (!rte_kvargs_count(kvlist, key)) {
+               rte_kvargs_free(kvlist);
+               return;
+       }
+
+       rte_kvargs_process(kvlist, key,
+                               check_devargs_handler, NULL);
+       rte_kvargs_free(kvlist);
+}
+
 static int
 dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)
 {
        struct dpaa_sec_dev_private *internals;
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        struct rte_security_ctx *security_instance;
 #endif
        struct dpaa_sec_qp *qp;
        uint32_t i, flags;
        int ret;
+       void *cmd_map;
+       int map_fd = -1;
 
        PMD_INIT_FUNC_TRACE();
 
-       cryptodev->driver_id = cryptodev_driver_id;
+       internals = cryptodev->data->dev_private;
+       map_fd = open("/dev/mem", O_RDWR);
+       if (unlikely(map_fd < 0)) {
+               DPAA_SEC_ERR("Unable to open (/dev/mem)");
+               return map_fd;
+       }
+       internals->sec_hw = mmap(NULL, MAP_SIZE, PROT_READ | PROT_WRITE,
+                           MAP_SHARED, map_fd, SEC_BASE_ADDR);
+       if (internals->sec_hw == MAP_FAILED) {
+               DPAA_SEC_ERR("Memory map failed");
+               close(map_fd);
+               return -EINVAL;
+       }
+       cmd_map = (uint8_t *)internals->sec_hw +
+                 (BLOCK_OFFSET * QI_BLOCK_NUMBER) + CMD_REG;
+       if (!(be32_to_cpu(rte_read32(cmd_map)) & QICTL_DQEN))
+               /* enable QI interface */
+               rte_write32(cpu_to_be32(QICTL_DQEN), cmd_map);
+
+       ret = munmap(internals->sec_hw, MAP_SIZE);
+       if (ret)
+               DPAA_SEC_WARN("munmap failed\n");
+
+       close(map_fd);
+       cryptodev->driver_id = dpaa_cryptodev_driver_id;
        cryptodev->dev_ops = &crypto_ops;
 
        cryptodev->enqueue_burst = dpaa_sec_enqueue_burst;
@@ -3354,13 +3693,13 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)
                        RTE_CRYPTODEV_FF_HW_ACCELERATED |
                        RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
                        RTE_CRYPTODEV_FF_SECURITY |
+                       RTE_CRYPTODEV_FF_SYM_RAW_DP |
                        RTE_CRYPTODEV_FF_IN_PLACE_SGL |
                        RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT |
                        RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |
                        RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT |
                        RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;
 
-       internals = cryptodev->data->dev_private;
        internals->max_nb_queue_pairs = RTE_DPAA_MAX_NB_SEC_QPS;
        internals->max_nb_sessions = RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS;
 
@@ -3373,7 +3712,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)
                DPAA_SEC_WARN("Device already init by primary process");
                return 0;
        }
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        /* Initialize security_ctx only for primary process*/
        security_instance = rte_malloc("rte_security_instances_ops",
                                sizeof(struct rte_security_ctx), 0);
@@ -3406,6 +3745,8 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)
                }
        }
 
+       dpaa_sec_get_devargs(cryptodev->device->devargs, DRIVER_DUMP_MODE);
+
        RTE_LOG(INFO, PMD, "%s cryptodev init\n", cryptodev->data->name);
        return 0;
 
@@ -3465,7 +3806,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused,
                }
        }
 
-       if (unlikely(!RTE_PER_LCORE(dpaa_io))) {
+       if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
                retval = rte_dpaa_portal_init((void *)1);
                if (retval) {
                        DPAA_SEC_ERR("Unable to initialize portal");
@@ -3475,8 +3816,10 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused,
 
        /* Invoke PMD device initialization function */
        retval = dpaa_sec_dev_init(cryptodev);
-       if (retval == 0)
+       if (retval == 0) {
+               rte_cryptodev_pmd_probing_finish(cryptodev);
                return 0;
+       }
 
        retval = -ENXIO;
 out:
@@ -3519,11 +3862,7 @@ static struct cryptodev_driver dpaa_sec_crypto_drv;
 
 RTE_PMD_REGISTER_DPAA(CRYPTODEV_NAME_DPAA_SEC_PMD, rte_dpaa_sec_driver);
 RTE_PMD_REGISTER_CRYPTO_DRIVER(dpaa_sec_crypto_drv, rte_dpaa_sec_driver.driver,
-               cryptodev_driver_id);
-
-RTE_INIT(dpaa_sec_init_log)
-{
-       dpaa_logtype_sec = rte_log_register("pmd.crypto.dpaa");
-       if (dpaa_logtype_sec >= 0)
-               rte_log_set_level(dpaa_logtype_sec, RTE_LOG_NOTICE);
-}
+               dpaa_cryptodev_driver_id);
+RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_DPAA_SEC_PMD,
+               DRIVER_DUMP_MODE "=<int>");
+RTE_LOG_REGISTER(dpaa_logtype_sec, pmd.crypto.dpaa, NOTICE);