test/crypto: fix statistics case
[dpdk.git] / app / test / test_cryptodev.c
index e6abc22..8f63146 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2019 Intel Corporation
+ * Copyright(c) 2015-2020 Intel Corporation
  */
 
 #include <time.h>
@@ -52,6 +52,9 @@
 
 static int gbl_driver_id;
 
+static enum rte_security_session_action_type gbl_action_type =
+       RTE_SECURITY_ACTION_TYPE_NONE;
+
 struct crypto_testsuite_params {
        struct rte_mempool *mbuf_pool;
        struct rte_mempool *large_mbuf_pool;
@@ -139,9 +142,99 @@ ceil_byte_length(uint32_t num_bits)
                return (num_bits >> 3);
 }
 
+static void
+process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op)
+{
+       int32_t n, st;
+       void *iv;
+       struct rte_crypto_sym_op *sop;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sgl sgl;
+       struct rte_crypto_sym_vec symvec;
+       struct rte_crypto_vec vec[UINT8_MAX];
+
+       sop = op->sym;
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, sop->aead.data.offset,
+               sop->aead.data.length, vec, RTE_DIM(vec));
+
+       if (n < 0 || n != sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       sgl.vec = vec;
+       sgl.num = n;
+       symvec.sgl = &sgl;
+       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       symvec.iv = &iv;
+       symvec.aad = (void **)&sop->aead.aad.data;
+       symvec.digest = (void **)&sop->aead.digest.data;
+       symvec.status = &st;
+       symvec.num = 1;
+
+       ofs.raw = 0;
+
+       n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
+               &symvec);
+
+       if (n != 1)
+               op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+       else
+               op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+}
+
+static void
+process_cpu_crypt_auth_op(uint8_t dev_id, struct rte_crypto_op *op)
+{
+       int32_t n, st;
+       void *iv;
+       struct rte_crypto_sym_op *sop;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sgl sgl;
+       struct rte_crypto_sym_vec symvec;
+       struct rte_crypto_vec vec[UINT8_MAX];
+
+       sop = op->sym;
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, sop->auth.data.offset,
+               sop->auth.data.length, vec, RTE_DIM(vec));
+
+       if (n < 0 || n != sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       sgl.vec = vec;
+       sgl.num = n;
+       symvec.sgl = &sgl;
+       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       symvec.iv = &iv;
+       symvec.aad = (void **)&sop->aead.aad.data;
+       symvec.digest = (void **)&sop->auth.digest.data;
+       symvec.status = &st;
+       symvec.num = 1;
+
+       ofs.raw = 0;
+       ofs.ofs.cipher.head = sop->cipher.data.offset - sop->auth.data.offset;
+       ofs.ofs.cipher.tail = (sop->auth.data.offset + sop->auth.data.length) -
+               (sop->cipher.data.offset + sop->cipher.data.length);
+
+       n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
+               &symvec);
+
+       if (n != 1)
+               op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+       else
+               op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+}
+
 static struct rte_crypto_op *
 process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
 {
+
+       RTE_VERIFY(gbl_action_type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO);
+
        if (rte_cryptodev_enqueue_burst(dev_id, 0, &op, 1) != 1) {
                RTE_LOG(ERR, USER1, "Error sending packet for encryption\n");
                return NULL;
@@ -674,27 +767,19 @@ test_device_configure_invalid_queue_pair_ids(void)
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        uint16_t orig_nb_qps = ts_params->conf.nb_queue_pairs;
 
-       /* This test is for QAT and NITROX PMDs only */
-       if (gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)) &&
-           gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NITROX_PMD)))
-               return -ENOTSUP;
-
        /* Stop the device in case it's started so it can be configured */
        rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-       /* valid - one queue pairs */
-       ts_params->conf.nb_queue_pairs = 1;
+       /* valid - max value queue pairs */
+       ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
                        "Failed to configure cryptodev: dev_id %u, qp_id %u",
                        ts_params->valid_devs[0], ts_params->conf.nb_queue_pairs);
 
