crypto/dpaa_sec: affine the thread portal affinity

[dpdk.git] / drivers / crypto / dpaa_sec / dpaa_sec.c

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index d9fa8bb..19d4684 100644 (file)
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -15,11 +15,12 @@
 #include <rte_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_ip.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
@@ -36,6 +37,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>
@@ -45,9 +47,6 @@
 
 static uint8_t cryptodev_driver_id;
 
-static __thread struct rte_crypto_op **dpaa_sec_ops;
-static __thread int dpaa_sec_op_nb;
-
 static int
 dpaa_sec_attach_sess_q(struct dpaa_sec_qp *qp, dpaa_sec_session *sess);
 
@@ -143,7 +142,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))
@@ -174,7 +173,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;
@@ -232,7 +231,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)
 {
@@ -240,7 +239,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
@@ -254,10 +252,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;
@@ -267,33 +261,17 @@ 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) {
+       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);
+                       (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;
-       }
-
-       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)
@@ -317,24 +295,49 @@ dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)
                                        &cipherdata, &authdata,
                                        0);
        } 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, 0);
+                       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, 0);
+               } 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, 0);
+                       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, 0);
+               }
        }
        return shared_desc_len;
 }
@@ -372,7 +375,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);
 
@@ -432,7 +435,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;
@@ -558,7 +561,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);
 
@@ -772,7 +775,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)) {
@@ -785,7 +788,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
@@ -890,7 +893,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;
 
@@ -970,7 +973,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;
 
@@ -979,7 +982,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;
        }
@@ -1004,7 +1007,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;
 
@@ -1013,7 +1016,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;
        }
@@ -1145,7 +1148,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;
 
@@ -1154,7 +1157,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;
        }
@@ -1202,7 +1205,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;
 
@@ -1211,7 +1214,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;
        }
@@ -1391,7 +1394,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;
 
@@ -1400,7 +1403,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;
        }
@@ -1439,7 +1442,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;
 
@@ -1448,7 +1451,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;
        }
@@ -1563,7 +1566,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)
 {
@@ -1579,10 +1582,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;
 
@@ -1638,7 +1641,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 */
@@ -1648,7 +1651,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;
@@ -1670,7 +1673,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;
 
@@ -1679,7 +1682,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;
@@ -1714,13 +1717,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);
@@ -1738,7 +1748,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
                                                        op->sym->session,
                                                        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(
@@ -1785,7 +1795,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);
@@ -1819,7 +1829,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);
@@ -1876,7 +1886,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.
                         */
@@ -1914,6 +1924,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;
@@ -2281,7 +2298,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;
@@ -2301,7 +2318,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");
@@ -2491,7 +2508,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,
@@ -2973,7 +2990,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++) {
@@ -3208,7 +3227,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);
@@ -3295,7 +3314,7 @@ static struct rte_cryptodev_ops crypto_ops = {
        .sym_session_clear        = dpaa_sec_sym_session_clear
 };
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static const struct rte_security_capability *
 dpaa_sec_capabilities_get(void *device __rte_unused)
 {
@@ -3334,7 +3353,7 @@ 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;
@@ -3371,7 +3390,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);
@@ -3463,7 +3482,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");