-
-       /* valid - max value queue pairs */
-       ts_params->conf.nb_queue_pairs = orig_nb_qps;
+       /* valid - one queue pairs */
+       ts_params->conf.nb_queue_pairs = 1;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -745,24 +830,14 @@ static int
 test_queue_pair_descriptor_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct rte_cryptodev_info dev_info;
        struct rte_cryptodev_qp_conf qp_conf = {
                .nb_descriptors = MAX_NUM_OPS_INFLIGHT
        };
-
        uint16_t qp_id;
 
-       /* This test is for QAT PMD only */
-       if (gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)))
-               return -ENOTSUP;
-
        /* Stop the device in case it's started so it can be configured */
        rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
                        "Failed to configure cryptodev %u",
@@ -816,36 +891,6 @@ test_queue_pair_descriptor_setup(void)
                                ts_params->valid_devs[0]);
        }
 
-       /* invalid number of descriptors - max supported + 2 */
-       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT + 2;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
-       /* invalid number of descriptors - max value of parameter */
-       qp_conf.nb_descriptors = UINT32_MAX-1;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;
 
        for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
@@ -860,21 +905,6 @@ test_queue_pair_descriptor_setup(void)
                                ts_params->valid_devs[0]);
        }
 
-       /* invalid number of descriptors - max supported + 1 */
-       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT + 1;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
        /* test invalid queue pair id */
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;      /*valid */
 
@@ -1447,8 +1477,14 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
        sym_op->cipher.data.length = QUOTE_512_BYTES;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -1598,8 +1634,14 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
        sym_op->cipher.data.length = QUOTE_512_BYTES;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                               process_crypto_request(ts_params->valid_devs[0],
+                                       ut_params->op),
+                                       "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -1630,7 +1672,6 @@ test_blockcipher(enum blockcipher_test_type test_type)
                ts_params->op_mpool,
                ts_params->session_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
-               gbl_driver_id,
                test_type);
 
        if (status == -ENOTSUP)
@@ -1946,6 +1987,8 @@ create_wireless_cipher_auth_session(uint8_t dev_id,
        status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
                        &ut_params->cipher_xform,
                        ts_params->session_priv_mpool);
+       if (status == -ENOTSUP)
+               return status;
 
        TEST_ASSERT_EQUAL(status, 0, "session init failed");
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
@@ -2357,12 +2400,16 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
        uint8_t *plaintext;
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* QAT PMD supports byte-aligned data only */
-       if ((tdata->validAuthLenInBits.len % 8 != 0) &&
-                       (gbl_driver_id == rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD))))
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
                return -ENOTSUP;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2431,12 +2478,16 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
        uint8_t *plaintext;
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* QAT PMD supports byte-aligned data only */
-       if ((tdata->validAuthLenInBits.len % 8 != 0) &&
-                       (gbl_driver_id == rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD))))
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
                return -ENOTSUP;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2546,8 +2597,13 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+
        ut_params->obuf = ut_params->op->sym->m_src;
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
        ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
@@ -3530,11 +3586,16 @@ test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata)
        uint32_t plaintext_pad_len;
        uint8_t extra_offset = 4;
        uint8_t *expected_ciphertext_shifted;
+       struct rte_cryptodev_info dev_info;
 
-       /* QAT PMD supports byte-aligned data only */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)))
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validDataLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
                return -ENOTSUP;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3788,8 +3849,19 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
 
+       struct rte_cryptodev_info dev_info;
        struct rte_cryptodev_sym_capability_idx cap_idx;
 
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8 != 0) ||
+                       (tdata->validDataLenInBits.len % 8 != 0))) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
+
        /* Check if device supports ZUC EEA3 */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
@@ -4977,12 +5049,16 @@ test_zuc_authentication(const struct wireless_test_data *tdata)
        uint8_t *plaintext;
 
        struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* QAT PMD supports byte-aligned data only */
-       if ((tdata->validAuthLenInBits.len % 8 != 0) &&
-                       (gbl_driver_id == rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD))))
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       (tdata->validAuthLenInBits.len % 8 != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
                return -ENOTSUP;
+       }
 
        /* Check if device supports ZUC EIA3 */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
@@ -5075,6 +5151,19 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
                printf("Device doesn't support digest encrypted.\n");
                return -ENOTSUP;
        }
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       }
 
        /* Create ZUC session */
        retval = create_wireless_algo_auth_cipher_session(
@@ -5923,11 +6012,6 @@ test_zuc_hash_generate_test_case_6(void)
 static int
 test_zuc_hash_generate_test_case_7(void)
 {
-       /* This test is not for SW ZUC PMD */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_ZUC_PMD)))
-               return -ENOTSUP;
-
        return test_zuc_authentication(&zuc_test_case_auth_2080b);
 }
 
@@ -5952,11 +6036,6 @@ test_zuc_cipher_auth_test_case_2(void)
 static int
 test_zuc_auth_cipher_test_case_1(void)
 {
-       /* This test is not for SW ZUC PMD */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_ZUC_PMD)))
-               return -ENOTSUP;
-
        return test_zuc_auth_cipher(
                &zuc_auth_cipher_test_case_1, IN_PLACE, 0);
 }
@@ -6794,9 +6873,15 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
                                uint8_t *, IV_OFFSET);
 
-               rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
-               debug_hexdump(stdout, "iv:", iv_ptr,
-                       tdata->iv.len);
+               if (tdata->iv.len == 0) {
+                       rte_memcpy(iv_ptr, tdata->iv.data, AES_GCM_J0_LENGTH);
+                       debug_hexdump(stdout, "iv:", iv_ptr,
+                               AES_GCM_J0_LENGTH);
+               } else {
+                       rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
+                       debug_hexdump(stdout, "iv:", iv_ptr,
+                               tdata->iv.len);
+               }
        }
 
        /* Append plaintext/ciphertext */
@@ -6937,7 +7022,11 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
        ut_params->op->sym->m_src = ut_params->ibuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -7567,6 +7656,34 @@ test_PDCP_PROTO_SGL_oop_128B_32B(void)
                        pdcp_test_data_in_len[i]+4,
                        128, 32);
 }
+
+static int
+test_PDCP_PROTO_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct rte_cryptodev_info dev_info;
+       int status;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SECURITY))
+               return -ENOTSUP;
+
+       status = test_PDCP_PROTO_cplane_encap_all();
+       status += test_PDCP_PROTO_cplane_decap_all();
+       status += test_PDCP_PROTO_uplane_encap_all();
+       status += test_PDCP_PROTO_uplane_decap_all();
+       status += test_PDCP_PROTO_SGL_in_place_32B();
+       status += test_PDCP_PROTO_SGL_oop_32B_128B();
+       status += test_PDCP_PROTO_SGL_oop_32B_40B();
+       status += test_PDCP_PROTO_SGL_oop_128B_32B();
+
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
+}
 #endif
 
 static int
@@ -7617,6 +7734,12 @@ test_AES_GCM_authenticated_encryption_test_case_8(void)
        return test_authenticated_encryption(&gcm_test_case_8);
 }
 
+static int
+test_AES_GCM_J0_authenticated_encryption_test_case_1(void)
+{
+       return test_authenticated_encryption(&gcm_J0_test_case_1);
+}
+
 static int
 test_AES_GCM_auth_encryption_test_case_192_1(void)
 {
@@ -7868,7 +7991,11 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
        ut_params->op->sym->m_src = ut_params->ibuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -7946,6 +8073,12 @@ test_AES_GCM_authenticated_decryption_test_case_8(void)
        return test_authenticated_decryption(&gcm_test_case_8);
 }
 
+static int
+test_AES_GCM_J0_authenticated_decryption_test_case_1(void)
+{
+       return test_authenticated_decryption(&gcm_J0_test_case_1);
+}
+
 static int
 test_AES_GCM_auth_decryption_test_case_192_1(void)
 {
@@ -8154,6 +8287,10 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata)
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
                        tdata->algo,
@@ -8239,6 +8376,10 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata)
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
                        tdata->algo,
@@ -8310,12 +8451,18 @@ test_authenticated_encryption_sessionless(
        uint8_t *ciphertext, *auth_tag;
        uint16_t plaintext_pad_len;
        uint8_t key[tdata->key.len + 1];
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* This test is for AESNI MB and AESNI GCM PMDs only */
-       if ((gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD))) &&
-                       (gbl_driver_id != rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD))))
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SYM_SESSIONLESS)) {
+               printf("Device doesn't support Sessionless ops.\n");
+               return -ENOTSUP;
+       }
+
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
                return -ENOTSUP;
 
        /* Verify the capabilities */
@@ -8406,12 +8553,18 @@ test_authenticated_decryption_sessionless(
        int retval;
        uint8_t *plaintext;
        uint8_t key[tdata->key.len + 1];
+       struct rte_cryptodev_info dev_info;
 
-       /* This test is for AESNI MB and AESNI GCM PMDs only */
-       if ((gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD))) &&
-                       (gbl_driver_id != rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD))))
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SYM_SESSIONLESS)) {
+               printf("Device doesn't support Sessionless ops.\n");
+               return -ENOTSUP;
+       }
+
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
                return -ENOTSUP;
 
        /* Verify the capabilities */
@@ -8597,8 +8750,9 @@ test_stats(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct rte_cryptodev_stats stats;
-       struct rte_cryptodev *dev;
-       cryptodev_stats_get_t temp_pfn;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -8613,19 +8767,16 @@ test_stats(void)
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
+       if (rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
+                       == -ENOTSUP)
+               return -ENOTSUP;
+
        rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
        TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0] + 600,
                        &stats) == -ENODEV),
                "rte_cryptodev_stats_get invalid dev failed");
        TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], 0) != 0),
                "rte_cryptodev_stats_get invalid Param failed");
-       dev = &rte_cryptodevs[ts_params->valid_devs[0]];
-       temp_pfn = dev->dev_ops->stats_get;
-       dev->dev_ops->stats_get = (cryptodev_stats_get_t)0;
-       TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
-                       == -ENOTSUP),
-               "rte_cryptodev_stats_get invalid Param failed");
-       dev->dev_ops->stats_get = temp_pfn;
 
        /* Test expected values */
        ut_setup();
@@ -8771,8 +8922,14 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)
        if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
                return TEST_FAILED;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -8823,8 +8980,14 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)
        if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
                return TEST_FAILED;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "HMAC_MD5 crypto op processing failed");
@@ -9736,7 +9899,12 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
 
        ut_params->op->sym->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -9848,7 +10016,12 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
 
        ut_params->op->sym->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -10405,10 +10578,17 @@ test_authentication_verify_fail_when_data_corruption(
        else
                tag_corruption(plaintext, reference->plaintext.len);
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
                        ut_params->op);
-
-       TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
 
        return 0;
 }
@@ -10469,10 +10649,17 @@ test_authentication_verify_GMAC_fail_when_corruption(
        else
                tag_corruption(plaintext, reference->aad.len);
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
                        ut_params->op);
-
-       TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
 
        return 0;
 }
@@ -10537,10 +10724,17 @@ test_authenticated_decryption_fail_when_corruption(
        else
                tag_corruption(ciphertext, reference->ciphertext.len);
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
                        ut_params->op);
-
-       TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
 
        return 0;
 }
@@ -10628,8 +10822,12 @@ test_authenticated_encryt_with_esn(
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
                        ut_params->op);
+       else
+               ut_params->op = process_crypto_request(
+                       ts_params->valid_devs[0], ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
 
@@ -10744,7 +10942,11 @@ test_authenticated_decrypt_with_esn(
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
@@ -10872,6 +11074,10 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
+       /* OOP not supported with CPU crypto */
+       if (oop && gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
        /* Detailed check for the particular SGL support flag */
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
        if (!oop) {
@@ -11075,7 +11281,12 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
                ut_params->op->sym->m_dst = ut_params->obuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (oop == IN_PLACE &&
+                       gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -11520,10 +11731,10 @@ static struct unit_test_suite cryptodev_testsuite  = {
        .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                                test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_device_configure_invalid_queue_pair_ids),
                TEST_CASE_ST(ut_setup, ut_teardown,
                                test_queue_pair_descriptor_setup),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_device_configure_invalid_queue_pair_ids),
 
                TEST_CASE_ST(ut_setup, ut_teardown,
                                test_multi_session),
@@ -11617,6 +11828,8 @@ static struct unit_test_suite cryptodev_testsuite  = {
                        test_AES_GCM_authenticated_encryption_test_case_7),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_8),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_J0_authenticated_encryption_test_case_1),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -11635,6 +11848,8 @@ static struct unit_test_suite cryptodev_testsuite  = {
                        test_AES_GCM_authenticated_decryption_test_case_7),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_test_case_8),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_J0_authenticated_decryption_test_case_1),
 
                /** AES GCM Authenticated Encryption 192 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12124,6 +12339,10 @@ static struct unit_test_suite cryptodev_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_verify_auth_aes_cmac_cipher_null_test_case_1),
 
+#ifdef RTE_LIBRTE_SECURITY
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_all),
+#endif
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -12159,548 +12378,18 @@ static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
        }
 };
 
-static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
-       .suite_name = "Crypto DPAA_SEC Unit Test Suite",
+static struct unit_test_suite cryptodev_armv8_testsuite  = {
+       .suite_name = "Crypto Device ARMv8 Unit Test Suite",
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
-
                TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-#ifdef RTE_LIBRTE_SECURITY
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_all),
 
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_decap_all),
-
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_encap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_in_place_32B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_128B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_40B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_128B_32B),
-#endif
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_8),
-
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_8),
-
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
-
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
-
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
-
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** Out of place tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
-
-               /** SNOW 3G encrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_snow3g_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
-
-               /** SNOW 3G decrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
-
-               /** ZUC encrypt only (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
-
-               /** ZUC authenticate (EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_8),
-
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-
-               /* ESN Testcase */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
-       .suite_name = "Crypto DPAA2_SEC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_multi_session),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-#ifdef RTE_LIBRTE_SECURITY
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_decap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_encap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_in_place_32B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_128B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_40B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_128B_32B),
-#endif
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_8),
-
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_8),
-
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
-
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
-
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
-
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** Out of place tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
-
-               /** SNOW 3G encrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_snow3g_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
-
-               /** SNOW 3G decrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
-
-               /** ZUC encrypt only (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
-
-               /** ZUC authenticate (EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_8),
-
-               /** HMAC_MD5 Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_generate_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_verify_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_generate_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_verify_case_2),
-
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-
-               /* ESN Testcase */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_armv8_testsuite  = {
-       .suite_name = "Crypto Device ARMv8 Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
@@ -12979,6 +12668,7 @@ static struct unit_test_suite cryptodev_nitrox_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                                test_device_configure_invalid_queue_pair_ids),
                TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
@@ -13239,6 +12929,29 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
+static int
+test_cryptodev_cpu_aesni_mb(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at;
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       at = gbl_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       gbl_action_type = at;
+       return rc;
+}
+
 static int
 test_cryptodev_openssl(void)
 {
@@ -13271,6 +12984,29 @@ test_cryptodev_aesni_gcm(void)
        return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
+static int
+test_cryptodev_cpu_aesni_gcm(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at;
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       at = gbl_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       gbl_action_type = at;
+       return rc;
+}
+
 static int
 test_cryptodev_null(void)
 {
@@ -13408,7 +13144,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13424,7 +13160,7 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_dpaa_sec_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13507,8 +13243,12 @@ test_cryptodev_nitrox(void)
 
 REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
 REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
+REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_mb_autotest,
+       test_cryptodev_cpu_aesni_mb);
 REGISTER_TEST_COMMAND(cryptodev_openssl_autotest, test_cryptodev_openssl);
 REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm);
+REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_gcm_autotest,
+       test_cryptodev_cpu_aesni_gcm);
 REGISTER_TEST_COMMAND(cryptodev_null_autotest, test_cryptodev_null);
 REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g);
 REGISTER_TEST_COMMAND(cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi);