test/crypto: build block-cipher suite dynamically
[dpdk.git] / app / test / test_cryptodev.c
index 3df63eb..736952a 100644 (file)
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2015-2020 Intel Corporation
+ * Copyright 2020 NXP
  */
 
 #include <time.h>
 #include <rte_memcpy.h>
 #include <rte_pause.h>
 #include <rte_bus_vdev.h>
+#include <rte_ether.h>
 
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
 #include <rte_string_fns.h>
 
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+#ifdef RTE_CRYPTO_SCHEDULER
 #include <rte_cryptodev_scheduler.h>
 #include <rte_cryptodev_scheduler_operations.h>
 #endif
 #include "test_cryptodev_aead_test_vectors.h"
 #include "test_cryptodev_hmac_test_vectors.h"
 #include "test_cryptodev_mixed_test_vectors.h"
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 #include "test_cryptodev_security_pdcp_test_vectors.h"
+#include "test_cryptodev_security_pdcp_sdap_test_vectors.h"
 #include "test_cryptodev_security_pdcp_test_func.h"
+#include "test_cryptodev_security_docsis_test_vectors.h"
+
+#define SDAP_DISABLED  0
+#define SDAP_ENABLED   1
 #endif
 
 #define VDEV_ARGS_SIZE 100
 #define MAX_NB_SESSIONS 4
 
+#define MAX_DRV_SERVICE_CTX_SIZE 256
+
+#define MAX_RAW_DEQUEUE_COUNT  65535
+
 #define IN_PLACE 0
 #define OUT_OF_PLACE 1
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
 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;
-       struct rte_mempool *op_mpool;
-       struct rte_mempool *session_mpool;
-       struct rte_mempool *session_priv_mpool;
-       struct rte_cryptodev_config conf;
-       struct rte_cryptodev_qp_conf qp_conf;
-
-       uint8_t valid_devs[RTE_CRYPTO_MAX_DEVS];
-       uint8_t valid_dev_count;
-};
+enum cryptodev_api_test_type global_api_test_type = CRYPTODEV_API_TEST;
 
 struct crypto_unittest_params {
        struct rte_crypto_sym_xform cipher_xform;
        struct rte_crypto_sym_xform auth_xform;
        struct rte_crypto_sym_xform aead_xform;
+#ifdef RTE_LIB_SECURITY
+       struct rte_security_docsis_xform docsis_xform;
+#endif
 
        union {
                struct rte_cryptodev_sym_session *sess;
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
                struct rte_security_session *sec_session;
 #endif
        };
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        enum rte_security_session_action_type type;
 #endif
        struct rte_crypto_op *op;
@@ -92,6 +99,19 @@ struct crypto_unittest_params {
 #define ALIGN_POW2_ROUNDUP(num, align) \
        (((num) + (align) - 1) & ~((align) - 1))
 
+#define ADD_STATIC_TESTSUITE(index, parent_ts, child_ts, num_child_ts) \
+       for (j = 0; j < num_child_ts; index++, j++)                     \
+               parent_ts.unit_test_suites[index] = child_ts[j]
+
+#define ADD_BLOCKCIPHER_TESTSUITE(index, parent_ts, blk_types, num_blk_types)  \
+       for (j = 0; j < num_blk_types; index++, j++)                            \
+               parent_ts.unit_test_suites[index] =                             \
+                               build_blockcipher_test_suite(blk_types[j])
+
+#define FREE_BLOCKCIPHER_TESTSUITE(index, parent_ts, num_blk_types)            \
+       for (j = index; j < index + num_blk_types; j++)                         \
+               free_blockcipher_test_suite(parent_ts.unit_test_suites[j])
+
 /*
  * Forward declarations.
  */
@@ -143,20 +163,223 @@ ceil_byte_length(uint32_t num_bits)
 }
 
 static void
-process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op)
+post_process_raw_dp_op(void *user_data,        uint32_t index __rte_unused,
+               uint8_t is_op_success)
+{
+       struct rte_crypto_op *op = user_data;
+       op->status = is_op_success ? RTE_CRYPTO_OP_STATUS_SUCCESS :
+                       RTE_CRYPTO_OP_STATUS_ERROR;
+}
+
+void
+process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
+               struct rte_crypto_op *op, uint8_t is_cipher, uint8_t is_auth,
+               uint8_t len_in_bits, uint8_t cipher_iv_len)
+{
+       struct rte_crypto_sym_op *sop = op->sym;
+       struct rte_crypto_op *ret_op = NULL;
+       struct rte_crypto_vec data_vec[UINT8_MAX];
+       struct rte_crypto_va_iova_ptr cipher_iv, digest, aad_auth_iv;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sym_vec vec;
+       struct rte_crypto_sgl sgl;
+       uint32_t max_len;
+       union rte_cryptodev_session_ctx sess;
+       uint32_t count = 0;
+       struct rte_crypto_raw_dp_ctx *ctx;
+       uint32_t cipher_offset = 0, cipher_len = 0, auth_offset = 0,
+                       auth_len = 0;
+       int32_t n;
+       uint32_t n_success;
+       int ctx_service_size;
+       int32_t status = 0;
+       int enqueue_status, dequeue_status;
+
+       ctx_service_size = rte_cryptodev_get_raw_dp_ctx_size(dev_id);
+       if (ctx_service_size < 0) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       ctx = malloc(ctx_service_size);
+       if (!ctx) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       /* Both are enums, setting crypto_sess will suit any session type */
+       sess.crypto_sess = op->sym->session;
+
+       if (rte_cryptodev_configure_raw_dp_ctx(dev_id, qp_id, ctx,
+                       op->sess_type, sess, 0) < 0) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               goto exit;
+       }
+
+       cipher_iv.iova = 0;
+       cipher_iv.va = NULL;
+       aad_auth_iv.iova = 0;
+       aad_auth_iv.va = NULL;
+       digest.iova = 0;
+       digest.va = NULL;
+       sgl.vec = data_vec;
+       vec.num = 1;
+       vec.sgl = &sgl;
+       vec.iv = &cipher_iv;
+       vec.digest = &digest;
+       vec.aad = &aad_auth_iv;
+       vec.status = &status;
+
+       ofs.raw = 0;
+
+       if (is_cipher && is_auth) {
+               cipher_offset = sop->cipher.data.offset;
+               cipher_len = sop->cipher.data.length;
+               auth_offset = sop->auth.data.offset;
+               auth_len = sop->auth.data.length;
+               max_len = RTE_MAX(cipher_offset + cipher_len,
+                               auth_offset + auth_len);
+               if (len_in_bits) {
+                       max_len = max_len >> 3;
+                       cipher_offset = cipher_offset >> 3;
+                       auth_offset = auth_offset >> 3;
+                       cipher_len = cipher_len >> 3;
+                       auth_len = auth_len >> 3;
+               }
+               ofs.ofs.cipher.head = cipher_offset;
+               ofs.ofs.cipher.tail = max_len - cipher_offset - cipher_len;
+               ofs.ofs.auth.head = auth_offset;
+               ofs.ofs.auth.tail = max_len - auth_offset - auth_len;
+               cipher_iv.va = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+               cipher_iv.iova = rte_crypto_op_ctophys_offset(op, IV_OFFSET);
+               aad_auth_iv.va = rte_crypto_op_ctod_offset(
+                               op, void *, IV_OFFSET + cipher_iv_len);
+               aad_auth_iv.iova = rte_crypto_op_ctophys_offset(op, IV_OFFSET +
+                               cipher_iv_len);
+               digest.va = (void *)sop->auth.digest.data;
+               digest.iova = sop->auth.digest.phys_addr;
+
+       } else if (is_cipher) {
+               cipher_offset = sop->cipher.data.offset;
+               cipher_len = sop->cipher.data.length;
+               max_len = cipher_len + cipher_offset;
+               if (len_in_bits) {
+                       max_len = max_len >> 3;
+                       cipher_offset = cipher_offset >> 3;
+                       cipher_len = cipher_len >> 3;
+               }
+               ofs.ofs.cipher.head = cipher_offset;
+               ofs.ofs.cipher.tail = max_len - cipher_offset - cipher_len;
+               cipher_iv.va = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+               cipher_iv.iova = rte_crypto_op_ctophys_offset(op, IV_OFFSET);
+
+       } else if (is_auth) {
+               auth_offset = sop->auth.data.offset;
+               auth_len = sop->auth.data.length;
+               max_len = auth_len + auth_offset;
+               if (len_in_bits) {
+                       max_len = max_len >> 3;
+                       auth_offset = auth_offset >> 3;
+                       auth_len = auth_len >> 3;
+               }
+               ofs.ofs.auth.head = auth_offset;
+               ofs.ofs.auth.tail = max_len - auth_offset - auth_len;
+               aad_auth_iv.va = rte_crypto_op_ctod_offset(
+                               op, void *, IV_OFFSET + cipher_iv_len);
+               aad_auth_iv.iova = rte_crypto_op_ctophys_offset(op, IV_OFFSET +
+                               cipher_iv_len);
+               digest.va = (void *)sop->auth.digest.data;
+               digest.iova = sop->auth.digest.phys_addr;
+
+       } else { /* aead */
+               cipher_offset = sop->aead.data.offset;
+               cipher_len = sop->aead.data.length;
+               max_len = cipher_len + cipher_offset;
+               if (len_in_bits) {
+                       max_len = max_len >> 3;
+                       cipher_offset = cipher_offset >> 3;
+                       cipher_len = cipher_len >> 3;
+               }
+               ofs.ofs.cipher.head = cipher_offset;
+               ofs.ofs.cipher.tail = max_len - cipher_offset - cipher_len;
+               cipher_iv.va = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+               cipher_iv.iova = rte_crypto_op_ctophys_offset(op, IV_OFFSET);
+               aad_auth_iv.va = (void *)sop->aead.aad.data;
+               aad_auth_iv.iova = sop->aead.aad.phys_addr;
+               digest.va = (void *)sop->aead.digest.data;
+               digest.iova = sop->aead.digest.phys_addr;
+       }
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, 0, max_len,
+                       data_vec, RTE_DIM(data_vec));
+       if (n < 0 || n > sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               goto exit;
+       }
+
+       sgl.num = n;
+
+       if (rte_cryptodev_raw_enqueue_burst(ctx, &vec, ofs, (void **)&op,
+                       &enqueue_status) < 1) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               goto exit;
+       }
+
+       if (enqueue_status == 0) {
+               status = rte_cryptodev_raw_enqueue_done(ctx, 1);
+               if (status < 0) {
+                       op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+                       goto exit;
+               }
+       } else if (enqueue_status < 0) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               goto exit;
+       }
+
+       n = n_success = 0;
+       while (count++ < MAX_RAW_DEQUEUE_COUNT && n == 0) {
+               n = rte_cryptodev_raw_dequeue_burst(ctx,
+                       NULL, 1, post_process_raw_dp_op,
+                               (void **)&ret_op, 0, &n_success,
+                               &dequeue_status);
+               if (dequeue_status < 0) {
+                       op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+                       goto exit;
+               }
+               if (n == 0)
+                       rte_pause();
+       }
+
+       if (n == 1 && dequeue_status == 0) {
+               if (rte_cryptodev_raw_dequeue_done(ctx, 1) < 0) {
+                       op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+                       goto exit;
+               }
+       }
+
+       op->status = (count == MAX_RAW_DEQUEUE_COUNT + 1 || ret_op != op ||
+                       n_success < 1) ? RTE_CRYPTO_OP_STATUS_ERROR :
+                                       RTE_CRYPTO_OP_STATUS_SUCCESS;
+
+exit:
+       free(ctx);
+}
+
+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_va_iova_ptr iv_ptr, aad_ptr, digest_ptr;
        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));
+       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;
@@ -166,13 +389,17 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op)
        sgl.vec = vec;
        sgl.num = n;
        symvec.sgl = &sgl;
-       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
-       symvec.iv = &iv;
-       symvec.aad = NULL;
-       symvec.digest = (void **)&sop->auth.digest.data;
+       symvec.iv = &iv_ptr;
+       symvec.digest = &digest_ptr;
+       symvec.aad = &aad_ptr;
        symvec.status = &st;
        symvec.num = 1;
 
+       /* for CPU crypto the IOVA address is not required */
+       iv_ptr.va = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       digest_ptr.va = (void *)sop->aead.digest.data;
+       aad_ptr.va = (void *)sop->aead.aad.data;
+
        ofs.raw = 0;
 
        n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
@@ -184,22 +411,21 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op)
                op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
 }
 
-
 static void
-process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op)
+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_va_iova_ptr iv_ptr, digest_ptr;
        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));
+       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;
@@ -209,14 +435,18 @@ process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op)
        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.iv = &iv_ptr;
+       symvec.digest = &digest_ptr;
        symvec.status = &st;
        symvec.num = 1;
 
+       iv_ptr.va = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       digest_ptr.va = (void *)sop->auth.digest.data;
+
        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);
@@ -252,6 +482,7 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
 }
 
 static struct crypto_testsuite_params testsuite_params = { NULL };
+struct crypto_testsuite_params *p_testsuite_params = &testsuite_params;
 static struct crypto_unittest_params unittest_params;
 
 static int
@@ -260,7 +491,6 @@ testsuite_setup(void)
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct rte_cryptodev_info info;
        uint32_t i = 0, nb_devs, dev_id;
-       int ret;
        uint16_t qp_id;
 
        memset(ts_params, 0, sizeof(*ts_params));
@@ -306,223 +536,18 @@ testsuite_setup(void)
                return TEST_FAILED;
        }
 
-       /* Create an AESNI MB device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)));
-               if (nb_devs < 1) {
-                       ret = rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD), NULL);
-
-                       TEST_ASSERT(ret == 0,
-                               "Failed to create instance of"
-                               " pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-               }
-       }
-
-       /* Create an AESNI GCM device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)));
-               if (nb_devs < 1) {
-                       TEST_ASSERT_SUCCESS(rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD), NULL),
-                               "Failed to create instance of"
-                               " pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
-               }
-       }
-
-       /* Create a SNOW 3G device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD)));
-               if (nb_devs < 1) {
-                       TEST_ASSERT_SUCCESS(rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), NULL),
-                               "Failed to create instance of"
-                               " pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
-               }
-       }
-
-       /* Create a KASUMI device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_KASUMI_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_KASUMI_PMD)));
-               if (nb_devs < 1) {
-                       TEST_ASSERT_SUCCESS(rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_KASUMI_PMD), NULL),
-                               "Failed to create instance of"
-                               " pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_KASUMI_PMD));
-               }
-       }
-
-       /* Create a ZUC device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_ZUC_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_ZUC_PMD)));
-               if (nb_devs < 1) {
-                       TEST_ASSERT_SUCCESS(rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_ZUC_PMD), NULL),
-                               "Failed to create instance of"
-                               " pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_ZUC_PMD));
-               }
-       }
-
-       /* Create a NULL device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NULL_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_NULL_PMD)));
-               if (nb_devs < 1) {
-                       ret = rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_NULL_PMD), NULL);
-
-                       TEST_ASSERT(ret == 0,
-                               "Failed to create instance of"
-                               " pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_NULL_PMD));
-               }
-       }
-
-       /* Create an OPENSSL device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)));
-               if (nb_devs < 1) {
-                       ret = rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD),
-                               NULL);
-
-                       TEST_ASSERT(ret == 0, "Failed to create "
-                               "instance of pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD));
-               }
-       }
-
-       /* Create a ARMv8 device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_ARMV8_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)));
-               if (nb_devs < 1) {
-                       ret = rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),
-                               NULL);
-
-                       TEST_ASSERT(ret == 0, "Failed to create "
-                               "instance of pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_ARMV8_PMD));
-               }
-       }
-
-       /* Create a MVSAM device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_MVSAM_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)));
-               if (nb_devs < 1) {
-                       ret = rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD),
-                               NULL);
-
-                       TEST_ASSERT(ret == 0, "Failed to create "
-                               "instance of pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD));
-               }
-       }
-
-       /* Create an CCP device if required */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_CCP_PMD))) {
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_CCP_PMD)));
-               if (nb_devs < 1) {
-                       ret = rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_CCP_PMD),
-                               NULL);
-
-                       TEST_ASSERT(ret == 0, "Failed to create "
-                               "instance of pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_CCP_PMD));
-               }
-       }
-
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
-       char vdev_args[VDEV_ARGS_SIZE] = {""};
-       char temp_str[VDEV_ARGS_SIZE] = {"mode=multi-core,"
-               "ordering=enable,name=cryptodev_test_scheduler,corelist="};
-       uint16_t slave_core_count = 0;
-       uint16_t socket_id = 0;
-
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD))) {
-
-               /* Identify the Slave Cores
-                * Use 2 slave cores for the device args
-                */
-               RTE_LCORE_FOREACH_SLAVE(i) {
-                       if (slave_core_count > 1)
-                               break;
-                       snprintf(vdev_args, sizeof(vdev_args),
-                                       "%s%d", temp_str, i);
-                       strcpy(temp_str, vdev_args);
-                       strlcat(temp_str, ";", sizeof(temp_str));
-                       slave_core_count++;
-                       socket_id = rte_lcore_to_socket_id(i);
-               }
-               if (slave_core_count != 2) {
-                       RTE_LOG(ERR, USER1,
-                               "Cryptodev scheduler test require at least "
-                               "two slave cores to run. "
-                               "Please use the correct coremask.\n");
-                       return TEST_FAILED;
-               }
-               strcpy(temp_str, vdev_args);
-               snprintf(vdev_args, sizeof(vdev_args), "%s,socket_id=%d",
-                               temp_str, socket_id);
-               RTE_LOG(DEBUG, USER1, "vdev_args: %s\n", vdev_args);
-               nb_devs = rte_cryptodev_device_count_by_driver(
-                               rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)));
-               if (nb_devs < 1) {
-                       ret = rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),
-                                       vdev_args);
-                       TEST_ASSERT(ret == 0,
-                               "Failed to create instance %u of"
-                               " pmd : %s",
-                               i, RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD));
-               }
-       }
-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
-
        nb_devs = rte_cryptodev_count();
        if (nb_devs < 1) {
                RTE_LOG(WARNING, USER1, "No crypto devices found?\n");
                return TEST_SKIPPED;
        }
 
+       if (rte_cryptodev_device_count_by_driver(gbl_driver_id) < 1) {
+               RTE_LOG(WARNING, USER1, "No %s devices found?\n",
+                               rte_cryptodev_driver_name_get(gbl_driver_id));
+               return TEST_SKIPPED;
+       }
+
        /* Create list of valid crypto devs */
        for (i = 0; i < nb_devs; i++) {
                rte_cryptodev_info_get(i, &info);
@@ -546,9 +571,15 @@ testsuite_setup(void)
        unsigned int session_size =
                rte_cryptodev_sym_get_private_session_size(dev_id);
 
+#ifdef RTE_LIB_SECURITY
+       unsigned int security_session_size = rte_security_session_get_size(
+                       rte_cryptodev_get_sec_ctx(dev_id));
+
+       if (session_size < security_session_size)
+               session_size = security_session_size;
+#endif
        /*
-        * Create mempool with maximum number of sessions * 2,
-        * to include the session headers
+        * Create mempool with maximum number of sessions.
         */
        if (info.sym.max_nb_sessions != 0 &&
                        info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
@@ -600,6 +631,7 @@ static void
 testsuite_teardown(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int res;
 
        if (ts_params->mbuf_pool != NULL) {
                RTE_LOG(DEBUG, USER1, "CRYPTO_MBUFPOOL count %u\n",
@@ -621,1259 +653,1462 @@ testsuite_teardown(void)
                rte_mempool_free(ts_params->session_mpool);
                ts_params->session_mpool = NULL;
        }
+
+       res = rte_cryptodev_close(ts_params->valid_devs[0]);
+       if (res)
+               RTE_LOG(ERR, USER1, "Crypto device close error %d\n", res);
 }
 
 static int
-ut_setup(void)
+check_capabilities_supported(enum rte_crypto_sym_xform_type type,
+               const int *algs, uint16_t num_algs)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       uint16_t qp_id;
-
-       /* Clear unit test parameters before running test */
-       memset(ut_params, 0, sizeof(*ut_params));
-
-       /* Reconfigure device to default parameters */
-       ts_params->conf.socket_id = SOCKET_ID_ANY;
-       ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
-       ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
-       ts_params->qp_conf.mp_session = ts_params->session_mpool;
-       ts_params->qp_conf.mp_session_private = ts_params->session_priv_mpool;
-
-       TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
-                       &ts_params->conf),
-                       "Failed to configure cryptodev %u",
-                       ts_params->valid_devs[0]);
+       uint8_t dev_id = testsuite_params.valid_devs[0];
+       bool some_alg_supported = FALSE;
+       uint16_t i;
 
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs ; qp_id++) {
-               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
-                       ts_params->valid_devs[0], qp_id,
-                       &ts_params->qp_conf,
-                       rte_cryptodev_socket_id(ts_params->valid_devs[0])),
-                       "Failed to setup queue pair %u on cryptodev %u",
-                       qp_id, ts_params->valid_devs[0]);
+       for (i = 0; i < num_algs && !some_alg_supported; i++) {
+               struct rte_cryptodev_sym_capability_idx alg = {
+                       type, {algs[i]}
+               };
+               if (rte_cryptodev_sym_capability_get(dev_id,
+                               &alg) != NULL)
+                       some_alg_supported = TRUE;
        }
+       if (!some_alg_supported)
+               return TEST_SKIPPED;
 
+       return 0;
+}
 
-       rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
+int
+check_cipher_capabilities_supported(const enum rte_crypto_cipher_algorithm *ciphers,
+               uint16_t num_ciphers)
+{
+       return check_capabilities_supported(RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       (const int *) ciphers, num_ciphers);
+}
 
-       /* Start the device */
-       TEST_ASSERT_SUCCESS(rte_cryptodev_start(ts_params->valid_devs[0]),
-                       "Failed to start cryptodev %u",
-                       ts_params->valid_devs[0]);
+int
+check_auth_capabilities_supported(const enum rte_crypto_auth_algorithm *auths,
+               uint16_t num_auths)
+{
+       return check_capabilities_supported(RTE_CRYPTO_SYM_XFORM_AUTH,
+                       (const int *) auths, num_auths);
+}
 
-       return TEST_SUCCESS;
+int
+check_aead_capabilities_supported(const enum rte_crypto_aead_algorithm *aeads,
+               uint16_t num_aeads)
+{
+       return check_capabilities_supported(RTE_CRYPTO_SYM_XFORM_AEAD,
+                       (const int *) aeads, num_aeads);
 }
 
-static void
-ut_teardown(void)
+static int
+null_testsuite_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       struct rte_cryptodev_stats stats;
-
-       /* free crypto session structure */
-#ifdef RTE_LIBRTE_SECURITY
-       if (ut_params->type == RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL) {
-               if (ut_params->sec_session) {
-                       rte_security_session_destroy(rte_cryptodev_get_sec_ctx
-                                               (ts_params->valid_devs[0]),
-                                               ut_params->sec_session);
-                       ut_params->sec_session = NULL;
-               }
-       } else
-#endif
-       {
-               if (ut_params->sess) {
-                       rte_cryptodev_sym_session_clear(
-                                       ts_params->valid_devs[0],
-                                       ut_params->sess);
-                       rte_cryptodev_sym_session_free(ut_params->sess);
-                       ut_params->sess = NULL;
-               }
-       }
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_NULL
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_NULL
+       };
 
-       /* free crypto operation structure */
-       if (ut_params->op)
-               rte_crypto_op_free(ut_params->op);
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       /*
-        * free mbuf - both obuf and ibuf are usually the same,
-        * so check if they point at the same address is necessary,
-        * to avoid freeing the mbuf twice.
-        */
-       if (ut_params->obuf) {
-               rte_pktmbuf_free(ut_params->obuf);
-               if (ut_params->ibuf == ut_params->obuf)
-                       ut_params->ibuf = 0;
-               ut_params->obuf = 0;
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for NULL "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
        }
-       if (ut_params->ibuf) {
-               rte_pktmbuf_free(ut_params->ibuf);
-               ut_params->ibuf = 0;
+
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for NULL "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
        }
 
-       if (ts_params->mbuf_pool != NULL)
-               RTE_LOG(DEBUG, USER1, "CRYPTO_MBUFPOOL count %u\n",
-                       rte_mempool_avail_count(ts_params->mbuf_pool));
+       return 0;
+}
 
-       rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats);
+static int
+crypto_gen_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
 
-       /* Stop the device */
-       rte_cryptodev_stop(ts_params->valid_devs[0]);
+       rte_cryptodev_info_get(dev_id, &dev_info);
+
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Crypto Gen "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
+
+       return 0;
 }
 
+#ifdef RTE_LIB_SECURITY
 static int
-test_device_configure_invalid_dev_id(void)
+pdcp_proto_testsuite_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint16_t dev_id, num_devs = 0;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_NULL,
+               RTE_CRYPTO_CIPHER_AES_CTR,
+               RTE_CRYPTO_CIPHER_ZUC_EEA3,
+               RTE_CRYPTO_CIPHER_SNOW3G_UEA2
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_NULL,
+               RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+               RTE_CRYPTO_AUTH_AES_CMAC,
+               RTE_CRYPTO_AUTH_ZUC_EIA3
+       };
 
-       TEST_ASSERT((num_devs = rte_cryptodev_count()) >= 1,
-                       "Need at least %d devices for test", 1);
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       /* valid dev_id values */
-       dev_id = ts_params->valid_devs[ts_params->valid_dev_count - 1];
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       !(dev_info.feature_flags &
+                       RTE_CRYPTODEV_FF_SECURITY)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for PDCP Proto "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       /* Stop the device in case it's started so it can be configured */
-       rte_cryptodev_stop(dev_id);
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for PDCP Proto "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id, &ts_params->conf),
-                       "Failed test for rte_cryptodev_configure: "
-                       "invalid dev_num %u", dev_id);
+       return 0;
+}
 
-       /* invalid dev_id values */
-       dev_id = num_devs;
+static int
+docsis_proto_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_AES_DOCSISBPI
+       };
 
-       TEST_ASSERT_FAIL(rte_cryptodev_configure(dev_id, &ts_params->conf),
-                       "Failed test for rte_cryptodev_configure: "
-                       "invalid dev_num %u", dev_id);
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       dev_id = 0xff;
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       !(dev_info.feature_flags &
+                       RTE_CRYPTODEV_FF_SECURITY)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Docsis "
+                               "Proto testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       TEST_ASSERT_FAIL(rte_cryptodev_configure(dev_id, &ts_params->conf),
-                       "Failed test for rte_cryptodev_configure:"
-                       "invalid dev_num %u", dev_id);
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for Docsis Proto "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       return TEST_SUCCESS;
+       return 0;
 }
+#endif
 
 static int
-test_device_configure_invalid_queue_pair_ids(void)
+aes_ccm_auth_testsuite_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint16_t orig_nb_qps = ts_params->conf.nb_queue_pairs;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_aead_algorithm aeads[] = {
+               RTE_CRYPTO_AEAD_AES_CCM
+       };
 
-       /* 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;
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       /* Stop the device in case it's started so it can be configured */
-       rte_cryptodev_stop(ts_params->valid_devs[0]);
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for AES CCM "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       /* valid - one queue pairs */
-       ts_params->conf.nb_queue_pairs = 1;
+       if (check_aead_capabilities_supported(aeads, RTE_DIM(aeads)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for AES CCM "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       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);
+       return 0;
+}
 
+static int
+aes_gcm_auth_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_aead_algorithm aeads[] = {
+               RTE_CRYPTO_AEAD_AES_GCM
+       };
 
-       /* valid - max value queue pairs */
-       ts_params->conf.nb_queue_pairs = orig_nb_qps;
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       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);
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for AES GCM "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
+       if (check_aead_capabilities_supported(aeads, RTE_DIM(aeads)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for AES GCM "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       /* invalid - zero queue pairs */
-       ts_params->conf.nb_queue_pairs = 0;
+       return 0;
+}
 
-       TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
-                       &ts_params->conf),
-                       "Failed test for rte_cryptodev_configure, dev_id %u,"
-                       " invalid qps: %u",
-                       ts_params->valid_devs[0],
-                       ts_params->conf.nb_queue_pairs);
+static int
+aes_gmac_auth_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_AES_GMAC
+       };
 
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       /* invalid - max value supported by field queue pairs */
-       ts_params->conf.nb_queue_pairs = UINT16_MAX;
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for AES GMAC "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
-                       &ts_params->conf),
-                       "Failed test for rte_cryptodev_configure, dev_id %u,"
-                       " invalid qps: %u",
-                       ts_params->valid_devs[0],
-                       ts_params->conf.nb_queue_pairs);
+       if (check_auth_capabilities_supported(auths, RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for AES GMAC "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
+       return 0;
+}
 
-       /* invalid - max value + 1 queue pairs */
-       ts_params->conf.nb_queue_pairs = orig_nb_qps + 1;
+static int
+chacha20_poly1305_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_aead_algorithm aeads[] = {
+               RTE_CRYPTO_AEAD_CHACHA20_POLY1305
+       };
 
-       TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
-                       &ts_params->conf),
-                       "Failed test for rte_cryptodev_configure, dev_id %u,"
-                       " invalid qps: %u",
-                       ts_params->valid_devs[0],
-                       ts_params->conf.nb_queue_pairs);
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       /* revert to original testsuite value */
-       ts_params->conf.nb_queue_pairs = orig_nb_qps;
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for "
+                               "Chacha20-Poly1305 testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       return TEST_SUCCESS;
+       if (check_aead_capabilities_supported(aeads, RTE_DIM(aeads)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for "
+                               "Chacha20-Poly1305 testsuite not met\n");
+               return TEST_SKIPPED;
+       }
+
+       return 0;
 }
 
 static int
-test_queue_pair_descriptor_setup(void)
+snow3g_testsuite_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_info dev_info;
-       struct rte_cryptodev_qp_conf qp_conf = {
-               .nb_descriptors = MAX_NUM_OPS_INFLIGHT
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_SNOW3G_UEA2
+
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_SNOW3G_UIA2
        };
 
-       uint16_t qp_id;
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       /* 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;
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Snow3G "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       /* Stop the device in case it's started so it can be configured */
-       rte_cryptodev_stop(ts_params->valid_devs[0]);
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for Snow3G "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
+       return 0;
+}
 
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+static int
+zuc_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_ZUC_EEA3
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_ZUC_EIA3
+       };
 
-       TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
-                       &ts_params->conf),
-                       "Failed to configure cryptodev %u",
-                       ts_params->valid_devs[0]);
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       /*
-        * Test various ring sizes on this device. memzones can't be
-        * freed so are re-used if ring is released and re-created.
-        */
-       qp_conf.nb_descriptors = MIN_NUM_OPS_INFLIGHT; /* min size*/
-       qp_conf.mp_session = ts_params->session_mpool;
-       qp_conf.mp_session_private = ts_params->session_priv_mpool;
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for ZUC "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Failed 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]);
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for ZUC "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
        }
 
-       qp_conf.nb_descriptors = (uint32_t)(MAX_NUM_OPS_INFLIGHT / 2);
+       return 0;
+}
 
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Failed 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]);
+static int
+hmac_md5_auth_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_MD5_HMAC
+       };
+
+       rte_cryptodev_info_get(dev_id, &dev_info);
+
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for HMAC MD5 "
+                               "Auth testsuite not met\n");
+               return TEST_SKIPPED;
        }
 
-       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT; /* valid */
+       if (check_auth_capabilities_supported(auths, RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for HMAC MD5 "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Failed 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]);
+       return 0;
+}
+
+static int
+kasumi_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_KASUMI_F8
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_KASUMI_F9
+       };
+
+       rte_cryptodev_info_get(dev_id, &dev_info);
+
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Kasumi "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
        }
 
-       /* invalid number of descriptors - max supported + 2 */
-       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT + 2;
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for Kasumi "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       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]);
+       return 0;
+}
+
+static int
+negative_aes_gcm_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_aead_algorithm aeads[] = {
+               RTE_CRYPTO_AEAD_AES_GCM
+       };
+
+       rte_cryptodev_info_get(dev_id, &dev_info);
+
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Negative "
+                               "AES GCM testsuite not met\n");
+               return TEST_SKIPPED;
        }
 
-       /* invalid number of descriptors - max value of parameter */
-       qp_conf.nb_descriptors = UINT32_MAX-1;
+       if (check_aead_capabilities_supported(aeads, RTE_DIM(aeads)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for Negative "
+                               "AES GCM testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       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]);
+       return 0;
+}
+
+static int
+negative_aes_gmac_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_AES_GMAC
+       };
+
+       rte_cryptodev_info_get(dev_id, &dev_info);
+
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Negative "
+                               "AES GMAC testsuite not met\n");
+               return TEST_SKIPPED;
        }
 
-       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;
+       if (check_auth_capabilities_supported(auths, RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for Negative "
+                               "AES GMAC testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Failed 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]);
+       return 0;
+}
+
+static int
+mixed_cipher_hash_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       uint64_t feat_flags;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_NULL,
+               RTE_CRYPTO_CIPHER_AES_CTR,
+               RTE_CRYPTO_CIPHER_ZUC_EEA3,
+               RTE_CRYPTO_CIPHER_SNOW3G_UEA2
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_NULL,
+               RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+               RTE_CRYPTO_AUTH_AES_CMAC,
+               RTE_CRYPTO_AUTH_ZUC_EIA3
+       };
+
+       rte_cryptodev_info_get(dev_id, &dev_info);
+       feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       (global_api_test_type == CRYPTODEV_RAW_API_TEST)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Mixed "
+                               "Cipher Hash testsuite not met\n");
+               return TEST_SKIPPED;
        }
 
-       /* invalid number of descriptors - max supported + 1 */
-       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT + 1;
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for Mixed "
+                               "Cipher Hash testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       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]);
+       return 0;
+}
+
+static int
+esn_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_AES_CBC
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_SHA1_HMAC
+       };
+
+       rte_cryptodev_info_get(dev_id, &dev_info);
+
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for ESN "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
        }
 
-       /* test invalid queue pair id */
-       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;      /*valid */
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for ESN "
+                               "testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       qp_id = ts_params->conf.nb_queue_pairs;         /*invalid */
+       return 0;
+}
 
-       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])),
-                       "Failed test for rte_cryptodev_queue_pair_setup:"
-                       "invalid qp %u on cryptodev %u",
-                       qp_id, ts_params->valid_devs[0]);
+static int
+multi_session_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_AES_CBC
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_SHA512_HMAC
+       };
 
-       qp_id = 0xffff; /*invalid*/
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-       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])),
-                       "Failed test for rte_cryptodev_queue_pair_setup:"
-                       "invalid qp %u on cryptodev %u",
-                       qp_id, ts_params->valid_devs[0]);
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO)) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Multi "
+                               "Session testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-       return TEST_SUCCESS;
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for Multi "
+                               "Session testsuite not met\n");
+               return TEST_SKIPPED;
+       }
+
+       return 0;
 }
 
-/* ***** Plaintext data for tests ***** */
+static int
+negative_hmac_sha1_testsuite_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t dev_id = ts_params->valid_devs[0];
+       struct rte_cryptodev_info dev_info;
+       const enum rte_crypto_cipher_algorithm ciphers[] = {
+               RTE_CRYPTO_CIPHER_AES_CBC
+       };
+       const enum rte_crypto_auth_algorithm auths[] = {
+               RTE_CRYPTO_AUTH_SHA1_HMAC
+       };
 
-const char catch_22_quote_1[] =
-               "There was only one catch and that was Catch-22, which "
-               "specified that a concern for one's safety in the face of "
-               "dangers that were real and immediate was the process of a "
-               "rational mind. Orr was crazy and could be grounded. All he "
-               "had to do was ask; and as soon as he did, he would no longer "
-               "be crazy and would have to fly more missions. Orr would be "
-               "crazy to fly more missions and sane if he didn't, but if he "
-               "was sane he had to fly them. If he flew them he was crazy "
-               "and didn't have to; but if he didn't want to he was sane and "
-               "had to. Yossarian was moved very deeply by the absolute "
-               "simplicity of this clause of Catch-22 and let out a "
-               "respectful whistle. \"That's some catch, that Catch-22\", he "
-               "observed. \"It's the best there is,\" Doc Daneeka agreed.";
+       rte_cryptodev_info_get(dev_id, &dev_info);
 
-const char catch_22_quote[] =
-               "What a lousy earth! He wondered how many people were "
-               "destitute that same night even in his own prosperous country, "
-               "how many homes were shanties, how many husbands were drunk "
-               "and wives socked, and how many children were bullied, abused, "
-               "or abandoned. How many families hungered for food they could "
-               "not afford to buy? How many hearts were broken? How many "
-               "suicides would take place that same night, how many people "
-               "would go insane? How many cockroaches and landlords would "
-               "triumph? How many winners were losers, successes failures, "
-               "and rich men poor men? How many wise guys were stupid? How "
-               "many happy endings were unhappy endings? How many honest men "
-               "were liars, brave men cowards, loyal men traitors, how many "
-               "sainted men were corrupt, how many people in positions of "
-               "trust had sold their souls to bodyguards, how many had never "
-               "had souls? How many straight-and-narrow paths were crooked "
-               "paths? How many best families were worst families and how "
-               "many good people were bad people? When you added them all up "
-               "and then subtracted, you might be left with only the children, "
-               "and perhaps with Albert Einstein and an old violinist or "
-               "sculptor somewhere.";
+       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) ||
+                       ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       !(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               RTE_LOG(INFO, USER1, "Feature flag requirements for Negative "
+                               "HMAC SHA1 testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
-#define QUOTE_480_BYTES                (480)
-#define QUOTE_512_BYTES                (512)
-#define QUOTE_768_BYTES                (768)
-#define QUOTE_1024_BYTES       (1024)
+       if (check_cipher_capabilities_supported(ciphers, RTE_DIM(ciphers)) != 0
+                       && check_auth_capabilities_supported(auths,
+                       RTE_DIM(auths)) != 0) {
+               RTE_LOG(INFO, USER1, "Capability requirements for Negative "
+                               "HMAC SHA1 testsuite not met\n");
+               return TEST_SKIPPED;
+       }
 
+       return 0;
+}
 
+static int
+dev_configure_and_start(uint64_t ff_disable)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-/* ***** SHA1 Hash Tests ***** */
+       uint16_t qp_id;
 
-#define HMAC_KEY_LENGTH_SHA1   (DIGEST_BYTE_LENGTH_SHA1)
+       /* Clear unit test parameters before running test */
+       memset(ut_params, 0, sizeof(*ut_params));
 
-static uint8_t hmac_sha1_key[] = {
-       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
-       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
-       0xDE, 0xF4, 0xDE, 0xAD };
+       /* Reconfigure device to default parameters */
+       ts_params->conf.socket_id = SOCKET_ID_ANY;
+       ts_params->conf.ff_disable = ff_disable;
+       ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
+       ts_params->qp_conf.mp_session = ts_params->session_mpool;
+       ts_params->qp_conf.mp_session_private = ts_params->session_priv_mpool;
 
-/* ***** SHA224 Hash Tests ***** */
+       TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
+                       &ts_params->conf),
+                       "Failed to configure cryptodev %u",
+                       ts_params->valid_devs[0]);
 
-#define HMAC_KEY_LENGTH_SHA224 (DIGEST_BYTE_LENGTH_SHA224)
+       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs ; qp_id++) {
+               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+                       ts_params->valid_devs[0], qp_id,
+                       &ts_params->qp_conf,
+                       rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+                       "Failed to setup queue pair %u on cryptodev %u",
+                       qp_id, ts_params->valid_devs[0]);
+       }
 
 
-/* ***** AES-CBC Cipher Tests ***** */
+       rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
 
-#define CIPHER_KEY_LENGTH_AES_CBC      (16)
-#define CIPHER_IV_LENGTH_AES_CBC       (CIPHER_KEY_LENGTH_AES_CBC)
+       /* Start the device */
+       TEST_ASSERT_SUCCESS(rte_cryptodev_start(ts_params->valid_devs[0]),
+                       "Failed to start cryptodev %u",
+                       ts_params->valid_devs[0]);
 
-static uint8_t aes_cbc_key[] = {
-       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
-       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A };
+       return TEST_SUCCESS;
+}
 
-static uint8_t aes_cbc_iv[] = {
-       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+int
+ut_setup(void)
+{
+       /* Configure and start the device with security feature disabled */
+       return dev_configure_and_start(RTE_CRYPTODEV_FF_SECURITY);
+}
 
+static int
+ut_setup_security(void)
+{
+       /* Configure and start the device with no features disabled */
+       return dev_configure_and_start(0);
+}
 
-/* ***** AES-CBC / HMAC-SHA1 Hash Tests ***** */
+void
+ut_teardown(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_cryptodev_stats stats;
 
-static const uint8_t catch_22_quote_2_512_bytes_AES_CBC_ciphertext[] = {
-       0x8B, 0x4D, 0xDA, 0x1B, 0xCF, 0x04, 0xA0, 0x31,
-       0xB4, 0xBF, 0xBD, 0x68, 0x43, 0x20, 0x7E, 0x76,
-       0xB1, 0x96, 0x8B, 0xA2, 0x7C, 0xA2, 0x83, 0x9E,
-       0x39, 0x5A, 0x2F, 0x7E, 0x92, 0xB4, 0x48, 0x1A,
-       0x3F, 0x6B, 0x5D, 0xDF, 0x52, 0x85, 0x5F, 0x8E,
-       0x42, 0x3C, 0xFB, 0xE9, 0x1A, 0x24, 0xD6, 0x08,
-       0xDD, 0xFD, 0x16, 0xFB, 0xE9, 0x55, 0xEF, 0xF0,
-       0xA0, 0x8D, 0x13, 0xAB, 0x81, 0xC6, 0x90, 0x01,
-       0xB5, 0x18, 0x84, 0xB3, 0xF6, 0xE6, 0x11, 0x57,
-       0xD6, 0x71, 0xC6, 0x3C, 0x3F, 0x2F, 0x33, 0xEE,
-       0x24, 0x42, 0x6E, 0xAC, 0x0B, 0xCA, 0xEC, 0xF9,
-       0x84, 0xF8, 0x22, 0xAA, 0x60, 0xF0, 0x32, 0xA9,
-       0x75, 0x75, 0x3B, 0xCB, 0x70, 0x21, 0x0A, 0x8D,
-       0x0F, 0xE0, 0xC4, 0x78, 0x2B, 0xF8, 0x97, 0xE3,
-       0xE4, 0x26, 0x4B, 0x29, 0xDA, 0x88, 0xCD, 0x46,
-       0xEC, 0xAA, 0xF9, 0x7F, 0xF1, 0x15, 0xEA, 0xC3,
-       0x87, 0xE6, 0x31, 0xF2, 0xCF, 0xDE, 0x4D, 0x80,
-       0x70, 0x91, 0x7E, 0x0C, 0xF7, 0x26, 0x3A, 0x92,
-       0x4F, 0x18, 0x83, 0xC0, 0x8F, 0x59, 0x01, 0xA5,
-       0x88, 0xD1, 0xDB, 0x26, 0x71, 0x27, 0x16, 0xF5,
-       0xEE, 0x10, 0x82, 0xAC, 0x68, 0x26, 0x9B, 0xE2,
-       0x6D, 0xD8, 0x9A, 0x80, 0xDF, 0x04, 0x31, 0xD5,
-       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
-       0x58, 0x34, 0x85, 0x61, 0x1C, 0x42, 0x10, 0x76,
-       0x73, 0x02, 0x42, 0xC9, 0x23, 0x18, 0x8E, 0xB4,
-       0x6F, 0xB4, 0xA3, 0x54, 0x6E, 0x88, 0x3B, 0x62,
-       0x7C, 0x02, 0x8D, 0x4C, 0x9F, 0xC8, 0x45, 0xF4,
-       0xC9, 0xDE, 0x4F, 0xEB, 0x22, 0x83, 0x1B, 0xE4,
-       0x49, 0x37, 0xE4, 0xAD, 0xE7, 0xCD, 0x21, 0x54,
-       0xBC, 0x1C, 0xC2, 0x04, 0x97, 0xB4, 0x10, 0x61,
-       0xF0, 0xE4, 0xEF, 0x27, 0x63, 0x3A, 0xDA, 0x91,
-       0x41, 0x25, 0x62, 0x1C, 0x5C, 0xB6, 0x38, 0x4A,
-       0x88, 0x71, 0x59, 0x5A, 0x8D, 0xA0, 0x09, 0xAF,
-       0x72, 0x94, 0xD7, 0x79, 0x5C, 0x60, 0x7C, 0x8F,
-       0x4C, 0xF5, 0xD9, 0xA1, 0x39, 0x6D, 0x81, 0x28,
-       0xEF, 0x13, 0x28, 0xDF, 0xF5, 0x3E, 0xF7, 0x8E,
-       0x09, 0x9C, 0x78, 0x18, 0x79, 0xB8, 0x68, 0xD7,
-       0xA8, 0x29, 0x62, 0xAD, 0xDE, 0xE1, 0x61, 0x76,
-       0x1B, 0x05, 0x16, 0xCD, 0xBF, 0x02, 0x8E, 0xA6,
-       0x43, 0x6E, 0x92, 0x55, 0x4F, 0x60, 0x9C, 0x03,
-       0xB8, 0x4F, 0xA3, 0x02, 0xAC, 0xA8, 0xA7, 0x0C,
-       0x1E, 0xB5, 0x6B, 0xF8, 0xC8, 0x4D, 0xDE, 0xD2,
-       0xB0, 0x29, 0x6E, 0x40, 0xE6, 0xD6, 0xC9, 0xE6,
-       0xB9, 0x0F, 0xB6, 0x63, 0xF5, 0xAA, 0x2B, 0x96,
-       0xA7, 0x16, 0xAC, 0x4E, 0x0A, 0x33, 0x1C, 0xA6,
-       0xE6, 0xBD, 0x8A, 0xCF, 0x40, 0xA9, 0xB2, 0xFA,
-       0x63, 0x27, 0xFD, 0x9B, 0xD9, 0xFC, 0xD5, 0x87,
-       0x8D, 0x4C, 0xB6, 0xA4, 0xCB, 0xE7, 0x74, 0x55,
-       0xF4, 0xFB, 0x41, 0x25, 0xB5, 0x4B, 0x0A, 0x1B,
-       0xB1, 0xD6, 0xB7, 0xD9, 0x47, 0x2A, 0xC3, 0x98,
-       0x6A, 0xC4, 0x03, 0x73, 0x1F, 0x93, 0x6E, 0x53,
-       0x19, 0x25, 0x64, 0x15, 0x83, 0xF9, 0x73, 0x2A,
-       0x74, 0xB4, 0x93, 0x69, 0xC4, 0x72, 0xFC, 0x26,
-       0xA2, 0x9F, 0x43, 0x45, 0xDD, 0xB9, 0xEF, 0x36,
-       0xC8, 0x3A, 0xCD, 0x99, 0x9B, 0x54, 0x1A, 0x36,
-       0xC1, 0x59, 0xF8, 0x98, 0xA8, 0xCC, 0x28, 0x0D,
-       0x73, 0x4C, 0xEE, 0x98, 0xCB, 0x7C, 0x58, 0x7E,
-       0x20, 0x75, 0x1E, 0xB7, 0xC9, 0xF8, 0xF2, 0x0E,
-       0x63, 0x9E, 0x05, 0x78, 0x1A, 0xB6, 0xA8, 0x7A,
-       0xF9, 0x98, 0x6A, 0xA6, 0x46, 0x84, 0x2E, 0xF6,
-       0x4B, 0xDC, 0x9B, 0x8F, 0x9B, 0x8F, 0xEE, 0xB4,
-       0xAA, 0x3F, 0xEE, 0xC0, 0x37, 0x27, 0x76, 0xC7,
-       0x95, 0xBB, 0x26, 0x74, 0x69, 0x12, 0x7F, 0xF1,
-       0xBB, 0xFF, 0xAE, 0xB5, 0x99, 0x6E, 0xCB, 0x0C
-};
+       /* free crypto session structure */
+#ifdef RTE_LIB_SECURITY
+       if (ut_params->type == RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL) {
+               if (ut_params->sec_session) {
+                       rte_security_session_destroy(rte_cryptodev_get_sec_ctx
+                                               (ts_params->valid_devs[0]),
+                                               ut_params->sec_session);
+                       ut_params->sec_session = NULL;
+               }
+       } else
+#endif
+       {
+               if (ut_params->sess) {
+                       rte_cryptodev_sym_session_clear(
+                                       ts_params->valid_devs[0],
+                                       ut_params->sess);
+                       rte_cryptodev_sym_session_free(ut_params->sess);
+                       ut_params->sess = NULL;
+               }
+       }
 
-static const uint8_t catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA1_digest[] = {
-       0x9a, 0x4f, 0x88, 0x1b, 0xb6, 0x8f, 0xd8, 0x60,
-       0x42, 0x1a, 0x7d, 0x3d, 0xf5, 0x82, 0x80, 0xf1,
-       0x18, 0x8c, 0x1d, 0x32
-};
+       /* free crypto operation structure */
+       if (ut_params->op)
+               rte_crypto_op_free(ut_params->op);
 
+       /*
+        * free mbuf - both obuf and ibuf are usually the same,
+        * so check if they point at the same address is necessary,
+        * to avoid freeing the mbuf twice.
+        */
+       if (ut_params->obuf) {
+               rte_pktmbuf_free(ut_params->obuf);
+               if (ut_params->ibuf == ut_params->obuf)
+                       ut_params->ibuf = 0;
+               ut_params->obuf = 0;
+       }
+       if (ut_params->ibuf) {
+               rte_pktmbuf_free(ut_params->ibuf);
+               ut_params->ibuf = 0;
+       }
 
-/* Multisession Vector context Test */
-/*Begin Session 0 */
-static uint8_t ms_aes_cbc_key0[] = {
-       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
+       if (ts_params->mbuf_pool != NULL)
+               RTE_LOG(DEBUG, USER1, "CRYPTO_MBUFPOOL count %u\n",
+                       rte_mempool_avail_count(ts_params->mbuf_pool));
 
-static uint8_t ms_aes_cbc_iv0[] = {
-       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
+       rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats);
 
-static const uint8_t ms_aes_cbc_cipher0[] = {
-               0x3C, 0xE4, 0xEE, 0x42, 0xB6, 0x9B, 0xC3, 0x38,
-               0x5F, 0xAD, 0x54, 0xDC, 0xA8, 0x32, 0x81, 0xDC,
-               0x7A, 0x6F, 0x85, 0x58, 0x07, 0x35, 0xED, 0xEB,
-               0xAD, 0x79, 0x79, 0x96, 0xD3, 0x0E, 0xA6, 0xD9,
-               0xAA, 0x86, 0xA4, 0x8F, 0xB5, 0xD6, 0x6E, 0x6D,
-               0x0C, 0x91, 0x2F, 0xC4, 0x67, 0x98, 0x0E, 0xC4,
-               0x8D, 0x83, 0x68, 0x69, 0xC4, 0xD3, 0x94, 0x34,
-               0xC4, 0x5D, 0x60, 0x55, 0x22, 0x87, 0x8F, 0x6F,
-               0x17, 0x8E, 0x75, 0xE4, 0x02, 0xF5, 0x1B, 0x99,
-               0xC8, 0x39, 0xA9, 0xAB, 0x23, 0x91, 0x12, 0xED,
-               0x08, 0xE7, 0xD9, 0x25, 0x89, 0x24, 0x4F, 0x8D,
-               0x68, 0xF3, 0x10, 0x39, 0x0A, 0xEE, 0x45, 0x24,
-               0xDF, 0x7A, 0x9D, 0x00, 0x25, 0xE5, 0x35, 0x71,
-               0x4E, 0x40, 0x59, 0x6F, 0x0A, 0x13, 0xB3, 0x72,
-               0x1D, 0x98, 0x63, 0x94, 0x89, 0xA5, 0x39, 0x8E,
-               0xD3, 0x9C, 0x8A, 0x7F, 0x71, 0x2F, 0xC7, 0xCD,
-               0x81, 0x05, 0xDC, 0xC0, 0x8D, 0xCE, 0x6D, 0x18,
-               0x30, 0xC4, 0x72, 0x51, 0xF0, 0x27, 0xC8, 0xF6,
-               0x60, 0x5B, 0x7C, 0xB2, 0xE3, 0x49, 0x0C, 0x29,
-               0xC6, 0x9F, 0x39, 0x57, 0x80, 0x55, 0x24, 0x2C,
-               0x9B, 0x0F, 0x5A, 0xB3, 0x89, 0x55, 0x31, 0x96,
-               0x0D, 0xCD, 0xF6, 0x51, 0x03, 0x2D, 0x89, 0x26,
-               0x74, 0x44, 0xD6, 0xE8, 0xDC, 0xEA, 0x44, 0x55,
-               0x64, 0x71, 0x9C, 0x9F, 0x5D, 0xBA, 0x39, 0x46,
-               0xA8, 0x17, 0xA1, 0x9C, 0x52, 0x9D, 0xBC, 0x6B,
-               0x4A, 0x98, 0xE6, 0xEA, 0x33, 0xEC, 0x58, 0xB4,
-               0x43, 0xF0, 0x32, 0x45, 0xA4, 0xC1, 0x55, 0xB7,
-               0x5D, 0xB5, 0x59, 0xB2, 0xE3, 0x96, 0xFF, 0xA5,
-               0xAF, 0xE1, 0x86, 0x1B, 0x42, 0xE6, 0x3B, 0xA0,
-               0x90, 0x4A, 0xE8, 0x8C, 0x21, 0x7F, 0x36, 0x1E,
-               0x5B, 0x65, 0x25, 0xD1, 0xC1, 0x5A, 0xCA, 0x3D,
-               0x10, 0xED, 0x2D, 0x79, 0xD0, 0x0F, 0x58, 0x44,
-               0x69, 0x81, 0xF5, 0xD4, 0xC9, 0x0F, 0x90, 0x76,
-               0x1F, 0x54, 0xD2, 0xD5, 0x97, 0xCE, 0x2C, 0xE3,
-               0xEF, 0xF4, 0xB7, 0xC6, 0x3A, 0x87, 0x7F, 0x83,
-               0x2A, 0xAF, 0xCD, 0x90, 0x12, 0xA7, 0x7D, 0x85,
-               0x1D, 0x62, 0xD3, 0x85, 0x25, 0x05, 0xDB, 0x45,
-               0x92, 0xA3, 0xF6, 0xA2, 0xA8, 0x41, 0xE4, 0x25,
-               0x86, 0x87, 0x67, 0x24, 0xEC, 0x89, 0x23, 0x2A,
-               0x9B, 0x20, 0x4D, 0x93, 0xEE, 0xE2, 0x2E, 0xC1,
-               0x0B, 0x15, 0x33, 0xCF, 0x00, 0xD1, 0x1A, 0xDA,
-               0x93, 0xFD, 0x28, 0x21, 0x5B, 0xCF, 0xD1, 0xF3,
-               0x5A, 0x81, 0xBA, 0x82, 0x5E, 0x2F, 0x61, 0xB4,
-               0x05, 0x71, 0xB5, 0xF4, 0x39, 0x3C, 0x1F, 0x60,
-               0x00, 0x7A, 0xC4, 0xF8, 0x35, 0x20, 0x6C, 0x3A,
-               0xCC, 0x03, 0x8F, 0x7B, 0xA2, 0xB6, 0x65, 0x8A,
-               0xB6, 0x5F, 0xFD, 0x25, 0xD3, 0x5F, 0x92, 0xF9,
-               0xAE, 0x17, 0x9B, 0x5E, 0x6E, 0x9A, 0xE4, 0x55,
-               0x10, 0x25, 0x07, 0xA4, 0xAF, 0x21, 0x69, 0x13,
-               0xD8, 0xFA, 0x31, 0xED, 0xF7, 0xA7, 0xA7, 0x3B,
-               0xB8, 0x96, 0x8E, 0x10, 0x86, 0x74, 0xD8, 0xB1,
-               0x34, 0x9E, 0x9B, 0x6A, 0x26, 0xA8, 0xD4, 0xD0,
-               0xB5, 0xF6, 0xDE, 0xE7, 0xCA, 0x06, 0xDC, 0xA3,
-               0x6F, 0xEE, 0x6B, 0x1E, 0xB5, 0x30, 0x99, 0x23,
-               0xF9, 0x76, 0xF0, 0xA0, 0xCF, 0x3B, 0x94, 0x7B,
-               0x19, 0x8D, 0xA5, 0x0C, 0x18, 0xA6, 0x1D, 0x07,
-               0x89, 0xBE, 0x5B, 0x61, 0xE5, 0xF1, 0x42, 0xDB,
-               0xD4, 0x2E, 0x02, 0x1F, 0xCE, 0xEF, 0x92, 0xB1,
-               0x1B, 0x56, 0x50, 0xF2, 0x16, 0xE5, 0xE7, 0x4F,
-               0xFD, 0xBB, 0x3E, 0xD2, 0xFC, 0x3C, 0xC6, 0x0F,
-               0xF9, 0x12, 0x4E, 0xCB, 0x1E, 0x0C, 0x15, 0x84,
-               0x2A, 0x14, 0x8A, 0x02, 0xE4, 0x7E, 0x95, 0x5B,
-               0x86, 0xDB, 0x9B, 0x62, 0x5B, 0x19, 0xD2, 0x17,
-               0xFA, 0x13, 0xBB, 0x6B, 0x3F, 0x45, 0x9F, 0xBF
-};
+       /* Stop the device */
+       rte_cryptodev_stop(ts_params->valid_devs[0]);
+}
 
+static int
+test_device_configure_invalid_dev_id(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint16_t dev_id, num_devs = 0;
 
-static  uint8_t ms_hmac_key0[] = {
-               0xFF, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
-               0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
-               0x58, 0x34, 0x85, 0x65, 0x1C, 0x42, 0x50, 0x76,
-               0x9A, 0xAF, 0x88, 0x1B, 0xB6, 0x8F, 0xF8, 0x60,
-               0xA2, 0x5A, 0x7F, 0x3F, 0xF4, 0x72, 0x70, 0xF1,
-               0xF5, 0x35, 0x4C, 0x3B, 0xDD, 0x90, 0x65, 0xB0,
-               0x47, 0x3A, 0x75, 0x61, 0x5C, 0xA2, 0x10, 0x76,
-               0x9A, 0xAF, 0x77, 0x5B, 0xB6, 0x7F, 0xF7, 0x60
-};
+       TEST_ASSERT((num_devs = rte_cryptodev_count()) >= 1,
+                       "Need at least %d devices for test", 1);
 
-static const uint8_t ms_hmac_digest0[] = {
-               0x43, 0x52, 0xED, 0x34, 0xAB, 0x36, 0xB2, 0x51,
-               0xFB, 0xA3, 0xA6, 0x7C, 0x38, 0xFC, 0x42, 0x8F,
-               0x57, 0x64, 0xAB, 0x81, 0xA7, 0x89, 0xB7, 0x6C,
-               0xA0, 0xDC, 0xB9, 0x4D, 0xC4, 0x30, 0xF9, 0xD4,
-               0x10, 0x82, 0x55, 0xD0, 0xAB, 0x32, 0xFB, 0x56,
-               0x0D, 0xE4, 0x68, 0x3D, 0x76, 0xD0, 0x7B, 0xE4,
-               0xA6, 0x2C, 0x34, 0x9E, 0x8C, 0x41, 0xF8, 0x23,
-               0x28, 0x1B, 0x3A, 0x90, 0x26, 0x34, 0x47, 0x90
-               };
+       /* valid dev_id values */
+       dev_id = ts_params->valid_devs[0];
 
-/* End Session 0 */
-/* Begin session 1 */
+       /* Stop the device in case it's started so it can be configured */
+       rte_cryptodev_stop(dev_id);
 
-static  uint8_t ms_aes_cbc_key1[] = {
-               0xf1, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-               0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
+       TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id, &ts_params->conf),
+                       "Failed test for rte_cryptodev_configure: "
+                       "invalid dev_num %u", dev_id);
 
-static  uint8_t ms_aes_cbc_iv1[] = {
-       0xf1, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
+       /* invalid dev_id values */
+       dev_id = num_devs;
 
-static const uint8_t ms_aes_cbc_cipher1[] = {
-               0x5A, 0x7A, 0x67, 0x5D, 0xB8, 0xE1, 0xDC, 0x71,
-               0x39, 0xA8, 0x74, 0x93, 0x9C, 0x4C, 0xFE, 0x23,
-               0x61, 0xCD, 0xA4, 0xB3, 0xD9, 0xCE, 0x99, 0x09,
-               0x2A, 0x23, 0xF3, 0x29, 0xBF, 0x4C, 0xB4, 0x6A,
-               0x1B, 0x6B, 0x73, 0x4D, 0x48, 0x0C, 0xCF, 0x6C,
-               0x5E, 0x34, 0x9E, 0x7F, 0xBC, 0x8F, 0xCC, 0x8F,
-               0x75, 0x1D, 0x3D, 0x77, 0x10, 0x76, 0xC8, 0xB9,
-               0x99, 0x6F, 0xD6, 0x56, 0x75, 0xA9, 0xB2, 0x66,
-               0xC2, 0x24, 0x2B, 0x9C, 0xFE, 0x40, 0x8E, 0x43,
-               0x20, 0x97, 0x1B, 0xFA, 0xD0, 0xCF, 0x04, 0xAB,
-               0xBB, 0xF6, 0x5D, 0xF5, 0xA0, 0x19, 0x7C, 0x23,
-               0x5D, 0x80, 0x8C, 0x49, 0xF6, 0x76, 0x88, 0x29,
-               0x27, 0x4C, 0x59, 0x2B, 0x43, 0xA6, 0xB2, 0x26,
-               0x27, 0x78, 0xBE, 0x1B, 0xE1, 0x4F, 0x5A, 0x1F,
-               0xFC, 0x68, 0x08, 0xE7, 0xC4, 0xD1, 0x34, 0x68,
-               0xB7, 0x13, 0x14, 0x41, 0x62, 0x6B, 0x1F, 0x77,
-               0x0C, 0x68, 0x1D, 0x0D, 0xED, 0x89, 0xAA, 0xD8,
-               0x97, 0x02, 0xBA, 0x5E, 0xD4, 0x84, 0x25, 0x97,
-               0x03, 0xA5, 0xA6, 0x13, 0x66, 0x02, 0xF4, 0xC3,
-               0xF3, 0xD3, 0xCC, 0x95, 0xC3, 0x87, 0x46, 0x90,
-               0x1F, 0x6E, 0x14, 0xA8, 0x00, 0xF2, 0x6F, 0xD5,
-               0xA1, 0xAD, 0xD5, 0x40, 0xA2, 0x0F, 0x32, 0x7E,
-               0x99, 0xA3, 0xF5, 0x53, 0xC3, 0x26, 0xA1, 0x45,
-               0x01, 0x88, 0x57, 0x84, 0x3E, 0x7B, 0x4E, 0x0B,
-               0x3C, 0xB5, 0x3E, 0x9E, 0xE9, 0x78, 0x77, 0xC5,
-               0xC0, 0x89, 0xA8, 0xF8, 0xF1, 0xA5, 0x2D, 0x5D,
-               0xF9, 0xC6, 0xFB, 0xCB, 0x05, 0x23, 0xBD, 0x6E,
-               0x5E, 0x14, 0xC6, 0x57, 0x73, 0xCF, 0x98, 0xBD,
-               0x10, 0x8B, 0x18, 0xA6, 0x01, 0x5B, 0x13, 0xAE,
-               0x8E, 0xDE, 0x1F, 0xB5, 0xB7, 0x40, 0x6C, 0xC1,
-               0x1E, 0xA1, 0x19, 0x20, 0x9E, 0x95, 0xE0, 0x2F,
-               0x1C, 0xF5, 0xD9, 0xD0, 0x2B, 0x1E, 0x82, 0x25,
-               0x62, 0xB4, 0xEB, 0xA1, 0x1F, 0xCE, 0x44, 0xA1,
-               0xCB, 0x92, 0x01, 0x6B, 0xE4, 0x26, 0x23, 0xE3,
-               0xC5, 0x67, 0x35, 0x55, 0xDA, 0xE5, 0x27, 0xEE,
-               0x8D, 0x12, 0x84, 0xB7, 0xBA, 0xA7, 0x1C, 0xD6,
-               0x32, 0x3F, 0x67, 0xED, 0xFB, 0x5B, 0x8B, 0x52,
-               0x46, 0x8C, 0xF9, 0x69, 0xCD, 0xAE, 0x79, 0xAA,
-               0x37, 0x78, 0x49, 0xEB, 0xC6, 0x8E, 0x76, 0x63,
-               0x84, 0xFF, 0x9D, 0x22, 0x99, 0x51, 0xB7, 0x5E,
-               0x83, 0x4C, 0x8B, 0xDF, 0x5A, 0x07, 0xCC, 0xBA,
-               0x42, 0xA5, 0x98, 0xB6, 0x47, 0x0E, 0x66, 0xEB,
-               0x23, 0x0E, 0xBA, 0x44, 0xA8, 0xAA, 0x20, 0x71,
-               0x79, 0x9C, 0x77, 0x5F, 0xF5, 0xFE, 0xEC, 0xEF,
-               0xC6, 0x64, 0x3D, 0x84, 0xD0, 0x2B, 0xA7, 0x0A,
-               0xC3, 0x72, 0x5B, 0x9C, 0xFA, 0xA8, 0x87, 0x95,
-               0x94, 0x11, 0x38, 0xA7, 0x1E, 0x58, 0xE3, 0x73,
-               0xC6, 0xC9, 0xD1, 0x7B, 0x92, 0xDB, 0x0F, 0x49,
-               0x74, 0xC2, 0xA2, 0x0E, 0x35, 0x57, 0xAC, 0xDB,
-               0x9A, 0x1C, 0xCF, 0x5A, 0x32, 0x3E, 0x26, 0x9B,
-               0xEC, 0xB3, 0xEF, 0x9C, 0xFE, 0xBE, 0x52, 0xAC,
-               0xB1, 0x29, 0xDD, 0xFD, 0x07, 0xE2, 0xEE, 0xED,
-               0xE4, 0x46, 0x37, 0xFE, 0xD1, 0xDC, 0xCD, 0x02,
-               0xF9, 0x31, 0xB0, 0xFB, 0x36, 0xB7, 0x34, 0xA4,
-               0x76, 0xE8, 0x57, 0xBF, 0x99, 0x92, 0xC7, 0xAF,
-               0x98, 0x10, 0xE2, 0x70, 0xCA, 0xC9, 0x2B, 0x82,
-               0x06, 0x96, 0x88, 0x0D, 0xB3, 0xAC, 0x9E, 0x6D,
-               0x43, 0xBC, 0x5B, 0x31, 0xCF, 0x65, 0x8D, 0xA6,
-               0xC7, 0xFE, 0x73, 0xE1, 0x54, 0xF7, 0x10, 0xF9,
-               0x86, 0xF7, 0xDF, 0xA1, 0xA1, 0xD8, 0xAE, 0x35,
-               0xB3, 0x90, 0xDC, 0x6F, 0x43, 0x7A, 0x8B, 0xE0,
-               0xFE, 0x8F, 0x33, 0x4D, 0x29, 0x6C, 0x45, 0x53,
-               0x73, 0xDD, 0x21, 0x0B, 0x85, 0x30, 0xB5, 0xA5,
-               0xF3, 0x5D, 0xEC, 0x79, 0x61, 0x9D, 0x9E, 0xB3
-
-};
-
-static uint8_t ms_hmac_key1[] = {
-               0xFE, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
-               0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
-               0x58, 0x34, 0x85, 0x65, 0x1C, 0x42, 0x50, 0x76,
-               0x9A, 0xAF, 0x88, 0x1B, 0xB6, 0x8F, 0xF8, 0x60,
-               0xA2, 0x5A, 0x7F, 0x3F, 0xF4, 0x72, 0x70, 0xF1,
-               0xF5, 0x35, 0x4C, 0x3B, 0xDD, 0x90, 0x65, 0xB0,
-               0x47, 0x3A, 0x75, 0x61, 0x5C, 0xA2, 0x10, 0x76,
-               0x9A, 0xAF, 0x77, 0x5B, 0xB6, 0x7F, 0xF7, 0x60
-};
-
-static const uint8_t ms_hmac_digest1[] = {
-               0xCE, 0x6E, 0x5F, 0x77, 0x96, 0x9A, 0xB1, 0x69,
-               0x2D, 0x5E, 0xF3, 0x2F, 0x32, 0x10, 0xCB, 0x50,
-               0x0E, 0x09, 0x56, 0x25, 0x07, 0x34, 0xC9, 0x20,
-               0xEC, 0x13, 0x43, 0x23, 0x5C, 0x08, 0x8B, 0xCD,
-               0xDC, 0x86, 0x8C, 0xEE, 0x0A, 0x95, 0x2E, 0xB9,
-               0x8C, 0x7B, 0x02, 0x7A, 0xD4, 0xE1, 0x49, 0xB4,
-               0x45, 0xB5, 0x52, 0x37, 0xC6, 0xFF, 0xFE, 0xAA,
-               0x0A, 0x87, 0xB8, 0x51, 0xF9, 0x2A, 0x01, 0x8F
-};
-/* End Session 1  */
-/* Begin Session 2 */
-static  uint8_t ms_aes_cbc_key2[] = {
-               0xff, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-               0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
-
-static  uint8_t ms_aes_cbc_iv2[] = {
-               0xff, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-               0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
-
-static const uint8_t ms_aes_cbc_cipher2[] = {
-               0xBB, 0x3C, 0x68, 0x25, 0xFD, 0xB6, 0xA2, 0x91,
-               0x20, 0x56, 0xF6, 0x30, 0x35, 0xFC, 0x9E, 0x97,
-               0xF2, 0x90, 0xFC, 0x7E, 0x3E, 0x0A, 0x75, 0xC8,
-               0x4C, 0xF2, 0x2D, 0xAC, 0xD3, 0x93, 0xF0, 0xC5,
-               0x14, 0x88, 0x8A, 0x23, 0xC2, 0x59, 0x9A, 0x98,
-               0x4B, 0xD5, 0x2C, 0xDA, 0x43, 0xA9, 0x34, 0x69,
-               0x7C, 0x6D, 0xDB, 0xDC, 0xCB, 0xC0, 0xA0, 0x09,
-               0xA7, 0x86, 0x16, 0x4B, 0xBF, 0xA8, 0xB6, 0xCF,
-               0x7F, 0x74, 0x1F, 0x22, 0xF0, 0xF6, 0xBB, 0x44,
-               0x8B, 0x4C, 0x9E, 0x23, 0xF8, 0x9F, 0xFC, 0x5B,
-               0x9E, 0x9C, 0x2A, 0x79, 0x30, 0x8F, 0xBF, 0xA9,
-               0x68, 0xA1, 0x20, 0x71, 0x7C, 0x77, 0x22, 0x34,
-               0x07, 0xCD, 0xC6, 0xF6, 0x50, 0x0A, 0x08, 0x99,
-               0x17, 0x98, 0xE3, 0x93, 0x8A, 0xB0, 0xEE, 0xDF,
-               0xC2, 0xBA, 0x3B, 0x44, 0x73, 0xDF, 0xDD, 0xDC,
-               0x14, 0x4D, 0x3B, 0xBB, 0x5E, 0x58, 0xC1, 0x26,
-               0xA7, 0xAE, 0x47, 0xF3, 0x24, 0x6D, 0x4F, 0xD3,
-               0x6E, 0x3E, 0x33, 0xE6, 0x7F, 0xCA, 0x50, 0xAF,
-               0x5D, 0x3D, 0xA0, 0xDD, 0xC9, 0xF3, 0x30, 0xD3,
-               0x6E, 0x8B, 0x2E, 0x12, 0x24, 0x34, 0xF0, 0xD3,
-               0xC7, 0x8D, 0x23, 0x29, 0xAA, 0x05, 0xE1, 0xFA,
-               0x2E, 0xF6, 0x8D, 0x37, 0x86, 0xC0, 0x6D, 0x13,
-               0x2D, 0x98, 0xF3, 0x52, 0x39, 0x22, 0xCE, 0x38,
-               0xC2, 0x1A, 0x72, 0xED, 0xFB, 0xCC, 0xE4, 0x71,
-               0x5A, 0x0C, 0x0D, 0x09, 0xF8, 0xE8, 0x1B, 0xBC,
-               0x53, 0xC8, 0xD8, 0x8F, 0xE5, 0x98, 0x5A, 0xB1,
-               0x06, 0xA6, 0x5B, 0xE6, 0xA2, 0x88, 0x21, 0x9E,
-               0x36, 0xC0, 0x34, 0xF9, 0xFB, 0x3B, 0x0A, 0x22,
-               0x00, 0x00, 0x39, 0x48, 0x8D, 0x23, 0x74, 0x62,
-               0x72, 0x91, 0xE6, 0x36, 0xAA, 0x77, 0x9C, 0x72,
-               0x9D, 0xA8, 0xC3, 0xA9, 0xD5, 0x44, 0x72, 0xA6,
-               0xB9, 0x28, 0x8F, 0x64, 0x4C, 0x8A, 0x64, 0xE6,
-               0x4E, 0xFA, 0xEF, 0x87, 0xDE, 0x7B, 0x22, 0x44,
-               0xB0, 0xDF, 0x2E, 0x5F, 0x0B, 0xA5, 0xF2, 0x24,
-               0x07, 0x5C, 0x2D, 0x39, 0xB7, 0x3D, 0x8A, 0xE5,
-               0x0E, 0x9D, 0x4E, 0x50, 0xED, 0x03, 0x99, 0x8E,
-               0xF0, 0x06, 0x55, 0x4E, 0xA2, 0x24, 0xE7, 0x17,
-               0x46, 0xDF, 0x6C, 0xCD, 0xC6, 0x44, 0xE8, 0xF9,
-               0xB9, 0x1B, 0x36, 0xF6, 0x7F, 0x10, 0xA4, 0x7D,
-               0x90, 0xBD, 0xE4, 0xAA, 0xD6, 0x9E, 0x18, 0x9D,
-               0x22, 0x35, 0xD6, 0x55, 0x54, 0xAA, 0xF7, 0x22,
-               0xA3, 0x3E, 0xEF, 0xC8, 0xA2, 0x34, 0x8D, 0xA9,
-               0x37, 0x63, 0xA6, 0xC3, 0x57, 0xCB, 0x0C, 0x49,
-               0x7D, 0x02, 0xBE, 0xAA, 0x13, 0x75, 0xB7, 0x4E,
-               0x52, 0x62, 0xA5, 0xC2, 0x33, 0xC7, 0x6C, 0x1B,
-               0xF6, 0x34, 0xF6, 0x09, 0xA5, 0x0C, 0xC7, 0xA2,
-               0x61, 0x48, 0x62, 0x7D, 0x17, 0x15, 0xE3, 0x95,
-               0xC8, 0x63, 0xD2, 0xA4, 0x43, 0xA9, 0x49, 0x07,
-               0xB2, 0x3B, 0x2B, 0x62, 0x7D, 0xCB, 0x51, 0xB3,
-               0x25, 0x33, 0x47, 0x0E, 0x14, 0x67, 0xDC, 0x6A,
-               0x9B, 0x51, 0xAC, 0x9D, 0x8F, 0xA2, 0x2B, 0x57,
-               0x8C, 0x5C, 0x5F, 0x76, 0x23, 0x92, 0x0F, 0x84,
-               0x46, 0x0E, 0x40, 0x85, 0x38, 0x60, 0xFA, 0x61,
-               0x20, 0xC5, 0xE3, 0xF1, 0x70, 0xAC, 0x1B, 0xBF,
-               0xC4, 0x2B, 0xC5, 0x67, 0xD1, 0x43, 0xC5, 0x17,
-               0x74, 0x71, 0x69, 0x6F, 0x82, 0x89, 0x19, 0x8A,
-               0x70, 0x43, 0x92, 0x01, 0xC4, 0x63, 0x7E, 0xB1,
-               0x59, 0x4E, 0xCD, 0xEA, 0x93, 0xA4, 0x52, 0x53,
-               0x9B, 0x61, 0x5B, 0xD2, 0x3E, 0x19, 0x39, 0xB7,
-               0x32, 0xEA, 0x8E, 0xF8, 0x1D, 0x76, 0x5C, 0xB2,
-               0x73, 0x2D, 0x91, 0xC0, 0x18, 0xED, 0x25, 0x2A,
-               0x53, 0x64, 0xF0, 0x92, 0x31, 0x55, 0x21, 0xA8,
-               0x24, 0xA9, 0xD1, 0x02, 0xF6, 0x6C, 0x2B, 0x70,
-               0xA9, 0x59, 0xC1, 0xD6, 0xC3, 0x57, 0x5B, 0x92
-};
-
-static  uint8_t ms_hmac_key2[] = {
-               0xFC, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
-               0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
-               0x58, 0x34, 0x85, 0x65, 0x1C, 0x42, 0x50, 0x76,
-               0x9A, 0xAF, 0x88, 0x1B, 0xB6, 0x8F, 0xF8, 0x60,
-               0xA2, 0x5A, 0x7F, 0x3F, 0xF4, 0x72, 0x70, 0xF1,
-               0xF5, 0x35, 0x4C, 0x3B, 0xDD, 0x90, 0x65, 0xB0,
-               0x47, 0x3A, 0x75, 0x61, 0x5C, 0xA2, 0x10, 0x76,
-               0x9A, 0xAF, 0x77, 0x5B, 0xB6, 0x7F, 0xF7, 0x60
-};
+       TEST_ASSERT_FAIL(rte_cryptodev_configure(dev_id, &ts_params->conf),
+                       "Failed test for rte_cryptodev_configure: "
+                       "invalid dev_num %u", dev_id);
 
-static const uint8_t ms_hmac_digest2[] = {
-               0xA5, 0x0F, 0x9C, 0xFB, 0x08, 0x62, 0x59, 0xFF,
-               0x80, 0x2F, 0xEB, 0x4B, 0xE1, 0x46, 0x21, 0xD6,
-               0x02, 0x98, 0xF2, 0x8E, 0xF4, 0xEC, 0xD4, 0x77,
-               0x86, 0x4C, 0x31, 0x28, 0xC8, 0x25, 0x80, 0x27,
-               0x3A, 0x72, 0x5D, 0x6A, 0x56, 0x8A, 0xD3, 0x82,
-               0xB0, 0xEC, 0x31, 0x6D, 0x8B, 0x6B, 0xB4, 0x24,
-               0xE7, 0x62, 0xC1, 0x52, 0xBC, 0x14, 0x1B, 0x8E,
-               0xEC, 0x9A, 0xF1, 0x47, 0x80, 0xD2, 0xB0, 0x59
-};
+       dev_id = 0xff;
 
-/* End Session 2 */
+       TEST_ASSERT_FAIL(rte_cryptodev_configure(dev_id, &ts_params->conf),
+                       "Failed test for rte_cryptodev_configure:"
+                       "invalid dev_num %u", dev_id);
 
+       return TEST_SUCCESS;
+}
 
 static int
-test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
+test_device_configure_invalid_queue_pair_ids(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       uint16_t orig_nb_qps = ts_params->conf.nb_queue_pairs;
 
-       /* Generate test mbuf data and space for digest */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+       /* Stop the device in case it's started so it can be configured */
+       rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-       ut_params->digest = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       DIGEST_BYTE_LENGTH_SHA1);
-       TEST_ASSERT_NOT_NULL(ut_params->digest, "no room to append digest");
+       /* valid - max value queue pairs */
+       ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       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);
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-       ut_params->cipher_xform.cipher.key.data = aes_cbc_key;
-       ut_params->cipher_xform.cipher.key.length = CIPHER_KEY_LENGTH_AES_CBC;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = CIPHER_IV_LENGTH_AES_CBC;
+       /* valid - one queue pairs */
+       ts_params->conf.nb_queue_pairs = 1;
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       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);
 
-       ut_params->auth_xform.next = NULL;
 
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
-       ut_params->auth_xform.auth.key.length = HMAC_KEY_LENGTH_SHA1;
-       ut_params->auth_xform.auth.key.data = hmac_sha1_key;
-       ut_params->auth_xform.auth.digest_length = DIGEST_BYTE_LENGTH_SHA1;
+       /* invalid - zero queue pairs */
+       ts_params->conf.nb_queue_pairs = 0;
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
+                       &ts_params->conf),
+                       "Failed test for rte_cryptodev_configure, dev_id %u,"
+                       " invalid qps: %u",
+                       ts_params->valid_devs[0],
+                       ts_params->conf.nb_queue_pairs);
 
-       /* Create crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       /* Generate crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       /* invalid - max value supported by field queue pairs */
+       ts_params->conf.nb_queue_pairs = UINT16_MAX;
 
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
+                       &ts_params->conf),
+                       "Failed test for rte_cryptodev_configure, dev_id %u,"
+                       " invalid qps: %u",
+                       ts_params->valid_devs[0],
+                       ts_params->conf.nb_queue_pairs);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       /* invalid - max value + 1 queue pairs */
+       ts_params->conf.nb_queue_pairs = orig_nb_qps + 1;
 
-       /* Set crypto operation authentication parameters */
-       sym_op->auth.digest.data = ut_params->digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, QUOTE_512_BYTES);
+       TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
+                       &ts_params->conf),
+                       "Failed test for rte_cryptodev_configure, dev_id %u,"
+                       " invalid qps: %u",
+                       ts_params->valid_devs[0],
+                       ts_params->conf.nb_queue_pairs);
 
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
+       /* revert to original testsuite value */
+       ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
-       /* Copy IV at the end of the crypto operation */
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       aes_cbc_iv, CIPHER_IV_LENGTH_AES_CBC);
+       return TEST_SUCCESS;
+}
 
-       /* Set crypto operation cipher parameters */
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
+static int
+test_queue_pair_descriptor_setup(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct rte_cryptodev_qp_conf qp_conf = {
+               .nb_descriptors = MAX_NUM_OPS_INFLIGHT
+       };
+       uint16_t qp_id;
 
-       /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       /* Stop the device in case it's started so it can be configured */
+       rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+       TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
+                       &ts_params->conf),
+                       "Failed to configure cryptodev %u",
+                       ts_params->valid_devs[0]);
 
-       /* Validate obuf */
-       uint8_t *ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_src,
-                       uint8_t *);
+       /*
+        * Test various ring sizes on this device. memzones can't be
+        * freed so are re-used if ring is released and re-created.
+        */
+       qp_conf.nb_descriptors = MIN_NUM_OPS_INFLIGHT; /* min size*/
+       qp_conf.mp_session = ts_params->session_mpool;
+       qp_conf.mp_session_private = ts_params->session_priv_mpool;
 
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(ciphertext,
-                       catch_22_quote_2_512_bytes_AES_CBC_ciphertext,
-                       QUOTE_512_BYTES,
-                       "ciphertext data not as expected");
+       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
+               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+                               ts_params->valid_devs[0], qp_id, &qp_conf,
+                               rte_cryptodev_socket_id(
+                                               ts_params->valid_devs[0])),
+                               "Failed 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]);
+       }
 
-       uint8_t *digest = ciphertext + QUOTE_512_BYTES;
+       qp_conf.nb_descriptors = (uint32_t)(MAX_NUM_OPS_INFLIGHT / 2);
 
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(digest,
-                       catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA1_digest,
-                       gbl_driver_id == rte_cryptodev_driver_id_get(
-                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) ?
-                                       TRUNCATED_DIGEST_BYTE_LENGTH_SHA1 :
-                                       DIGEST_BYTE_LENGTH_SHA1,
-                       "Generated digest data not as expected");
+       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
+               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+                               ts_params->valid_devs[0], qp_id, &qp_conf,
+                               rte_cryptodev_socket_id(
+                                               ts_params->valid_devs[0])),
+                               "Failed 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]);
+       }
 
-       return TEST_SUCCESS;
-}
+       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT; /* valid */
 
-/* ***** AES-CBC / HMAC-SHA512 Hash Tests ***** */
+       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
+               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+                               ts_params->valid_devs[0], qp_id, &qp_conf,
+                               rte_cryptodev_socket_id(
+                                               ts_params->valid_devs[0])),
+                               "Failed 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]);
+       }
 
-#define HMAC_KEY_LENGTH_SHA512  (DIGEST_BYTE_LENGTH_SHA512)
+       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;
 
-static uint8_t hmac_sha512_key[] = {
-       0x42, 0x1a, 0x7d, 0x3d, 0xf5, 0x82, 0x80, 0xf1,
-       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
-       0x58, 0x34, 0x85, 0x65, 0x1C, 0x42, 0x50, 0x76,
-       0x9a, 0xaf, 0x88, 0x1b, 0xb6, 0x8f, 0xf8, 0x60,
-       0xa2, 0x5a, 0x7f, 0x3f, 0xf4, 0x72, 0x70, 0xf1,
-       0xF5, 0x35, 0x4C, 0x3B, 0xDD, 0x90, 0x65, 0xB0,
-       0x47, 0x3a, 0x75, 0x61, 0x5C, 0xa2, 0x10, 0x76,
-       0x9a, 0xaf, 0x77, 0x5b, 0xb6, 0x7f, 0xf7, 0x60 };
+       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
+               TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+                               ts_params->valid_devs[0], qp_id, &qp_conf,
+                               rte_cryptodev_socket_id(
+                                               ts_params->valid_devs[0])),
+                               "Failed 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]);
+       }
 
-static const uint8_t catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA512_digest[] = {
-       0x5D, 0x54, 0x66, 0xC1, 0x6E, 0xBC, 0x04, 0xB8,
-       0x46, 0xB8, 0x08, 0x6E, 0xE0, 0xF0, 0x43, 0x48,
-       0x37, 0x96, 0x9C, 0xC6, 0x9C, 0xC2, 0x1E, 0xE8,
-       0xF2, 0x0C, 0x0B, 0xEF, 0x86, 0xA2, 0xE3, 0x70,
-       0x95, 0xC8, 0xB3, 0x06, 0x47, 0xA9, 0x90, 0xE8,
-       0xA0, 0xC6, 0x72, 0x69, 0x05, 0xC0, 0x0D, 0x0E,
-       0x21, 0x96, 0x65, 0x93, 0x74, 0x43, 0x2A, 0x1D,
-       0x2E, 0xBF, 0xC2, 0xC2, 0xEE, 0xCC, 0x2F, 0x0A };
+       /* test invalid queue pair id */
+       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;      /*valid */
 
+       qp_id = ts_params->conf.nb_queue_pairs;         /*invalid */
 
+       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])),
+                       "Failed test for rte_cryptodev_queue_pair_setup:"
+                       "invalid qp %u on cryptodev %u",
+                       qp_id, ts_params->valid_devs[0]);
 
-static int
-test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(
-               struct crypto_unittest_params *ut_params,
-               uint8_t *cipher_key,
-               uint8_t *hmac_key);
+       qp_id = 0xffff; /*invalid*/
 
-static int
-test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
-               struct crypto_unittest_params *ut_params,
-               struct crypto_testsuite_params *ts_params,
-               const uint8_t *cipher,
-               const uint8_t *digest,
-               const uint8_t *iv);
+       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])),
+                       "Failed test for rte_cryptodev_queue_pair_setup:"
+                       "invalid qp %u on cryptodev %u",
+                       qp_id, ts_params->valid_devs[0]);
 
+       return TEST_SUCCESS;
+}
 
-static int
-test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(
-               struct crypto_unittest_params *ut_params,
-               uint8_t *cipher_key,
-               uint8_t *hmac_key)
-{
+/* ***** Plaintext data for tests ***** */
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+const char catch_22_quote_1[] =
+               "There was only one catch and that was Catch-22, which "
+               "specified that a concern for one's safety in the face of "
+               "dangers that were real and immediate was the process of a "
+               "rational mind. Orr was crazy and could be grounded. All he "
+               "had to do was ask; and as soon as he did, he would no longer "
+               "be crazy and would have to fly more missions. Orr would be "
+               "crazy to fly more missions and sane if he didn't, but if he "
+               "was sane he had to fly them. If he flew them he was crazy "
+               "and didn't have to; but if he didn't want to he was sane and "
+               "had to. Yossarian was moved very deeply by the absolute "
+               "simplicity of this clause of Catch-22 and let out a "
+               "respectful whistle. \"That's some catch, that Catch-22\", he "
+               "observed. \"It's the best there is,\" Doc Daneeka agreed.";
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
-       ut_params->cipher_xform.cipher.key.data = cipher_key;
-       ut_params->cipher_xform.cipher.key.length = CIPHER_KEY_LENGTH_AES_CBC;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = CIPHER_IV_LENGTH_AES_CBC;
+const char catch_22_quote[] =
+               "What a lousy earth! He wondered how many people were "
+               "destitute that same night even in his own prosperous country, "
+               "how many homes were shanties, how many husbands were drunk "
+               "and wives socked, and how many children were bullied, abused, "
+               "or abandoned. How many families hungered for food they could "
+               "not afford to buy? How many hearts were broken? How many "
+               "suicides would take place that same night, how many people "
+               "would go insane? How many cockroaches and landlords would "
+               "triumph? How many winners were losers, successes failures, "
+               "and rich men poor men? How many wise guys were stupid? How "
+               "many happy endings were unhappy endings? How many honest men "
+               "were liars, brave men cowards, loyal men traitors, how many "
+               "sainted men were corrupt, how many people in positions of "
+               "trust had sold their souls to bodyguards, how many had never "
+               "had souls? How many straight-and-narrow paths were crooked "
+               "paths? How many best families were worst families and how "
+               "many good people were bad people? When you added them all up "
+               "and then subtracted, you might be left with only the children, "
+               "and perhaps with Albert Einstein and an old violinist or "
+               "sculptor somewhere.";
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
+#define QUOTE_480_BYTES                (480)
+#define QUOTE_512_BYTES                (512)
+#define QUOTE_768_BYTES                (768)
+#define QUOTE_1024_BYTES       (1024)
 
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
-       ut_params->auth_xform.auth.key.data = hmac_key;
-       ut_params->auth_xform.auth.key.length = HMAC_KEY_LENGTH_SHA512;
-       ut_params->auth_xform.auth.digest_length = DIGEST_BYTE_LENGTH_SHA512;
 
-       return TEST_SUCCESS;
-}
 
+/* ***** SHA1 Hash Tests ***** */
 
-static int
-test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
-               struct crypto_unittest_params *ut_params,
-               struct crypto_testsuite_params *ts_params,
-               const uint8_t *cipher,
-               const uint8_t *digest,
-               const uint8_t *iv)
-{
-       /* Generate test mbuf data and digest */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       (const char *)
-                       cipher,
-                       QUOTE_512_BYTES, 0);
+#define HMAC_KEY_LENGTH_SHA1   (DIGEST_BYTE_LENGTH_SHA1)
 
-       ut_params->digest = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       DIGEST_BYTE_LENGTH_SHA512);
-       TEST_ASSERT_NOT_NULL(ut_params->digest, "no room to append digest");
-
-       rte_memcpy(ut_params->digest,
-                       digest,
-                       DIGEST_BYTE_LENGTH_SHA512);
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+static uint8_t hmac_sha1_key[] = {
+       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+       0xDE, 0xF4, 0xDE, 0xAD };
 
-       rte_crypto_op_attach_sym_session(ut_params->op, sess);
+/* ***** SHA224 Hash Tests ***** */
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+#define HMAC_KEY_LENGTH_SHA224 (DIGEST_BYTE_LENGTH_SHA224)
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
 
-       sym_op->auth.digest.data = ut_params->digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, QUOTE_512_BYTES);
+/* ***** AES-CBC Cipher Tests ***** */
 
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
+#define CIPHER_KEY_LENGTH_AES_CBC      (16)
+#define CIPHER_IV_LENGTH_AES_CBC       (CIPHER_KEY_LENGTH_AES_CBC)
 
-       /* Copy IV at the end of the crypto operation */
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       iv, CIPHER_IV_LENGTH_AES_CBC);
+static uint8_t aes_cbc_key[] = {
+       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A };
 
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
+static uint8_t aes_cbc_iv[] = {
+       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
 
-       /* Process crypto operation */
-       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");
+/* ***** AES-CBC / HMAC-SHA1 Hash Tests ***** */
 
-       ut_params->obuf = ut_params->op->sym->m_src;
+static const uint8_t catch_22_quote_2_512_bytes_AES_CBC_ciphertext[] = {
+       0x8B, 0x4D, 0xDA, 0x1B, 0xCF, 0x04, 0xA0, 0x31,
+       0xB4, 0xBF, 0xBD, 0x68, 0x43, 0x20, 0x7E, 0x76,
+       0xB1, 0x96, 0x8B, 0xA2, 0x7C, 0xA2, 0x83, 0x9E,
+       0x39, 0x5A, 0x2F, 0x7E, 0x92, 0xB4, 0x48, 0x1A,
+       0x3F, 0x6B, 0x5D, 0xDF, 0x52, 0x85, 0x5F, 0x8E,
+       0x42, 0x3C, 0xFB, 0xE9, 0x1A, 0x24, 0xD6, 0x08,
+       0xDD, 0xFD, 0x16, 0xFB, 0xE9, 0x55, 0xEF, 0xF0,
+       0xA0, 0x8D, 0x13, 0xAB, 0x81, 0xC6, 0x90, 0x01,
+       0xB5, 0x18, 0x84, 0xB3, 0xF6, 0xE6, 0x11, 0x57,
+       0xD6, 0x71, 0xC6, 0x3C, 0x3F, 0x2F, 0x33, 0xEE,
+       0x24, 0x42, 0x6E, 0xAC, 0x0B, 0xCA, 0xEC, 0xF9,
+       0x84, 0xF8, 0x22, 0xAA, 0x60, 0xF0, 0x32, 0xA9,
+       0x75, 0x75, 0x3B, 0xCB, 0x70, 0x21, 0x0A, 0x8D,
+       0x0F, 0xE0, 0xC4, 0x78, 0x2B, 0xF8, 0x97, 0xE3,
+       0xE4, 0x26, 0x4B, 0x29, 0xDA, 0x88, 0xCD, 0x46,
+       0xEC, 0xAA, 0xF9, 0x7F, 0xF1, 0x15, 0xEA, 0xC3,
+       0x87, 0xE6, 0x31, 0xF2, 0xCF, 0xDE, 0x4D, 0x80,
+       0x70, 0x91, 0x7E, 0x0C, 0xF7, 0x26, 0x3A, 0x92,
+       0x4F, 0x18, 0x83, 0xC0, 0x8F, 0x59, 0x01, 0xA5,
+       0x88, 0xD1, 0xDB, 0x26, 0x71, 0x27, 0x16, 0xF5,
+       0xEE, 0x10, 0x82, 0xAC, 0x68, 0x26, 0x9B, 0xE2,
+       0x6D, 0xD8, 0x9A, 0x80, 0xDF, 0x04, 0x31, 0xD5,
+       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
+       0x58, 0x34, 0x85, 0x61, 0x1C, 0x42, 0x10, 0x76,
+       0x73, 0x02, 0x42, 0xC9, 0x23, 0x18, 0x8E, 0xB4,
+       0x6F, 0xB4, 0xA3, 0x54, 0x6E, 0x88, 0x3B, 0x62,
+       0x7C, 0x02, 0x8D, 0x4C, 0x9F, 0xC8, 0x45, 0xF4,
+       0xC9, 0xDE, 0x4F, 0xEB, 0x22, 0x83, 0x1B, 0xE4,
+       0x49, 0x37, 0xE4, 0xAD, 0xE7, 0xCD, 0x21, 0x54,
+       0xBC, 0x1C, 0xC2, 0x04, 0x97, 0xB4, 0x10, 0x61,
+       0xF0, 0xE4, 0xEF, 0x27, 0x63, 0x3A, 0xDA, 0x91,
+       0x41, 0x25, 0x62, 0x1C, 0x5C, 0xB6, 0x38, 0x4A,
+       0x88, 0x71, 0x59, 0x5A, 0x8D, 0xA0, 0x09, 0xAF,
+       0x72, 0x94, 0xD7, 0x79, 0x5C, 0x60, 0x7C, 0x8F,
+       0x4C, 0xF5, 0xD9, 0xA1, 0x39, 0x6D, 0x81, 0x28,
+       0xEF, 0x13, 0x28, 0xDF, 0xF5, 0x3E, 0xF7, 0x8E,
+       0x09, 0x9C, 0x78, 0x18, 0x79, 0xB8, 0x68, 0xD7,
+       0xA8, 0x29, 0x62, 0xAD, 0xDE, 0xE1, 0x61, 0x76,
+       0x1B, 0x05, 0x16, 0xCD, 0xBF, 0x02, 0x8E, 0xA6,
+       0x43, 0x6E, 0x92, 0x55, 0x4F, 0x60, 0x9C, 0x03,
+       0xB8, 0x4F, 0xA3, 0x02, 0xAC, 0xA8, 0xA7, 0x0C,
+       0x1E, 0xB5, 0x6B, 0xF8, 0xC8, 0x4D, 0xDE, 0xD2,
+       0xB0, 0x29, 0x6E, 0x40, 0xE6, 0xD6, 0xC9, 0xE6,
+       0xB9, 0x0F, 0xB6, 0x63, 0xF5, 0xAA, 0x2B, 0x96,
+       0xA7, 0x16, 0xAC, 0x4E, 0x0A, 0x33, 0x1C, 0xA6,
+       0xE6, 0xBD, 0x8A, 0xCF, 0x40, 0xA9, 0xB2, 0xFA,
+       0x63, 0x27, 0xFD, 0x9B, 0xD9, 0xFC, 0xD5, 0x87,
+       0x8D, 0x4C, 0xB6, 0xA4, 0xCB, 0xE7, 0x74, 0x55,
+       0xF4, 0xFB, 0x41, 0x25, 0xB5, 0x4B, 0x0A, 0x1B,
+       0xB1, 0xD6, 0xB7, 0xD9, 0x47, 0x2A, 0xC3, 0x98,
+       0x6A, 0xC4, 0x03, 0x73, 0x1F, 0x93, 0x6E, 0x53,
+       0x19, 0x25, 0x64, 0x15, 0x83, 0xF9, 0x73, 0x2A,
+       0x74, 0xB4, 0x93, 0x69, 0xC4, 0x72, 0xFC, 0x26,
+       0xA2, 0x9F, 0x43, 0x45, 0xDD, 0xB9, 0xEF, 0x36,
+       0xC8, 0x3A, 0xCD, 0x99, 0x9B, 0x54, 0x1A, 0x36,
+       0xC1, 0x59, 0xF8, 0x98, 0xA8, 0xCC, 0x28, 0x0D,
+       0x73, 0x4C, 0xEE, 0x98, 0xCB, 0x7C, 0x58, 0x7E,
+       0x20, 0x75, 0x1E, 0xB7, 0xC9, 0xF8, 0xF2, 0x0E,
+       0x63, 0x9E, 0x05, 0x78, 0x1A, 0xB6, 0xA8, 0x7A,
+       0xF9, 0x98, 0x6A, 0xA6, 0x46, 0x84, 0x2E, 0xF6,
+       0x4B, 0xDC, 0x9B, 0x8F, 0x9B, 0x8F, 0xEE, 0xB4,
+       0xAA, 0x3F, 0xEE, 0xC0, 0x37, 0x27, 0x76, 0xC7,
+       0x95, 0xBB, 0x26, 0x74, 0x69, 0x12, 0x7F, 0xF1,
+       0xBB, 0xFF, 0xAE, 0xB5, 0x99, 0x6E, 0xCB, 0x0C
+};
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->obuf, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Plaintext data not as expected");
+static const uint8_t catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA1_digest[] = {
+       0x9a, 0x4f, 0x88, 0x1b, 0xb6, 0x8f, 0xd8, 0x60,
+       0x42, 0x1a, 0x7d, 0x3d, 0xf5, 0x82, 0x80, 0xf1,
+       0x18, 0x8c, 0x1d, 0x32
+};
 
-       /* Validate obuf */
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "Digest verification failed");
 
-       return TEST_SUCCESS;
-}
+/* Multisession Vector context Test */
+/*Begin Session 0 */
+static uint8_t ms_aes_cbc_key0[] = {
+       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
 
-static int
-test_blockcipher(enum blockcipher_test_type test_type)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+static uint8_t ms_aes_cbc_iv0[] = {
+       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               gbl_driver_id,
-               test_type);
+static const uint8_t ms_aes_cbc_cipher0[] = {
+               0x3C, 0xE4, 0xEE, 0x42, 0xB6, 0x9B, 0xC3, 0x38,
+               0x5F, 0xAD, 0x54, 0xDC, 0xA8, 0x32, 0x81, 0xDC,
+               0x7A, 0x6F, 0x85, 0x58, 0x07, 0x35, 0xED, 0xEB,
+               0xAD, 0x79, 0x79, 0x96, 0xD3, 0x0E, 0xA6, 0xD9,
+               0xAA, 0x86, 0xA4, 0x8F, 0xB5, 0xD6, 0x6E, 0x6D,
+               0x0C, 0x91, 0x2F, 0xC4, 0x67, 0x98, 0x0E, 0xC4,
+               0x8D, 0x83, 0x68, 0x69, 0xC4, 0xD3, 0x94, 0x34,
+               0xC4, 0x5D, 0x60, 0x55, 0x22, 0x87, 0x8F, 0x6F,
+               0x17, 0x8E, 0x75, 0xE4, 0x02, 0xF5, 0x1B, 0x99,
+               0xC8, 0x39, 0xA9, 0xAB, 0x23, 0x91, 0x12, 0xED,
+               0x08, 0xE7, 0xD9, 0x25, 0x89, 0x24, 0x4F, 0x8D,
+               0x68, 0xF3, 0x10, 0x39, 0x0A, 0xEE, 0x45, 0x24,
+               0xDF, 0x7A, 0x9D, 0x00, 0x25, 0xE5, 0x35, 0x71,
+               0x4E, 0x40, 0x59, 0x6F, 0x0A, 0x13, 0xB3, 0x72,
+               0x1D, 0x98, 0x63, 0x94, 0x89, 0xA5, 0x39, 0x8E,
+               0xD3, 0x9C, 0x8A, 0x7F, 0x71, 0x2F, 0xC7, 0xCD,
+               0x81, 0x05, 0xDC, 0xC0, 0x8D, 0xCE, 0x6D, 0x18,
+               0x30, 0xC4, 0x72, 0x51, 0xF0, 0x27, 0xC8, 0xF6,
+               0x60, 0x5B, 0x7C, 0xB2, 0xE3, 0x49, 0x0C, 0x29,
+               0xC6, 0x9F, 0x39, 0x57, 0x80, 0x55, 0x24, 0x2C,
+               0x9B, 0x0F, 0x5A, 0xB3, 0x89, 0x55, 0x31, 0x96,
+               0x0D, 0xCD, 0xF6, 0x51, 0x03, 0x2D, 0x89, 0x26,
+               0x74, 0x44, 0xD6, 0xE8, 0xDC, 0xEA, 0x44, 0x55,
+               0x64, 0x71, 0x9C, 0x9F, 0x5D, 0xBA, 0x39, 0x46,
+               0xA8, 0x17, 0xA1, 0x9C, 0x52, 0x9D, 0xBC, 0x6B,
+               0x4A, 0x98, 0xE6, 0xEA, 0x33, 0xEC, 0x58, 0xB4,
+               0x43, 0xF0, 0x32, 0x45, 0xA4, 0xC1, 0x55, 0xB7,
+               0x5D, 0xB5, 0x59, 0xB2, 0xE3, 0x96, 0xFF, 0xA5,
+               0xAF, 0xE1, 0x86, 0x1B, 0x42, 0xE6, 0x3B, 0xA0,
+               0x90, 0x4A, 0xE8, 0x8C, 0x21, 0x7F, 0x36, 0x1E,
+               0x5B, 0x65, 0x25, 0xD1, 0xC1, 0x5A, 0xCA, 0x3D,
+               0x10, 0xED, 0x2D, 0x79, 0xD0, 0x0F, 0x58, 0x44,
+               0x69, 0x81, 0xF5, 0xD4, 0xC9, 0x0F, 0x90, 0x76,
+               0x1F, 0x54, 0xD2, 0xD5, 0x97, 0xCE, 0x2C, 0xE3,
+               0xEF, 0xF4, 0xB7, 0xC6, 0x3A, 0x87, 0x7F, 0x83,
+               0x2A, 0xAF, 0xCD, 0x90, 0x12, 0xA7, 0x7D, 0x85,
+               0x1D, 0x62, 0xD3, 0x85, 0x25, 0x05, 0xDB, 0x45,
+               0x92, 0xA3, 0xF6, 0xA2, 0xA8, 0x41, 0xE4, 0x25,
+               0x86, 0x87, 0x67, 0x24, 0xEC, 0x89, 0x23, 0x2A,
+               0x9B, 0x20, 0x4D, 0x93, 0xEE, 0xE2, 0x2E, 0xC1,
+               0x0B, 0x15, 0x33, 0xCF, 0x00, 0xD1, 0x1A, 0xDA,
+               0x93, 0xFD, 0x28, 0x21, 0x5B, 0xCF, 0xD1, 0xF3,
+               0x5A, 0x81, 0xBA, 0x82, 0x5E, 0x2F, 0x61, 0xB4,
+               0x05, 0x71, 0xB5, 0xF4, 0x39, 0x3C, 0x1F, 0x60,
+               0x00, 0x7A, 0xC4, 0xF8, 0x35, 0x20, 0x6C, 0x3A,
+               0xCC, 0x03, 0x8F, 0x7B, 0xA2, 0xB6, 0x65, 0x8A,
+               0xB6, 0x5F, 0xFD, 0x25, 0xD3, 0x5F, 0x92, 0xF9,
+               0xAE, 0x17, 0x9B, 0x5E, 0x6E, 0x9A, 0xE4, 0x55,
+               0x10, 0x25, 0x07, 0xA4, 0xAF, 0x21, 0x69, 0x13,
+               0xD8, 0xFA, 0x31, 0xED, 0xF7, 0xA7, 0xA7, 0x3B,
+               0xB8, 0x96, 0x8E, 0x10, 0x86, 0x74, 0xD8, 0xB1,
+               0x34, 0x9E, 0x9B, 0x6A, 0x26, 0xA8, 0xD4, 0xD0,
+               0xB5, 0xF6, 0xDE, 0xE7, 0xCA, 0x06, 0xDC, 0xA3,
+               0x6F, 0xEE, 0x6B, 0x1E, 0xB5, 0x30, 0x99, 0x23,
+               0xF9, 0x76, 0xF0, 0xA0, 0xCF, 0x3B, 0x94, 0x7B,
+               0x19, 0x8D, 0xA5, 0x0C, 0x18, 0xA6, 0x1D, 0x07,
+               0x89, 0xBE, 0x5B, 0x61, 0xE5, 0xF1, 0x42, 0xDB,
+               0xD4, 0x2E, 0x02, 0x1F, 0xCE, 0xEF, 0x92, 0xB1,
+               0x1B, 0x56, 0x50, 0xF2, 0x16, 0xE5, 0xE7, 0x4F,
+               0xFD, 0xBB, 0x3E, 0xD2, 0xFC, 0x3C, 0xC6, 0x0F,
+               0xF9, 0x12, 0x4E, 0xCB, 0x1E, 0x0C, 0x15, 0x84,
+               0x2A, 0x14, 0x8A, 0x02, 0xE4, 0x7E, 0x95, 0x5B,
+               0x86, 0xDB, 0x9B, 0x62, 0x5B, 0x19, 0xD2, 0x17,
+               0xFA, 0x13, 0xBB, 0x6B, 0x3F, 0x45, 0x9F, 0xBF
+};
 
-       if (status == -ENOTSUP)
-               return status;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+static  uint8_t ms_hmac_key0[] = {
+               0xFF, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
+               0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
+               0x58, 0x34, 0x85, 0x65, 0x1C, 0x42, 0x50, 0x76,
+               0x9A, 0xAF, 0x88, 0x1B, 0xB6, 0x8F, 0xF8, 0x60,
+               0xA2, 0x5A, 0x7F, 0x3F, 0xF4, 0x72, 0x70, 0xF1,
+               0xF5, 0x35, 0x4C, 0x3B, 0xDD, 0x90, 0x65, 0xB0,
+               0x47, 0x3A, 0x75, 0x61, 0x5C, 0xA2, 0x10, 0x76,
+               0x9A, 0xAF, 0x77, 0x5B, 0xB6, 0x7F, 0xF7, 0x60
+};
 
-       return TEST_SUCCESS;
-}
+static const uint8_t ms_hmac_digest0[] = {
+               0x43, 0x52, 0xED, 0x34, 0xAB, 0x36, 0xB2, 0x51,
+               0xFB, 0xA3, 0xA6, 0x7C, 0x38, 0xFC, 0x42, 0x8F,
+               0x57, 0x64, 0xAB, 0x81, 0xA7, 0x89, 0xB7, 0x6C,
+               0xA0, 0xDC, 0xB9, 0x4D, 0xC4, 0x30, 0xF9, 0xD4,
+               0x10, 0x82, 0x55, 0xD0, 0xAB, 0x32, 0xFB, 0x56,
+               0x0D, 0xE4, 0x68, 0x3D, 0x76, 0xD0, 0x7B, 0xE4,
+               0xA6, 0x2C, 0x34, 0x9E, 0x8C, 0x41, 0xF8, 0x23,
+               0x28, 0x1B, 0x3A, 0x90, 0x26, 0x34, 0x47, 0x90
+               };
 
-static int
-test_AES_cipheronly_all(void)
-{
-       return test_blockcipher(BLKCIPHER_AES_CIPHERONLY_TYPE);
-}
+/* End Session 0 */
+/* Begin session 1 */
 
-static int
-test_AES_docsis_all(void)
-{
-       return test_blockcipher(BLKCIPHER_AES_DOCSIS_TYPE);
-}
+static  uint8_t ms_aes_cbc_key1[] = {
+               0xf1, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+               0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
 
-static int
-test_DES_docsis_all(void)
-{
-       return test_blockcipher(BLKCIPHER_DES_DOCSIS_TYPE);
-}
+static  uint8_t ms_aes_cbc_iv1[] = {
+       0xf1, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
 
-static int
-test_DES_cipheronly_all(void)
-{
-       return test_blockcipher(BLKCIPHER_DES_CIPHERONLY_TYPE);
-}
-
-static int
-test_authonly_all(void)
-{
-       return test_blockcipher(BLKCIPHER_AUTHONLY_TYPE);
-}
-
-static int
-test_AES_chain_all(void)
-{
-       return test_blockcipher(BLKCIPHER_AES_CHAIN_TYPE);
-}
+static const uint8_t ms_aes_cbc_cipher1[] = {
+               0x5A, 0x7A, 0x67, 0x5D, 0xB8, 0xE1, 0xDC, 0x71,
+               0x39, 0xA8, 0x74, 0x93, 0x9C, 0x4C, 0xFE, 0x23,
+               0x61, 0xCD, 0xA4, 0xB3, 0xD9, 0xCE, 0x99, 0x09,
+               0x2A, 0x23, 0xF3, 0x29, 0xBF, 0x4C, 0xB4, 0x6A,
+               0x1B, 0x6B, 0x73, 0x4D, 0x48, 0x0C, 0xCF, 0x6C,
+               0x5E, 0x34, 0x9E, 0x7F, 0xBC, 0x8F, 0xCC, 0x8F,
+               0x75, 0x1D, 0x3D, 0x77, 0x10, 0x76, 0xC8, 0xB9,
+               0x99, 0x6F, 0xD6, 0x56, 0x75, 0xA9, 0xB2, 0x66,
+               0xC2, 0x24, 0x2B, 0x9C, 0xFE, 0x40, 0x8E, 0x43,
+               0x20, 0x97, 0x1B, 0xFA, 0xD0, 0xCF, 0x04, 0xAB,
+               0xBB, 0xF6, 0x5D, 0xF5, 0xA0, 0x19, 0x7C, 0x23,
+               0x5D, 0x80, 0x8C, 0x49, 0xF6, 0x76, 0x88, 0x29,
+               0x27, 0x4C, 0x59, 0x2B, 0x43, 0xA6, 0xB2, 0x26,
+               0x27, 0x78, 0xBE, 0x1B, 0xE1, 0x4F, 0x5A, 0x1F,
+               0xFC, 0x68, 0x08, 0xE7, 0xC4, 0xD1, 0x34, 0x68,
+               0xB7, 0x13, 0x14, 0x41, 0x62, 0x6B, 0x1F, 0x77,
+               0x0C, 0x68, 0x1D, 0x0D, 0xED, 0x89, 0xAA, 0xD8,
+               0x97, 0x02, 0xBA, 0x5E, 0xD4, 0x84, 0x25, 0x97,
+               0x03, 0xA5, 0xA6, 0x13, 0x66, 0x02, 0xF4, 0xC3,
+               0xF3, 0xD3, 0xCC, 0x95, 0xC3, 0x87, 0x46, 0x90,
+               0x1F, 0x6E, 0x14, 0xA8, 0x00, 0xF2, 0x6F, 0xD5,
+               0xA1, 0xAD, 0xD5, 0x40, 0xA2, 0x0F, 0x32, 0x7E,
+               0x99, 0xA3, 0xF5, 0x53, 0xC3, 0x26, 0xA1, 0x45,
+               0x01, 0x88, 0x57, 0x84, 0x3E, 0x7B, 0x4E, 0x0B,
+               0x3C, 0xB5, 0x3E, 0x9E, 0xE9, 0x78, 0x77, 0xC5,
+               0xC0, 0x89, 0xA8, 0xF8, 0xF1, 0xA5, 0x2D, 0x5D,
+               0xF9, 0xC6, 0xFB, 0xCB, 0x05, 0x23, 0xBD, 0x6E,
+               0x5E, 0x14, 0xC6, 0x57, 0x73, 0xCF, 0x98, 0xBD,
+               0x10, 0x8B, 0x18, 0xA6, 0x01, 0x5B, 0x13, 0xAE,
+               0x8E, 0xDE, 0x1F, 0xB5, 0xB7, 0x40, 0x6C, 0xC1,
+               0x1E, 0xA1, 0x19, 0x20, 0x9E, 0x95, 0xE0, 0x2F,
+               0x1C, 0xF5, 0xD9, 0xD0, 0x2B, 0x1E, 0x82, 0x25,
+               0x62, 0xB4, 0xEB, 0xA1, 0x1F, 0xCE, 0x44, 0xA1,
+               0xCB, 0x92, 0x01, 0x6B, 0xE4, 0x26, 0x23, 0xE3,
+               0xC5, 0x67, 0x35, 0x55, 0xDA, 0xE5, 0x27, 0xEE,
+               0x8D, 0x12, 0x84, 0xB7, 0xBA, 0xA7, 0x1C, 0xD6,
+               0x32, 0x3F, 0x67, 0xED, 0xFB, 0x5B, 0x8B, 0x52,
+               0x46, 0x8C, 0xF9, 0x69, 0xCD, 0xAE, 0x79, 0xAA,
+               0x37, 0x78, 0x49, 0xEB, 0xC6, 0x8E, 0x76, 0x63,
+               0x84, 0xFF, 0x9D, 0x22, 0x99, 0x51, 0xB7, 0x5E,
+               0x83, 0x4C, 0x8B, 0xDF, 0x5A, 0x07, 0xCC, 0xBA,
+               0x42, 0xA5, 0x98, 0xB6, 0x47, 0x0E, 0x66, 0xEB,
+               0x23, 0x0E, 0xBA, 0x44, 0xA8, 0xAA, 0x20, 0x71,
+               0x79, 0x9C, 0x77, 0x5F, 0xF5, 0xFE, 0xEC, 0xEF,
+               0xC6, 0x64, 0x3D, 0x84, 0xD0, 0x2B, 0xA7, 0x0A,
+               0xC3, 0x72, 0x5B, 0x9C, 0xFA, 0xA8, 0x87, 0x95,
+               0x94, 0x11, 0x38, 0xA7, 0x1E, 0x58, 0xE3, 0x73,
+               0xC6, 0xC9, 0xD1, 0x7B, 0x92, 0xDB, 0x0F, 0x49,
+               0x74, 0xC2, 0xA2, 0x0E, 0x35, 0x57, 0xAC, 0xDB,
+               0x9A, 0x1C, 0xCF, 0x5A, 0x32, 0x3E, 0x26, 0x9B,
+               0xEC, 0xB3, 0xEF, 0x9C, 0xFE, 0xBE, 0x52, 0xAC,
+               0xB1, 0x29, 0xDD, 0xFD, 0x07, 0xE2, 0xEE, 0xED,
+               0xE4, 0x46, 0x37, 0xFE, 0xD1, 0xDC, 0xCD, 0x02,
+               0xF9, 0x31, 0xB0, 0xFB, 0x36, 0xB7, 0x34, 0xA4,
+               0x76, 0xE8, 0x57, 0xBF, 0x99, 0x92, 0xC7, 0xAF,
+               0x98, 0x10, 0xE2, 0x70, 0xCA, 0xC9, 0x2B, 0x82,
+               0x06, 0x96, 0x88, 0x0D, 0xB3, 0xAC, 0x9E, 0x6D,
+               0x43, 0xBC, 0x5B, 0x31, 0xCF, 0x65, 0x8D, 0xA6,
+               0xC7, 0xFE, 0x73, 0xE1, 0x54, 0xF7, 0x10, 0xF9,
+               0x86, 0xF7, 0xDF, 0xA1, 0xA1, 0xD8, 0xAE, 0x35,
+               0xB3, 0x90, 0xDC, 0x6F, 0x43, 0x7A, 0x8B, 0xE0,
+               0xFE, 0x8F, 0x33, 0x4D, 0x29, 0x6C, 0x45, 0x53,
+               0x73, 0xDD, 0x21, 0x0B, 0x85, 0x30, 0xB5, 0xA5,
+               0xF3, 0x5D, 0xEC, 0x79, 0x61, 0x9D, 0x9E, 0xB3
 
-static int
-test_3DES_chain_all(void)
-{
-       return test_blockcipher(BLKCIPHER_3DES_CHAIN_TYPE);
-}
+};
 
-static int
-test_3DES_cipheronly_all(void)
-{
-       return test_blockcipher(BLKCIPHER_3DES_CIPHERONLY_TYPE);
-}
+static uint8_t ms_hmac_key1[] = {
+               0xFE, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
+               0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
+               0x58, 0x34, 0x85, 0x65, 0x1C, 0x42, 0x50, 0x76,
+               0x9A, 0xAF, 0x88, 0x1B, 0xB6, 0x8F, 0xF8, 0x60,
+               0xA2, 0x5A, 0x7F, 0x3F, 0xF4, 0x72, 0x70, 0xF1,
+               0xF5, 0x35, 0x4C, 0x3B, 0xDD, 0x90, 0x65, 0xB0,
+               0x47, 0x3A, 0x75, 0x61, 0x5C, 0xA2, 0x10, 0x76,
+               0x9A, 0xAF, 0x77, 0x5B, 0xB6, 0x7F, 0xF7, 0x60
+};
 
-/* ***** SNOW 3G Tests ***** */
-static int
-create_wireless_algo_hash_session(uint8_t dev_id,
-       const uint8_t *key, const uint8_t key_len,
-       const uint8_t iv_len, const uint8_t auth_len,
-       enum rte_crypto_auth_operation op,
-       enum rte_crypto_auth_algorithm algo)
-{
-       uint8_t hash_key[key_len];
-       int status;
+static const uint8_t ms_hmac_digest1[] = {
+               0xCE, 0x6E, 0x5F, 0x77, 0x96, 0x9A, 0xB1, 0x69,
+               0x2D, 0x5E, 0xF3, 0x2F, 0x32, 0x10, 0xCB, 0x50,
+               0x0E, 0x09, 0x56, 0x25, 0x07, 0x34, 0xC9, 0x20,
+               0xEC, 0x13, 0x43, 0x23, 0x5C, 0x08, 0x8B, 0xCD,
+               0xDC, 0x86, 0x8C, 0xEE, 0x0A, 0x95, 0x2E, 0xB9,
+               0x8C, 0x7B, 0x02, 0x7A, 0xD4, 0xE1, 0x49, 0xB4,
+               0x45, 0xB5, 0x52, 0x37, 0xC6, 0xFF, 0xFE, 0xAA,
+               0x0A, 0x87, 0xB8, 0x51, 0xF9, 0x2A, 0x01, 0x8F
+};
+/* End Session 1  */
+/* Begin Session 2 */
+static  uint8_t ms_aes_cbc_key2[] = {
+               0xff, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+               0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
 
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+static  uint8_t ms_aes_cbc_iv2[] = {
+               0xff, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+               0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
 
-       memcpy(hash_key, key, key_len);
+static const uint8_t ms_aes_cbc_cipher2[] = {
+               0xBB, 0x3C, 0x68, 0x25, 0xFD, 0xB6, 0xA2, 0x91,
+               0x20, 0x56, 0xF6, 0x30, 0x35, 0xFC, 0x9E, 0x97,
+               0xF2, 0x90, 0xFC, 0x7E, 0x3E, 0x0A, 0x75, 0xC8,
+               0x4C, 0xF2, 0x2D, 0xAC, 0xD3, 0x93, 0xF0, 0xC5,
+               0x14, 0x88, 0x8A, 0x23, 0xC2, 0x59, 0x9A, 0x98,
+               0x4B, 0xD5, 0x2C, 0xDA, 0x43, 0xA9, 0x34, 0x69,
+               0x7C, 0x6D, 0xDB, 0xDC, 0xCB, 0xC0, 0xA0, 0x09,
+               0xA7, 0x86, 0x16, 0x4B, 0xBF, 0xA8, 0xB6, 0xCF,
+               0x7F, 0x74, 0x1F, 0x22, 0xF0, 0xF6, 0xBB, 0x44,
+               0x8B, 0x4C, 0x9E, 0x23, 0xF8, 0x9F, 0xFC, 0x5B,
+               0x9E, 0x9C, 0x2A, 0x79, 0x30, 0x8F, 0xBF, 0xA9,
+               0x68, 0xA1, 0x20, 0x71, 0x7C, 0x77, 0x22, 0x34,
+               0x07, 0xCD, 0xC6, 0xF6, 0x50, 0x0A, 0x08, 0x99,
+               0x17, 0x98, 0xE3, 0x93, 0x8A, 0xB0, 0xEE, 0xDF,
+               0xC2, 0xBA, 0x3B, 0x44, 0x73, 0xDF, 0xDD, 0xDC,
+               0x14, 0x4D, 0x3B, 0xBB, 0x5E, 0x58, 0xC1, 0x26,
+               0xA7, 0xAE, 0x47, 0xF3, 0x24, 0x6D, 0x4F, 0xD3,
+               0x6E, 0x3E, 0x33, 0xE6, 0x7F, 0xCA, 0x50, 0xAF,
+               0x5D, 0x3D, 0xA0, 0xDD, 0xC9, 0xF3, 0x30, 0xD3,
+               0x6E, 0x8B, 0x2E, 0x12, 0x24, 0x34, 0xF0, 0xD3,
+               0xC7, 0x8D, 0x23, 0x29, 0xAA, 0x05, 0xE1, 0xFA,
+               0x2E, 0xF6, 0x8D, 0x37, 0x86, 0xC0, 0x6D, 0x13,
+               0x2D, 0x98, 0xF3, 0x52, 0x39, 0x22, 0xCE, 0x38,
+               0xC2, 0x1A, 0x72, 0xED, 0xFB, 0xCC, 0xE4, 0x71,
+               0x5A, 0x0C, 0x0D, 0x09, 0xF8, 0xE8, 0x1B, 0xBC,
+               0x53, 0xC8, 0xD8, 0x8F, 0xE5, 0x98, 0x5A, 0xB1,
+               0x06, 0xA6, 0x5B, 0xE6, 0xA2, 0x88, 0x21, 0x9E,
+               0x36, 0xC0, 0x34, 0xF9, 0xFB, 0x3B, 0x0A, 0x22,
+               0x00, 0x00, 0x39, 0x48, 0x8D, 0x23, 0x74, 0x62,
+               0x72, 0x91, 0xE6, 0x36, 0xAA, 0x77, 0x9C, 0x72,
+               0x9D, 0xA8, 0xC3, 0xA9, 0xD5, 0x44, 0x72, 0xA6,
+               0xB9, 0x28, 0x8F, 0x64, 0x4C, 0x8A, 0x64, 0xE6,
+               0x4E, 0xFA, 0xEF, 0x87, 0xDE, 0x7B, 0x22, 0x44,
+               0xB0, 0xDF, 0x2E, 0x5F, 0x0B, 0xA5, 0xF2, 0x24,
+               0x07, 0x5C, 0x2D, 0x39, 0xB7, 0x3D, 0x8A, 0xE5,
+               0x0E, 0x9D, 0x4E, 0x50, 0xED, 0x03, 0x99, 0x8E,
+               0xF0, 0x06, 0x55, 0x4E, 0xA2, 0x24, 0xE7, 0x17,
+               0x46, 0xDF, 0x6C, 0xCD, 0xC6, 0x44, 0xE8, 0xF9,
+               0xB9, 0x1B, 0x36, 0xF6, 0x7F, 0x10, 0xA4, 0x7D,
+               0x90, 0xBD, 0xE4, 0xAA, 0xD6, 0x9E, 0x18, 0x9D,
+               0x22, 0x35, 0xD6, 0x55, 0x54, 0xAA, 0xF7, 0x22,
+               0xA3, 0x3E, 0xEF, 0xC8, 0xA2, 0x34, 0x8D, 0xA9,
+               0x37, 0x63, 0xA6, 0xC3, 0x57, 0xCB, 0x0C, 0x49,
+               0x7D, 0x02, 0xBE, 0xAA, 0x13, 0x75, 0xB7, 0x4E,
+               0x52, 0x62, 0xA5, 0xC2, 0x33, 0xC7, 0x6C, 0x1B,
+               0xF6, 0x34, 0xF6, 0x09, 0xA5, 0x0C, 0xC7, 0xA2,
+               0x61, 0x48, 0x62, 0x7D, 0x17, 0x15, 0xE3, 0x95,
+               0xC8, 0x63, 0xD2, 0xA4, 0x43, 0xA9, 0x49, 0x07,
+               0xB2, 0x3B, 0x2B, 0x62, 0x7D, 0xCB, 0x51, 0xB3,
+               0x25, 0x33, 0x47, 0x0E, 0x14, 0x67, 0xDC, 0x6A,
+               0x9B, 0x51, 0xAC, 0x9D, 0x8F, 0xA2, 0x2B, 0x57,
+               0x8C, 0x5C, 0x5F, 0x76, 0x23, 0x92, 0x0F, 0x84,
+               0x46, 0x0E, 0x40, 0x85, 0x38, 0x60, 0xFA, 0x61,
+               0x20, 0xC5, 0xE3, 0xF1, 0x70, 0xAC, 0x1B, 0xBF,
+               0xC4, 0x2B, 0xC5, 0x67, 0xD1, 0x43, 0xC5, 0x17,
+               0x74, 0x71, 0x69, 0x6F, 0x82, 0x89, 0x19, 0x8A,
+               0x70, 0x43, 0x92, 0x01, 0xC4, 0x63, 0x7E, 0xB1,
+               0x59, 0x4E, 0xCD, 0xEA, 0x93, 0xA4, 0x52, 0x53,
+               0x9B, 0x61, 0x5B, 0xD2, 0x3E, 0x19, 0x39, 0xB7,
+               0x32, 0xEA, 0x8E, 0xF8, 0x1D, 0x76, 0x5C, 0xB2,
+               0x73, 0x2D, 0x91, 0xC0, 0x18, 0xED, 0x25, 0x2A,
+               0x53, 0x64, 0xF0, 0x92, 0x31, 0x55, 0x21, 0xA8,
+               0x24, 0xA9, 0xD1, 0x02, 0xF6, 0x6C, 0x2B, 0x70,
+               0xA9, 0x59, 0xC1, 0xD6, 0xC3, 0x57, 0x5B, 0x92
+};
 
-       debug_hexdump(stdout, "key:", key, key_len);
+static  uint8_t ms_hmac_key2[] = {
+               0xFC, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
+               0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
+               0x58, 0x34, 0x85, 0x65, 0x1C, 0x42, 0x50, 0x76,
+               0x9A, 0xAF, 0x88, 0x1B, 0xB6, 0x8F, 0xF8, 0x60,
+               0xA2, 0x5A, 0x7F, 0x3F, 0xF4, 0x72, 0x70, 0xF1,
+               0xF5, 0x35, 0x4C, 0x3B, 0xDD, 0x90, 0x65, 0xB0,
+               0x47, 0x3A, 0x75, 0x61, 0x5C, 0xA2, 0x10, 0x76,
+               0x9A, 0xAF, 0x77, 0x5B, 0xB6, 0x7F, 0xF7, 0x60
+};
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+static const uint8_t ms_hmac_digest2[] = {
+               0xA5, 0x0F, 0x9C, 0xFB, 0x08, 0x62, 0x59, 0xFF,
+               0x80, 0x2F, 0xEB, 0x4B, 0xE1, 0x46, 0x21, 0xD6,
+               0x02, 0x98, 0xF2, 0x8E, 0xF4, 0xEC, 0xD4, 0x77,
+               0x86, 0x4C, 0x31, 0x28, 0xC8, 0x25, 0x80, 0x27,
+               0x3A, 0x72, 0x5D, 0x6A, 0x56, 0x8A, 0xD3, 0x82,
+               0xB0, 0xEC, 0x31, 0x6D, 0x8B, 0x6B, 0xB4, 0x24,
+               0xE7, 0x62, 0xC1, 0x52, 0xBC, 0x14, 0x1B, 0x8E,
+               0xEC, 0x9A, 0xF1, 0x47, 0x80, 0xD2, 0xB0, 0x59
+};
 
-       ut_params->auth_xform.auth.op = op;
-       ut_params->auth_xform.auth.algo = algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       ut_params->auth_xform.auth.key.data = hash_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
-       ut_params->auth_xform.auth.iv.length = iv_len;
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+/* End Session 2 */
 
-       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_EQUAL(status, 0, "session init failed");
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
-}
 
 static int
-create_wireless_algo_cipher_session(uint8_t dev_id,
-                       enum rte_crypto_cipher_operation op,
-                       enum rte_crypto_cipher_algorithm algo,
-                       const uint8_t *key, const uint8_t key_len,
-                       uint8_t iv_len)
+test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
 {
-       uint8_t cipher_key[key_len];
-       int status;
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(cipher_key, key, key_len);
-
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return TEST_SKIPPED;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return TEST_SKIPPED;
 
-       ut_params->cipher_xform.cipher.algo = algo;
-       ut_params->cipher_xform.cipher.op = op;
-       ut_params->cipher_xform.cipher.key.data = cipher_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
+       /* Generate test mbuf data and space for digest */
+       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
+                       catch_22_quote, QUOTE_512_BYTES, 0);
+
+       ut_params->digest = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       DIGEST_BYTE_LENGTH_SHA1);
+       TEST_ASSERT_NOT_NULL(ut_params->digest, "no room to append digest");
+
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
+
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       ut_params->cipher_xform.cipher.key.data = aes_cbc_key;
+       ut_params->cipher_xform.cipher.key.length = CIPHER_KEY_LENGTH_AES_CBC;
        ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = iv_len;
+       ut_params->cipher_xform.cipher.iv.length = CIPHER_IV_LENGTH_AES_CBC;
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       /* Setup HMAC Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+
+       ut_params->auth_xform.next = NULL;
+
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
+       ut_params->auth_xform.auth.key.length = HMAC_KEY_LENGTH_SHA1;
+       ut_params->auth_xform.auth.key.data = hmac_sha1_key;
+       ut_params->auth_xform.auth.digest_length = DIGEST_BYTE_LENGTH_SHA1;
 
-       /* Create Crypto session */
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
-       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform,
+       /* Create crypto session*/
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->cipher_xform,
                        ts_params->session_priv_mpool);
-       TEST_ASSERT_EQUAL(status, 0, "session init failed");
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
-}
-
-static int
-create_wireless_algo_cipher_operation(const uint8_t *iv, uint8_t iv_len,
-                       unsigned int cipher_len,
-                       unsigned int cipher_offset)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       /* Generate Crypto op data structure */
+       /* Generate crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        TEST_ASSERT_NOT_NULL(ut_params->op,
-                               "Failed to allocate pktmbuf offload");
+                       "Failed to allocate symmetric crypto operation struct");
 
-       /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
        struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
@@ -1881,261 +2116,303 @@ create_wireless_algo_cipher_operation(const uint8_t *iv, uint8_t iv_len,
        /* set crypto operation source mbuf */
        sym_op->m_src = ut_params->ibuf;
 
-       /* iv */
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       iv, iv_len);
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = cipher_offset;
-       return 0;
-}
-
-static int
-create_wireless_algo_cipher_operation_oop(const uint8_t *iv, uint8_t iv_len,
-                       unsigned int cipher_len,
-                       unsigned int cipher_offset)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                               "Failed to allocate pktmbuf offload");
+       /* Set crypto operation authentication parameters */
+       sym_op->auth.digest.data = ut_params->digest;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, QUOTE_512_BYTES);
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       sym_op->auth.data.offset = 0;
+       sym_op->auth.data.length = QUOTE_512_BYTES;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       /* Copy IV at the end of the crypto operation */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       aes_cbc_iv, CIPHER_IV_LENGTH_AES_CBC);
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
-       sym_op->m_dst = ut_params->obuf;
+       /* Set crypto operation cipher parameters */
+       sym_op->cipher.data.offset = 0;
+       sym_op->cipher.data.length = QUOTE_512_BYTES;
 
-       /* iv */
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       iv, iv_len);
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = cipher_offset;
-       return 0;
-}
+       /* Process crypto operation */
+       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");
 
-static int
-create_wireless_algo_cipher_auth_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const uint8_t *key, uint8_t key_len,
-               uint8_t auth_iv_len, uint8_t auth_len,
-               uint8_t cipher_iv_len)
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
-{
-       uint8_t cipher_auth_key[key_len];
-       int status;
+       /* Validate obuf */
+       uint8_t *ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_src,
+                       uint8_t *);
 
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(ciphertext,
+                       catch_22_quote_2_512_bytes_AES_CBC_ciphertext,
+                       QUOTE_512_BYTES,
+                       "ciphertext data not as expected");
 
-       memcpy(cipher_auth_key, key, key_len);
+       uint8_t *digest = ciphertext + QUOTE_512_BYTES;
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(digest,
+                       catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA1_digest,
+                       gbl_driver_id == rte_cryptodev_driver_id_get(
+                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) ?
+                                       TRUNCATED_DIGEST_BYTE_LENGTH_SHA1 :
+                                       DIGEST_BYTE_LENGTH_SHA1,
+                       "Generated digest data not as expected");
 
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.auth.algo = auth_algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       /* Hash key = cipher key */
-       ut_params->auth_xform.auth.key.data = cipher_auth_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       /* Auth IV will be after cipher IV */
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
-       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+       return TEST_SUCCESS;
+}
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+/* ***** AES-CBC / HMAC-SHA512 Hash Tests ***** */
 
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+#define HMAC_KEY_LENGTH_SHA512  (DIGEST_BYTE_LENGTH_SHA512)
 
-       debug_hexdump(stdout, "key:", key, key_len);
+static uint8_t hmac_sha512_key[] = {
+       0x42, 0x1a, 0x7d, 0x3d, 0xf5, 0x82, 0x80, 0xf1,
+       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
+       0x58, 0x34, 0x85, 0x65, 0x1C, 0x42, 0x50, 0x76,
+       0x9a, 0xaf, 0x88, 0x1b, 0xb6, 0x8f, 0xf8, 0x60,
+       0xa2, 0x5a, 0x7f, 0x3f, 0xf4, 0x72, 0x70, 0xf1,
+       0xF5, 0x35, 0x4C, 0x3B, 0xDD, 0x90, 0x65, 0xB0,
+       0x47, 0x3a, 0x75, 0x61, 0x5C, 0xa2, 0x10, 0x76,
+       0x9a, 0xaf, 0x77, 0x5b, 0xb6, 0x7f, 0xf7, 0x60 };
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+static const uint8_t catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA512_digest[] = {
+       0x5D, 0x54, 0x66, 0xC1, 0x6E, 0xBC, 0x04, 0xB8,
+       0x46, 0xB8, 0x08, 0x6E, 0xE0, 0xF0, 0x43, 0x48,
+       0x37, 0x96, 0x9C, 0xC6, 0x9C, 0xC2, 0x1E, 0xE8,
+       0xF2, 0x0C, 0x0B, 0xEF, 0x86, 0xA2, 0xE3, 0x70,
+       0x95, 0xC8, 0xB3, 0x06, 0x47, 0xA9, 0x90, 0xE8,
+       0xA0, 0xC6, 0x72, 0x69, 0x05, 0xC0, 0x0D, 0x0E,
+       0x21, 0x96, 0x65, 0x93, 0x74, 0x43, 0x2A, 0x1D,
+       0x2E, 0xBF, 0xC2, 0xC2, 0xEE, 0xCC, 0x2F, 0x0A };
 
-       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");
-       return 0;
-}
 
 static int
-create_wireless_cipher_auth_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const struct wireless_test_data *tdata)
-{
-       const uint8_t key_len = tdata->key.len;
-       uint8_t cipher_auth_key[key_len];
-       int status;
-
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       const uint8_t *key = tdata->key.data;
-       const uint8_t auth_len = tdata->digest.len;
-       uint8_t cipher_iv_len = tdata->cipher_iv.len;
-       uint8_t auth_iv_len = tdata->auth_iv.len;
+test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(
+               struct crypto_unittest_params *ut_params,
+               uint8_t *cipher_key,
+               uint8_t *hmac_key);
 
-       memcpy(cipher_auth_key, key, key_len);
+static int
+test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
+               struct crypto_unittest_params *ut_params,
+               struct crypto_testsuite_params *ts_params,
+               const uint8_t *cipher,
+               const uint8_t *digest,
+               const uint8_t *iv);
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
 
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.auth.algo = auth_algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       /* Hash key = cipher key */
-       ut_params->auth_xform.auth.key.data = cipher_auth_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       /* Auth IV will be after cipher IV */
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
-       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+static int
+test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(
+               struct crypto_unittest_params *ut_params,
+               uint8_t *cipher_key,
+               uint8_t *hmac_key)
+{
 
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       ut_params->cipher_xform.next = NULL;
 
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = CIPHER_KEY_LENGTH_AES_CBC;
        ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
-
+       ut_params->cipher_xform.cipher.iv.length = CIPHER_IV_LENGTH_AES_CBC;
 
-       debug_hexdump(stdout, "key:", key, key_len);
-
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Setup HMAC Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = &ut_params->cipher_xform;
 
-       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
+       ut_params->auth_xform.auth.key.data = hmac_key;
+       ut_params->auth_xform.auth.key.length = HMAC_KEY_LENGTH_SHA512;
+       ut_params->auth_xform.auth.digest_length = DIGEST_BYTE_LENGTH_SHA512;
 
-       TEST_ASSERT_EQUAL(status, 0, "session init failed");
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
+       return TEST_SUCCESS;
 }
 
+
 static int
-create_zuc_cipher_auth_encrypt_generate_session(uint8_t dev_id,
-               const struct wireless_test_data *tdata)
+test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
+               struct crypto_unittest_params *ut_params,
+               struct crypto_testsuite_params *ts_params,
+               const uint8_t *cipher,
+               const uint8_t *digest,
+               const uint8_t *iv)
 {
-       return create_wireless_cipher_auth_session(dev_id,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_ZUC_EIA3,
-               RTE_CRYPTO_CIPHER_ZUC_EEA3, tdata);
+       /* Generate test mbuf data and digest */
+       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
+                       (const char *)
+                       cipher,
+                       QUOTE_512_BYTES, 0);
+
+       ut_params->digest = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       DIGEST_BYTE_LENGTH_SHA512);
+       TEST_ASSERT_NOT_NULL(ut_params->digest, "no room to append digest");
+
+       rte_memcpy(ut_params->digest,
+                       digest,
+                       DIGEST_BYTE_LENGTH_SHA512);
+
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate symmetric crypto operation struct");
+
+       rte_crypto_op_attach_sym_session(ut_params->op, sess);
+
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
+
+       sym_op->auth.digest.data = ut_params->digest;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, QUOTE_512_BYTES);
+
+       sym_op->auth.data.offset = 0;
+       sym_op->auth.data.length = QUOTE_512_BYTES;
+
+       /* Copy IV at the end of the crypto operation */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, CIPHER_IV_LENGTH_AES_CBC);
+
+       sym_op->cipher.data.offset = 0;
+       sym_op->cipher.data.length = QUOTE_512_BYTES;
+
+       /* Process crypto operation */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 0, 0);
+       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");
+
+       ut_params->obuf = ut_params->op->sym->m_src;
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       rte_pktmbuf_mtod(ut_params->obuf, uint8_t *),
+                       catch_22_quote,
+                       QUOTE_512_BYTES,
+                       "Plaintext data not as expected");
+
+       /* Validate obuf */
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "Digest verification failed");
+
+       return TEST_SUCCESS;
 }
 
+/* ***** SNOW 3G Tests ***** */
 static int
-create_wireless_algo_auth_cipher_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const uint8_t *key, const uint8_t key_len,
-               uint8_t auth_iv_len, uint8_t auth_len,
-               uint8_t cipher_iv_len)
+create_wireless_algo_hash_session(uint8_t dev_id,
+       const uint8_t *key, const uint8_t key_len,
+       const uint8_t iv_len, const uint8_t auth_len,
+       enum rte_crypto_auth_operation op,
+       enum rte_crypto_auth_algorithm algo)
 {
-       uint8_t auth_cipher_key[key_len];
+       uint8_t hash_key[key_len];
        int status;
+
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(auth_cipher_key, key, key_len);
+       memcpy(hash_key, key, key_len);
+
+       debug_hexdump(stdout, "key:", key, key_len);
 
        /* Setup Authentication Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
-       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.next = NULL;
+
+       ut_params->auth_xform.auth.op = op;
+       ut_params->auth_xform.auth.algo = algo;
        ut_params->auth_xform.auth.key.length = key_len;
-       ut_params->auth_xform.auth.key.data = auth_cipher_key;
+       ut_params->auth_xform.auth.key.data = hash_key;
        ut_params->auth_xform.auth.digest_length = auth_len;
-       /* Auth IV will be after cipher IV */
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
-       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+       ut_params->auth_xform.auth.iv.length = iv_len;
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       return 0;
+}
+
+static int
+create_wireless_algo_cipher_session(uint8_t dev_id,
+                       enum rte_crypto_cipher_operation op,
+                       enum rte_crypto_cipher_algorithm algo,
+                       const uint8_t *key, const uint8_t key_len,
+                       uint8_t iv_len)
+{
+       uint8_t cipher_key[key_len];
+       int status;
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       memcpy(cipher_key, key, key_len);
 
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.next = NULL;
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = auth_cipher_key;
+
+       ut_params->cipher_xform.cipher.algo = algo;
+       ut_params->cipher_xform.cipher.op = op;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
        ut_params->cipher_xform.cipher.key.length = key_len;
        ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+       ut_params->cipher_xform.cipher.iv.length = iv_len;
 
        debug_hexdump(stdout, "key:", key, key_len);
 
-       /* Create Crypto session*/
+       /* Create Crypto session */
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-
-       if (cipher_op == RTE_CRYPTO_CIPHER_OP_DECRYPT) {
-               ut_params->auth_xform.next = NULL;
-               ut_params->cipher_xform.next = &ut_params->auth_xform;
-               status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                               &ut_params->cipher_xform,
-                               ts_params->session_priv_mpool);
-
-       } else
-               status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                               &ut_params->auth_xform,
-                               ts_params->session_priv_mpool);
-
-       if (status == -ENOTSUP)
-               return status;
 
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
        TEST_ASSERT_EQUAL(status, 0, "session init failed");
-
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
 
 static int
-create_wireless_algo_hash_operation(const uint8_t *auth_tag,
-               unsigned int auth_tag_len,
-               const uint8_t *iv, unsigned int iv_len,
-               unsigned int data_pad_len,
-               enum rte_crypto_auth_operation op,
-               unsigned int auth_len, unsigned int auth_offset)
+create_wireless_algo_cipher_operation(const uint8_t *iv, uint8_t iv_len,
+                       unsigned int cipher_len,
+                       unsigned int cipher_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        /* Generate Crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        TEST_ASSERT_NOT_NULL(ut_params->op,
-               "Failed to allocate pktmbuf offload");
+                               "Failed to allocate pktmbuf offload");
 
        /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
@@ -2148,54 +2425,25 @@ create_wireless_algo_hash_operation(const uint8_t *auth_tag,
        /* iv */
        rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
                        iv, iv_len);
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                                       ut_params->ibuf, auth_tag_len);
-
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                               "no room to append auth tag");
-       ut_params->digest = sym_op->auth.digest.data;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, data_pad_len);
-       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
-               memset(sym_op->auth.digest.data, 0, auth_tag_len);
-       else
-               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
-
-       debug_hexdump(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
-
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = auth_offset;
-
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = cipher_offset;
        return 0;
 }
 
 static int
-create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
-       enum rte_crypto_auth_operation op)
+create_wireless_algo_cipher_operation_oop(const uint8_t *iv, uint8_t iv_len,
+                       unsigned int cipher_len,
+                       unsigned int cipher_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       const uint8_t *auth_tag = tdata->digest.data;
-       const unsigned int auth_tag_len = tdata->digest.len;
-       unsigned int plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       unsigned int data_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-
-       const uint8_t *cipher_iv = tdata->cipher_iv.data;
-       const uint8_t cipher_iv_len = tdata->cipher_iv.len;
-       const uint8_t *auth_iv = tdata->auth_iv.data;
-       const uint8_t auth_iv_len = tdata->auth_iv.len;
-       const unsigned int cipher_len = tdata->validCipherLenInBits.len;
-       const unsigned int auth_len = tdata->validAuthLenInBits.len;
-
        /* Generate Crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
+                               "Failed to allocate pktmbuf offload");
+
        /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
@@ -2203,71 +2451,235 @@ create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
 
        /* set crypto operation source mbuf */
        sym_op->m_src = ut_params->ibuf;
+       sym_op->m_dst = ut_params->obuf;
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+       /* iv */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, iv_len);
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = cipher_offset;
+       return 0;
+}
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
-       ut_params->digest = sym_op->auth.digest.data;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, data_pad_len);
-       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
-               memset(sym_op->auth.digest.data, 0, auth_tag_len);
-       else
-               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
+static int
+create_wireless_algo_cipher_auth_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
+               const uint8_t *key, uint8_t key_len,
+               uint8_t auth_iv_len, uint8_t auth_len,
+               uint8_t cipher_iv_len)
 
-       debug_hexdump(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+{
+       uint8_t cipher_auth_key[key_len];
+       int status;
 
-       /* Copy cipher and auth IVs at the end of the crypto operation */
-       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
-                                               IV_OFFSET);
-       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
-       iv_ptr += cipher_iv_len;
-       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = 0;
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = 0;
+       memcpy(cipher_auth_key, key, key_len);
+
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
+
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       /* Hash key = cipher key */
+       ut_params->auth_xform.auth.key.data = cipher_auth_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       /* Auth IV will be after cipher IV */
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
+       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
+
+       ut_params->cipher_xform.cipher.algo = cipher_algo;
+       ut_params->cipher_xform.cipher.op = cipher_op;
+       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+
+       debug_hexdump(stdout, "key:", key, key_len);
 
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       if (status == -ENOTSUP)
+               return TEST_SKIPPED;
+
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
        return 0;
 }
 
 static int
-create_zuc_cipher_hash_generate_operation(
+create_wireless_cipher_auth_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
                const struct wireless_test_data *tdata)
 {
-       return create_wireless_cipher_hash_operation(tdata,
-               RTE_CRYPTO_AUTH_OP_GENERATE);
+       const uint8_t key_len = tdata->key.len;
+       uint8_t cipher_auth_key[key_len];
+       int status;
+
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       const uint8_t *key = tdata->key.data;
+       const uint8_t auth_len = tdata->digest.len;
+       uint8_t cipher_iv_len = tdata->cipher_iv.len;
+       uint8_t auth_iv_len = tdata->auth_iv.len;
+
+       memcpy(cipher_auth_key, key, key_len);
+
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
+
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       /* Hash key = cipher key */
+       ut_params->auth_xform.auth.key.data = cipher_auth_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       /* Auth IV will be after cipher IV */
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
+       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
+
+       ut_params->cipher_xform.cipher.algo = cipher_algo;
+       ut_params->cipher_xform.cipher.op = cipher_op;
+       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+
+
+       debug_hexdump(stdout, "key:", key, key_len);
+
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       if (status == -ENOTSUP)
+               return TEST_SKIPPED;
+
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       return 0;
 }
 
 static int
-create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
-               const unsigned auth_tag_len,
-               const uint8_t *auth_iv, uint8_t auth_iv_len,
-               unsigned data_pad_len,
-               enum rte_crypto_auth_operation op,
-               const uint8_t *cipher_iv, uint8_t cipher_iv_len,
-               const unsigned cipher_len, const unsigned cipher_offset,
-               const unsigned auth_len, const unsigned auth_offset)
+create_zuc_cipher_auth_encrypt_generate_session(uint8_t dev_id,
+               const struct wireless_test_data *tdata)
+{
+       return create_wireless_cipher_auth_session(dev_id,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_ZUC_EIA3,
+               RTE_CRYPTO_CIPHER_ZUC_EEA3, tdata);
+}
+
+static int
+create_wireless_algo_auth_cipher_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
+               const uint8_t *key, const uint8_t key_len,
+               uint8_t auth_iv_len, uint8_t auth_len,
+               uint8_t cipher_iv_len)
 {
+       uint8_t auth_cipher_key[key_len];
+       int status;
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       enum rte_crypto_cipher_algorithm cipher_algo =
-                       ut_params->cipher_xform.cipher.algo;
-       enum rte_crypto_auth_algorithm auth_algo =
-                       ut_params->auth_xform.auth.algo;
+       memcpy(auth_cipher_key, key, key_len);
+
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.next = &ut_params->cipher_xform;
+       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       ut_params->auth_xform.auth.key.data = auth_cipher_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       /* Auth IV will be after cipher IV */
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
+       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
+       ut_params->cipher_xform.cipher.algo = cipher_algo;
+       ut_params->cipher_xform.cipher.op = cipher_op;
+       ut_params->cipher_xform.cipher.key.data = auth_cipher_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+
+       debug_hexdump(stdout, "key:", key, key_len);
+
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+
+       if (cipher_op == RTE_CRYPTO_CIPHER_OP_DECRYPT) {
+               ut_params->auth_xform.next = NULL;
+               ut_params->cipher_xform.next = &ut_params->auth_xform;
+               status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->cipher_xform,
+                               ts_params->session_priv_mpool);
+
+       } else
+               status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
+
+       if (status == -ENOTSUP)
+               return TEST_SKIPPED;
+
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+
+       return 0;
+}
+
+static int
+create_wireless_algo_hash_operation(const uint8_t *auth_tag,
+               unsigned int auth_tag_len,
+               const uint8_t *iv, unsigned int iv_len,
+               unsigned int data_pad_len,
+               enum rte_crypto_auth_operation op,
+               unsigned int auth_len, unsigned int auth_offset)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
        /* Generate Crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
                        RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
+               "Failed to allocate pktmbuf offload");
+
        /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
@@ -2276,22 +2688,153 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
        /* set crypto operation source mbuf */
        sym_op->m_src = ut_params->ibuf;
 
+       /* iv */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, iv_len);
        /* digest */
        sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+                                       ut_params->ibuf, auth_tag_len);
 
        TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
+                               "no room to append auth tag");
        ut_params->digest = sym_op->auth.digest.data;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, data_pad_len);
+       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       else
+               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-       if (rte_pktmbuf_is_contiguous(ut_params->ibuf)) {
-               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                               ut_params->ibuf, data_pad_len);
-       } else {
-               struct rte_mbuf *m = ut_params->ibuf;
-               unsigned int offset = data_pad_len;
-
-               while (offset > m->data_len && m->next != NULL) {
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
+
+       sym_op->auth.data.length = auth_len;
+       sym_op->auth.data.offset = auth_offset;
+
+       return 0;
+}
+
+static int
+create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
+       enum rte_crypto_auth_operation op)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       const uint8_t *auth_tag = tdata->digest.data;
+       const unsigned int auth_tag_len = tdata->digest.len;
+       unsigned int plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       unsigned int data_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+
+       const uint8_t *cipher_iv = tdata->cipher_iv.data;
+       const uint8_t cipher_iv_len = tdata->cipher_iv.len;
+       const uint8_t *auth_iv = tdata->auth_iv.data;
+       const uint8_t auth_iv_len = tdata->auth_iv.len;
+       const unsigned int cipher_len = tdata->validCipherLenInBits.len;
+       const unsigned int auth_len = tdata->validAuthLenInBits.len;
+
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
+
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, auth_tag_len);
+
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
+       ut_params->digest = sym_op->auth.digest.data;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, data_pad_len);
+       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       else
+               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
+
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
+
+       /* Copy cipher and auth IVs at the end of the crypto operation */
+       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
+                                               IV_OFFSET);
+       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
+       iv_ptr += cipher_iv_len;
+       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
+
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = 0;
+       sym_op->auth.data.length = auth_len;
+       sym_op->auth.data.offset = 0;
+
+       return 0;
+}
+
+static int
+create_zuc_cipher_hash_generate_operation(
+               const struct wireless_test_data *tdata)
+{
+       return create_wireless_cipher_hash_operation(tdata,
+               RTE_CRYPTO_AUTH_OP_GENERATE);
+}
+
+static int
+create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
+               const unsigned auth_tag_len,
+               const uint8_t *auth_iv, uint8_t auth_iv_len,
+               unsigned data_pad_len,
+               enum rte_crypto_auth_operation op,
+               const uint8_t *cipher_iv, uint8_t cipher_iv_len,
+               const unsigned cipher_len, const unsigned cipher_offset,
+               const unsigned auth_len, const unsigned auth_offset)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       enum rte_crypto_cipher_algorithm cipher_algo =
+                       ut_params->cipher_xform.cipher.algo;
+       enum rte_crypto_auth_algorithm auth_algo =
+                       ut_params->auth_xform.auth.algo;
+
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
+
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, auth_tag_len);
+
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
+       ut_params->digest = sym_op->auth.digest.data;
+
+       if (rte_pktmbuf_is_contiguous(ut_params->ibuf)) {
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                               ut_params->ibuf, data_pad_len);
+       } else {
+               struct rte_mbuf *m = ut_params->ibuf;
+               unsigned int offset = data_pad_len;
+
+               while (offset > m->data_len && m->next != NULL) {
                        offset -= m->data_len;
                        m = m->next;
                }
@@ -2415,6 +2958,21 @@ create_wireless_algo_auth_cipher_operation(
        iv_ptr += cipher_iv_len;
        rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
 
+       /* Only copy over the offset data needed from src to dst in OOP,
+        * if the auth and cipher offsets are not aligned
+        */
+       if (op_mode == OUT_OF_PLACE) {
+               if (cipher_offset > auth_offset)
+                       rte_memcpy(
+                               rte_pktmbuf_mtod_offset(
+                                       sym_op->m_dst,
+                                       uint8_t *, auth_offset >> 3),
+                               rte_pktmbuf_mtod_offset(
+                                       sym_op->m_src,
+                                       uint8_t *, auth_offset >> 3),
+                               ((cipher_offset >> 3) - (auth_offset >> 3)));
+       }
+
        if (cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
                cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
                cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3) {
@@ -2448,12 +3006,25 @@ 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;
 
-       /* 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))))
-               return -ENOTSUP;
+       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)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return TEST_SKIPPED;
+       }
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2461,7 +3032,7 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
@@ -2495,7 +3066,11 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 1, 0);
+       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");
@@ -2522,12 +3097,25 @@ 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;
 
-       /* 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))))
-               return -ENOTSUP;
+       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)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return TEST_SKIPPED;
+       }
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2535,7 +3123,7 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
@@ -2570,7 +3158,11 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 1, 0);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
        ut_params->obuf = ut_params->op->sym->m_src;
@@ -2596,6 +3188,19 @@ test_kasumi_authentication(const struct kasumi_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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2603,7 +3208,7 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create KASUMI session */
        retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
@@ -2637,8 +3242,16 @@ 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 if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 1, 0);
+       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 *)
@@ -2664,6 +3277,19 @@ test_kasumi_authentication_verify(const struct kasumi_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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2671,7 +3297,7 @@ test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create KASUMI session */
        retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
@@ -2706,7 +3332,11 @@ test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 1, 0);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
        ut_params->obuf = ut_params->op->sym->m_src;
@@ -2871,6 +3501,19 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata)
        uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2878,7 +3521,7 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -2913,8 +3556,12 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 0, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
        ut_params->obuf = ut_params->op->sym->m_dst;
@@ -2958,7 +3605,7 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -2967,9 +3614,18 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
        if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
                printf("Device doesn't support in-place scatter-gather. "
                                "Test Skipped.\n");
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+       }
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
        }
 
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
+
        /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
@@ -2999,7 +3655,11 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 0, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
@@ -3042,9 +3702,16 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
        struct rte_cryptodev_sym_capability_idx cap_idx;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       /* Data-path service does not support OOP */
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -3125,7 +3792,13 @@ test_kasumi_encryption_oop_sgl(const struct kasumi_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -3134,7 +3807,7 @@ test_kasumi_encryption_oop_sgl(const struct kasumi_test_data *tdata)
                printf("Device doesn't support out-of-place scatter-gather "
                                "in both input and output mbufs. "
                                "Test Skipped.\n");
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        }
 
        /* Create KASUMI session */
@@ -3210,11 +3883,17 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
-       /* Create KASUMI session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
                                        RTE_CRYPTO_CIPHER_KASUMI_F8,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
@@ -3280,6 +3959,19 @@ test_kasumi_decryption(const struct kasumi_test_data *tdata)
        uint8_t *ciphertext, *plaintext;
        unsigned ciphertext_pad_len;
        unsigned ciphertext_len;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3287,7 +3979,7 @@ test_kasumi_decryption(const struct kasumi_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -3322,7 +4014,11 @@ test_kasumi_decryption(const struct kasumi_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 0, 1, 0);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
@@ -3355,6 +4051,19 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
        uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3362,7 +4071,7 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -3397,7 +4106,11 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 0, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
@@ -3436,7 +4149,13 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -3519,7 +4238,13 @@ test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -3529,7 +4254,7 @@ test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
                printf("Device doesn't support out-of-place scatter-gather "
                                "in both input and output mbufs. "
                                "Test Skipped.\n");
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        }
 
        /* Create SNOW 3G session */
@@ -3621,11 +4346,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)))
-               return -ENOTSUP;
+       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 TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3633,7 +4363,13 @@ test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -3725,6 +4461,19 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
        uint8_t *plaintext, *ciphertext;
        unsigned ciphertext_pad_len;
        unsigned ciphertext_len;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3732,7 +4481,7 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -3767,7 +4516,11 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 0, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
        ut_params->obuf = ut_params->op->sym->m_dst;
@@ -3803,7 +4556,13 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -3879,15 +4638,35 @@ 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 TEST_SKIPPED;
+       }
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
+
        /* Check if device supports ZUC EEA3 */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
 
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Check if device supports ZUC EIA3 */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
@@ -3895,13 +4674,13 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
 
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create ZUC session */
        retval = create_zuc_cipher_auth_encrypt_generate_session(
                        ts_params->valid_devs[0],
                        tdata);
-       if (retval < 0)
+       if (retval != 0)
                return retval;
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
@@ -3924,7 +4703,11 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
        ut_params->obuf = ut_params->op->sym->m_src;
@@ -3964,6 +4747,19 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
        uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3971,12 +4767,12 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_auth_session(ts_params->valid_devs[0],
@@ -3987,7 +4783,7 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
                        tdata->key.data, tdata->key.len,
                        tdata->auth_iv.len, tdata->digest.len,
                        tdata->cipher_iv.len);
-       if (retval < 0)
+       if (retval != 0)
                return retval;
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
@@ -4019,7 +4815,11 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
        ut_params->obuf = ut_params->op->sym->m_src;
@@ -4071,12 +4871,15 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -4085,8 +4888,16 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
        if (op_mode == OUT_OF_PLACE) {
                if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
                        printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
+                       return TEST_SKIPPED;
                }
+               if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+                       return TEST_SKIPPED;
+       }
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
        }
 
        /* Create SNOW 3G session */
@@ -4101,8 +4912,7 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
                        tdata->key.data, tdata->key.len,
                        tdata->auth_iv.len, tdata->digest.len,
                        tdata->cipher_iv.len);
-
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -4155,7 +4965,11 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
@@ -4200,16 +5014,20 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
 
        /* Validate obuf */
        if (verify) {
-               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
                        plaintext,
                        tdata->plaintext.data,
-                       tdata->plaintext.len >> 3,
+                       (tdata->plaintext.len - tdata->cipher.offset_bits -
+                        (tdata->digest.len << 3)),
+                       tdata->cipher.offset_bits,
                        "SNOW 3G Plaintext data not as expected");
        } else {
-               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
                        ciphertext,
                        tdata->ciphertext.data,
-                       tdata->validDataLenInBits.len,
+                       (tdata->validDataLenInBits.len -
+                        tdata->cipher.offset_bits),
+                       tdata->cipher.offset_bits,
                        "SNOW 3G Ciphertext data not as expected");
 
                TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -4248,12 +5066,15 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -4263,17 +5084,24 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
                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;
+                       return TEST_SKIPPED;
+               }
+               if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+                       printf("Device doesn't support RAW data-path APIs.\n");
+                       return TEST_SKIPPED;
                }
        } else {
+               if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+                       return TEST_SKIPPED;
                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;
+                       return TEST_SKIPPED;
                }
                if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
                        printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
+                       return TEST_SKIPPED;
                }
        }
 
@@ -4290,7 +5118,7 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
                        tdata->auth_iv.len, tdata->digest.len,
                        tdata->cipher_iv.len);
 
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
@@ -4344,7 +5172,11 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
@@ -4397,16 +5229,20 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
 
        /* Validate obuf */
        if (verify) {
-               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
                        plaintext,
                        tdata->plaintext.data,
-                       tdata->plaintext.len >> 3,
+                       (tdata->plaintext.len - tdata->cipher.offset_bits -
+                        (tdata->digest.len << 3)),
+                       tdata->cipher.offset_bits,
                        "SNOW 3G Plaintext data not as expected");
        } else {
-               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
                        ciphertext,
                        tdata->ciphertext.data,
-                       tdata->validDataLenInBits.len,
+                       (tdata->validDataLenInBits.len -
+                        tdata->cipher.offset_bits),
+                       tdata->cipher.offset_bits,
                        "SNOW 3G Ciphertext data not as expected");
 
                TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -4441,21 +5277,32 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
        uint64_t feat_flags = dev_info.feature_flags;
 
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
+
        if (op_mode == OUT_OF_PLACE) {
+               if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+                       return TEST_SKIPPED;
                if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
                        printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
+                       return TEST_SKIPPED;
                }
        }
 
@@ -4472,7 +5319,7 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
                        0, tdata->digest.len,
                        tdata->cipher_iv.len);
 
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -4526,7 +5373,11 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
@@ -4620,12 +5471,15 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -4635,17 +5489,24 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
                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;
+                       return TEST_SKIPPED;
+               }
+               if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+                       printf("Device doesn't support RAW data-path APIs.\n");
+                       return TEST_SKIPPED;
                }
        } else {
+               if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+                       return TEST_SKIPPED;
                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;
+                       return TEST_SKIPPED;
                }
                if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
                        printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
+                       return TEST_SKIPPED;
                }
        }
 
@@ -4662,7 +5523,7 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
                        0, tdata->digest.len,
                        tdata->cipher_iv.len);
 
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
@@ -4716,7 +5577,11 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
@@ -4801,6 +5666,19 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
        uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -4808,12 +5686,12 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create KASUMI session */
        retval = create_wireless_algo_cipher_auth_session(
@@ -4825,7 +5703,7 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
                        tdata->key.data, tdata->key.len,
                        0, tdata->digest.len,
                        tdata->cipher_iv.len);
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -4857,7 +5735,11 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
@@ -4900,6 +5782,19 @@ test_zuc_encryption(const struct wireless_test_data *tdata)
        uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        struct rte_cryptodev_sym_capability_idx cap_idx;
 
@@ -4909,7 +5804,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata)
 
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create ZUC session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
@@ -4944,7 +5839,11 @@ test_zuc_encryption(const struct wireless_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 0, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
@@ -4987,7 +5886,10 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
 
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -4996,7 +5898,13 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
        if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
                printf("Device doesn't support in-place scatter-gather. "
                                "Test Skipped.\n");
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+       }
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
        }
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
@@ -5031,7 +5939,11 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 0, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
@@ -5068,12 +5980,25 @@ 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;
 
-       /* 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))))
-               return -ENOTSUP;
+       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)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return TEST_SKIPPED;
+       }
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
 
        /* Check if device supports ZUC EIA3 */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
@@ -5081,7 +6006,7 @@ test_zuc_authentication(const struct wireless_test_data *tdata)
 
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create ZUC session */
        retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
@@ -5115,7 +6040,11 @@ test_zuc_authentication(const struct wireless_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 1, 0);
+       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");
@@ -5156,7 +6085,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
 
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -5164,7 +6093,28 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
 
        if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
                printf("Device doesn't support digest encrypted.\n");
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+       }
+       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 TEST_SKIPPED;
+               }
+
+               if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+                       printf("Device doesn't support RAW data-path APIs.\n");
+                       return TEST_SKIPPED;
+               }
+       } else {
+               if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+                       return TEST_SKIPPED;
+               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 TEST_SKIPPED;
+               }
        }
 
        /* Create ZUC session */
@@ -5180,7 +6130,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
                        tdata->auth_iv.len, tdata->digest.len,
                        tdata->cipher_iv.len);
 
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -5234,7 +6184,11 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
@@ -5329,7 +6283,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
 
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -5339,17 +6293,25 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
                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;
+                       return TEST_SKIPPED;
+               }
+
+               if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+                       printf("Device doesn't support RAW data-path APIs.\n");
+                       return TEST_SKIPPED;
                }
        } else {
+               if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+                       return TEST_SKIPPED;
                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;
+                       return TEST_SKIPPED;
                }
                if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
                        printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
+                       return TEST_SKIPPED;
                }
        }
 
@@ -5366,7 +6328,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
                        tdata->auth_iv.len, tdata->digest.len,
                        tdata->cipher_iv.len);
 
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
@@ -5420,7 +6382,11 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 1, tdata->cipher_iv.len);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
@@ -5563,6 +6529,9 @@ test_kasumi_decryption_test_case_2(void)
 static int
 test_kasumi_decryption_test_case_3(void)
 {
+       /* rte_crypto_mbuf_to_vec does not support incomplete mbuf build */
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
        return test_kasumi_decryption(&kasumi_test_case_3);
 }
 
@@ -5705,6 +6674,16 @@ static int
 test_snow3g_decryption_with_digest_test_case_1(void)
 {
        struct snow3g_hash_test_data snow3g_hash_data;
+       struct rte_cryptodev_info dev_info;
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+
+       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_DIGEST_ENCRYPTED)) {
+               printf("Device doesn't support encrypted digest operations.\n");
+               return TEST_SKIPPED;
+       }
 
        /*
         * Function prepare data for hash veryfication test case.
@@ -5762,6 +6741,9 @@ test_snow3g_auth_cipher_part_digest_enc_oop(void)
 static int
 test_snow3g_auth_cipher_test_case_3_sgl(void)
 {
+       /* rte_crypto_mbuf_to_vec does not support incomplete mbuf build */
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
        return test_snow3g_auth_cipher_sgl(
                &snow3g_auth_cipher_test_case_3, IN_PLACE, 0);
 }
@@ -5776,6 +6758,9 @@ test_snow3g_auth_cipher_test_case_3_oop_sgl(void)
 static int
 test_snow3g_auth_cipher_part_digest_enc_sgl(void)
 {
+       /* rte_crypto_mbuf_to_vec does not support incomplete mbuf build */
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
        return test_snow3g_auth_cipher_sgl(
                &snow3g_auth_cipher_partial_digest_encryption,
                        IN_PLACE, 0);
@@ -6014,11 +6999,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);
 }
 
@@ -6043,11 +7023,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);
 }
@@ -6112,13 +7087,13 @@ test_mixed_check_if_unsupported(const struct mixed_cipher_auth_test_data *tdata)
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = tdata->cipher_algo;
        if (rte_cryptodev_sym_capability_get(dev_id, &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Check if device supports particular hash algorithm */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
        cap_idx.algo.auth = tdata->auth_algo;
        if (rte_cryptodev_sym_capability_get(dev_id, &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        return 0;
 }
@@ -6143,7 +7118,9 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
 
        /* Check if device supports particular algorithms separately */
        if (test_mixed_check_if_unsupported(tdata))
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -6151,7 +7128,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
 
        if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
                printf("Device doesn't support digest encrypted.\n");
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        }
 
        /* Create the session */
@@ -6175,7 +7152,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
                                tdata->auth_key.data, tdata->auth_key.len,
                                tdata->auth_iv.len, tdata->digest_enc.len,
                                tdata->cipher_iv.len);
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -6185,9 +7162,11 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
        /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                rte_pktmbuf_tailroom(ut_params->ibuf));
-       if (op_mode == OUT_OF_PLACE)
+       if (op_mode == OUT_OF_PLACE) {
+
                memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
                                rte_pktmbuf_tailroom(ut_params->obuf));
+       }
 
        ciphertext_len = ceil_byte_length(tdata->ciphertext.len_bits);
        plaintext_len = ceil_byte_length(tdata->plaintext.len_bits);
@@ -6228,8 +7207,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
        if (retval < 0)
                return retval;
 
-       op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+       op = process_crypto_request(ts_params->valid_devs[0], ut_params->op);
 
        /* Check if the op failed because the device doesn't */
        /* support this particular combination of algorithms */
@@ -6237,7 +7215,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
                        RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
                printf("Device doesn't support this mixed combination. "
                                "Test Skipped.\n");
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        }
        ut_params->op = op;
 
@@ -6334,7 +7312,9 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
 
        /* Check if device supports particular algorithms */
        if (test_mixed_check_if_unsupported(tdata))
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -6344,17 +7324,17 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
                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;
+                       return TEST_SKIPPED;
                }
        } 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;
+                       return TEST_SKIPPED;
                }
                if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
                        printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
+                       return TEST_SKIPPED;
                }
        }
 
@@ -6379,7 +7359,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
                                tdata->auth_key.data, tdata->auth_key.len,
                                tdata->auth_iv.len, tdata->digest_enc.len,
                                tdata->cipher_iv.len);
-       if (retval < 0)
+       if (retval != 0)
                return retval;
 
        ciphertext_len = ceil_byte_length(tdata->ciphertext.len_bits);
@@ -6433,8 +7413,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
        if (retval < 0)
                return retval;
 
-       op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+       op = process_crypto_request(ts_params->valid_devs[0], ut_params->op);
 
        /* Check if the op failed because the device doesn't */
        /* support this particular combination of algorithms */
@@ -6442,9 +7421,8 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
                        RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
                printf("Device doesn't support this mixed combination. "
                                "Test Skipped.\n");
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        }
-
        ut_params->op = op;
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
@@ -6987,6 +7965,16 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
        uint8_t *ciphertext, *auth_tag;
        uint16_t plaintext_pad_len;
        uint32_t i;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -6996,11 +7984,11 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
        capability = rte_cryptodev_sym_capability_get(
                        ts_params->valid_devs[0], &cap_idx);
        if (capability == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        if (rte_cryptodev_sym_capability_check_aead(
                        capability, tdata->key.len, tdata->auth_tag.len,
                        tdata->aad.len, tdata->iv.len))
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
@@ -7036,6 +8024,9 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
        /* Process crypto operation */
        if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
                process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 0, 0, 0);
        else
                TEST_ASSERT_NOT_NULL(
                        process_crypto_request(ts_params->valid_devs[0],
@@ -7078,20 +8069,54 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
 
 }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
+static int
+security_proto_supported(enum rte_security_session_action_type action,
+       enum rte_security_session_protocol proto)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+
+       const struct rte_security_capability *capabilities;
+       const struct rte_security_capability *capability;
+       uint16_t i = 0;
+
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                               rte_cryptodev_get_sec_ctx(
+                               ts_params->valid_devs[0]);
+
+
+       capabilities = rte_security_capabilities_get(ctx);
+
+       if (capabilities == NULL)
+               return -ENOTSUP;
+
+       while ((capability = &capabilities[i++])->action !=
+                       RTE_SECURITY_ACTION_TYPE_NONE) {
+               if (capability->action == action &&
+                               capability->protocol == proto)
+                       return 0;
+       }
+
+       return -ENOTSUP;
+}
+
 /* Basic algorithm run function for async inplace mode.
  * Creates a session from input parameters and runs one operation
  * on input_vec. Checks the output of the crypto operation against
  * output_vec.
  */
-static int
-test_pdcp_proto(int i, int oop,
-       enum rte_crypto_cipher_operation opc,
-       enum rte_crypto_auth_operation opa,
-       uint8_t *input_vec,
-       unsigned int input_vec_len,
-       uint8_t *output_vec,
-       unsigned int output_vec_len)
+static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,
+                          enum rte_crypto_auth_operation opa,
+                          const uint8_t *input_vec, unsigned int input_vec_len,
+                          const uint8_t *output_vec,
+                          unsigned int output_vec_len,
+                          enum rte_crypto_cipher_algorithm cipher_alg,
+                          const uint8_t *cipher_key, uint32_t cipher_key_len,
+                          enum rte_crypto_auth_algorithm auth_alg,
+                          const uint8_t *auth_key, uint32_t auth_key_len,
+                          uint8_t bearer, enum rte_security_pdcp_domain domain,
+                          uint8_t packet_direction, uint8_t sn_size,
+                          uint32_t hfn, uint32_t hfn_threshold, uint8_t sdap)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -7104,11 +8129,11 @@ test_pdcp_proto(int i, int oop,
        /* Verify the capabilities */
        struct rte_security_capability_idx sec_cap_idx;
 
-       sec_cap_idx.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
+       sec_cap_idx.action = ut_params->type;
        sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_PDCP;
-       sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;
+       sec_cap_idx.pdcp.domain = domain;
        if (rte_security_capability_get(ctx, &sec_cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Generate test mbuf data */
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -7130,27 +8155,24 @@ test_pdcp_proto(int i, int oop,
                rte_pktmbuf_append(ut_params->obuf, output_vec_len);
        }
 
-       /* Set crypto type as IPSEC */
-       ut_params->type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
-
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
+       ut_params->cipher_xform.cipher.algo = cipher_alg;
        ut_params->cipher_xform.cipher.op = opc;
-       ut_params->cipher_xform.cipher.key.data = pdcp_test_crypto_key[i];
-       ut_params->cipher_xform.cipher.key.length =
-                                       pdcp_test_params[i].cipher_key_len;
-       ut_params->cipher_xform.cipher.iv.length = 0;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = cipher_key_len;
+       ut_params->cipher_xform.cipher.iv.length =
+                               packet_direction ? 4 : 0;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
 
        /* Setup HMAC Parameters if ICV header is required */
-       if (pdcp_test_params[i].auth_alg != 0) {
+       if (auth_alg != 0) {
                ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
                ut_params->auth_xform.next = NULL;
-               ut_params->auth_xform.auth.algo = pdcp_test_params[i].auth_alg;
+               ut_params->auth_xform.auth.algo = auth_alg;
                ut_params->auth_xform.auth.op = opa;
-               ut_params->auth_xform.auth.key.data = pdcp_test_auth_key[i];
-               ut_params->auth_xform.auth.key.length =
-                                       pdcp_test_params[i].auth_key_len;
+               ut_params->auth_xform.auth.key.data = auth_key;
+               ut_params->auth_xform.auth.key.length = auth_key_len;
 
                ut_params->cipher_xform.next = &ut_params->auth_xform;
        } else {
@@ -7158,22 +8180,33 @@ test_pdcp_proto(int i, int oop,
        }
 
        struct rte_security_session_conf sess_conf = {
-               .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+               .action_type = ut_params->type,
                .protocol = RTE_SECURITY_PROTOCOL_PDCP,
                {.pdcp = {
-                       .bearer = pdcp_test_bearer[i],
-                       .domain = pdcp_test_params[i].domain,
-                       .pkt_dir = pdcp_test_packet_direction[i],
-                       .sn_size = pdcp_test_data_sn_size[i],
-                       .hfn = pdcp_test_hfn[i],
-                       .hfn_threshold = pdcp_test_hfn_threshold[i],
+                       .bearer = bearer,
+                       .domain = domain,
+                       .pkt_dir = packet_direction,
+                       .sn_size = sn_size,
+                       .hfn = packet_direction ? 0 : hfn,
+                       /**
+                        * hfn can be set as pdcp_test_hfn[i]
+                        * if hfn_ovrd is not set. Here, PDCP
+                        * packet direction is just used to
+                        * run half of the cases with session
+                        * HFN and other half with per packet
+                        * HFN.
+                        */
+                       .hfn_threshold = hfn_threshold,
+                       .hfn_ovrd = packet_direction ? 1 : 0,
+                       .sdap_enabled = sdap,
                } },
                .crypto_xform = &ut_params->cipher_xform
        };
 
        /* Create security session */
        ut_params->sec_session = rte_security_session_create(ctx,
-                               &sess_conf, ts_params->session_priv_mpool);
+                               &sess_conf, ts_params->session_mpool,
+                               ts_params->session_priv_mpool);
 
        if (!ut_params->sec_session) {
                printf("TestCase %s()-%d line %d failed %s: ",
@@ -7193,6 +8226,10 @@ test_pdcp_proto(int i, int oop,
                goto on_err;
        }
 
+       uint32_t *per_pkt_hfn = rte_crypto_op_ctod_offset(ut_params->op,
+                                       uint32_t *, IV_OFFSET);
+       *per_pkt_hfn = packet_direction ? hfn : 0;
+
        rte_security_attach_session(ut_params->op, ut_params->sec_session);
 
        /* set crypto operation source mbuf */
@@ -7278,11 +8315,11 @@ test_pdcp_proto_SGL(int i, int oop,
        /* Verify the capabilities */
        struct rte_security_capability_idx sec_cap_idx;
 
-       sec_cap_idx.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
+       sec_cap_idx.action = ut_params->type;
        sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_PDCP;
        sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;
        if (rte_security_capability_get(ctx, &sec_cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        if (fragsz > input_vec_len)
                fragsz = input_vec_len;
@@ -7388,8 +8425,6 @@ test_pdcp_proto_SGL(int i, int oop,
                ut_params->obuf->nb_segs = segs;
        }
 
-       ut_params->type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
-
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
@@ -7415,7 +8450,7 @@ test_pdcp_proto_SGL(int i, int oop,
        }
 
        struct rte_security_session_conf sess_conf = {
-               .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+               .action_type = ut_params->type,
                .protocol = RTE_SECURITY_PROTOCOL_PDCP,
                {.pdcp = {
                        .bearer = pdcp_test_bearer[i],
@@ -7424,13 +8459,15 @@ test_pdcp_proto_SGL(int i, int oop,
                        .sn_size = pdcp_test_data_sn_size[i],
                        .hfn = pdcp_test_hfn[i],
                        .hfn_threshold = pdcp_test_hfn_threshold[i],
+                       .hfn_ovrd = 0,
                } },
                .crypto_xform = &ut_params->cipher_xform
        };
 
        /* Create security session */
        ut_params->sec_session = rte_security_session_create(ctx,
-                               &sess_conf, ts_params->session_priv_mpool);
+                               &sess_conf, ts_params->session_mpool,
+                               ts_params->session_priv_mpool);
 
        if (!ut_params->sec_session) {
                printf("TestCase %s()-%d line %d failed %s: ",
@@ -7533,74 +8570,97 @@ on_err:
 int
 test_pdcp_proto_cplane_encap(int i)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i],
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i]+4);
+       return test_pdcp_proto(
+               i, 0, RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i], pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i], pdcp_test_data_in_len[i] + 4,
+               pdcp_test_params[i].cipher_alg, pdcp_test_crypto_key[i],
+               pdcp_test_params[i].cipher_key_len,
+               pdcp_test_params[i].auth_alg, pdcp_test_auth_key[i],
+               pdcp_test_params[i].auth_key_len, pdcp_test_bearer[i],
+               pdcp_test_params[i].domain, pdcp_test_packet_direction[i],
+               pdcp_test_data_sn_size[i], pdcp_test_hfn[i],
+               pdcp_test_hfn_threshold[i], SDAP_DISABLED);
 }
 
 int
 test_pdcp_proto_uplane_encap(int i)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i],
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i]);
-
+       return test_pdcp_proto(
+               i, 0, RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i], pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i], pdcp_test_data_in_len[i],
+               pdcp_test_params[i].cipher_alg, pdcp_test_crypto_key[i],
+               pdcp_test_params[i].cipher_key_len,
+               pdcp_test_params[i].auth_alg, pdcp_test_auth_key[i],
+               pdcp_test_params[i].auth_key_len, pdcp_test_bearer[i],
+               pdcp_test_params[i].domain, pdcp_test_packet_direction[i],
+               pdcp_test_data_sn_size[i], pdcp_test_hfn[i],
+               pdcp_test_hfn_threshold[i], SDAP_DISABLED);
 }
 
 int
 test_pdcp_proto_uplane_encap_with_int(int i)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i],
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i] + 4);
+       return test_pdcp_proto(
+               i, 0, RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i], pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i], pdcp_test_data_in_len[i] + 4,
+               pdcp_test_params[i].cipher_alg, pdcp_test_crypto_key[i],
+               pdcp_test_params[i].cipher_key_len,
+               pdcp_test_params[i].auth_alg, pdcp_test_auth_key[i],
+               pdcp_test_params[i].auth_key_len, pdcp_test_bearer[i],
+               pdcp_test_params[i].domain, pdcp_test_packet_direction[i],
+               pdcp_test_data_sn_size[i], pdcp_test_hfn[i],
+               pdcp_test_hfn_threshold[i], SDAP_DISABLED);
 }
 
 int
 test_pdcp_proto_cplane_decap(int i)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_DECRYPT,
-               RTE_CRYPTO_AUTH_OP_VERIFY,
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i] + 4,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i]);
+       return test_pdcp_proto(
+               i, 0, RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i], pdcp_test_data_in_len[i] + 4,
+               pdcp_test_data_in[i], pdcp_test_data_in_len[i],
+               pdcp_test_params[i].cipher_alg, pdcp_test_crypto_key[i],
+               pdcp_test_params[i].cipher_key_len,
+               pdcp_test_params[i].auth_alg, pdcp_test_auth_key[i],
+               pdcp_test_params[i].auth_key_len, pdcp_test_bearer[i],
+               pdcp_test_params[i].domain, pdcp_test_packet_direction[i],
+               pdcp_test_data_sn_size[i], pdcp_test_hfn[i],
+               pdcp_test_hfn_threshold[i], SDAP_DISABLED);
 }
 
 int
 test_pdcp_proto_uplane_decap(int i)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_DECRYPT,
-               RTE_CRYPTO_AUTH_OP_VERIFY,
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i],
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i]);
+       return test_pdcp_proto(
+               i, 0, RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i], pdcp_test_data_in_len[i],
+               pdcp_test_data_in[i], pdcp_test_data_in_len[i],
+               pdcp_test_params[i].cipher_alg, pdcp_test_crypto_key[i],
+               pdcp_test_params[i].cipher_key_len,
+               pdcp_test_params[i].auth_alg, pdcp_test_auth_key[i],
+               pdcp_test_params[i].auth_key_len, pdcp_test_bearer[i],
+               pdcp_test_params[i].domain, pdcp_test_packet_direction[i],
+               pdcp_test_data_sn_size[i], pdcp_test_hfn[i],
+               pdcp_test_hfn_threshold[i], SDAP_DISABLED);
 }
 
 int
 test_pdcp_proto_uplane_decap_with_int(int i)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_DECRYPT,
-               RTE_CRYPTO_AUTH_OP_VERIFY,
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i] + 4,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i]);
+       return test_pdcp_proto(
+               i, 0, RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i], pdcp_test_data_in_len[i] + 4,
+               pdcp_test_data_in[i], pdcp_test_data_in_len[i],
+               pdcp_test_params[i].cipher_alg, pdcp_test_crypto_key[i],
+               pdcp_test_params[i].cipher_key_len,
+               pdcp_test_params[i].auth_alg, pdcp_test_auth_key[i],
+               pdcp_test_params[i].auth_key_len, pdcp_test_bearer[i],
+               pdcp_test_params[i].domain, pdcp_test_packet_direction[i],
+               pdcp_test_data_sn_size[i], pdcp_test_hfn[i],
+               pdcp_test_hfn_threshold[i], SDAP_DISABLED);
 }
 
 static int
@@ -7668,228 +8728,830 @@ test_PDCP_PROTO_SGL_oop_128B_32B(void)
                        pdcp_test_data_in_len[i]+4,
                        128, 32);
 }
-#endif
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_1(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_1);
-}
+test_PDCP_SDAP_PROTO_encap_all(void)
+{
+       int i = 0, size = 0;
+       int err, all_err = TEST_SUCCESS;
+       const struct pdcp_sdap_test *cur_test;
+
+       size = ARRAY_SIZE(list_pdcp_sdap_tests);
+
+       for (i = 0; i < size; i++) {
+               cur_test = &list_pdcp_sdap_tests[i];
+               err = test_pdcp_proto(
+                       i, 0, RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE, cur_test->data_in,
+                       cur_test->in_len, cur_test->data_out,
+                       cur_test->in_len + ((cur_test->auth_key) ? 4 : 0),
+                       cur_test->param.cipher_alg, cur_test->cipher_key,
+                       cur_test->param.cipher_key_len,
+                       cur_test->param.auth_alg,
+                       cur_test->auth_key, cur_test->param.auth_key_len,
+                       cur_test->bearer, cur_test->param.domain,
+                       cur_test->packet_direction, cur_test->sn_size,
+                       cur_test->hfn,
+                       cur_test->hfn_threshold, SDAP_ENABLED);
+               if (err) {
+                       printf("\t%d) %s: Encapsulation failed\n",
+                                       cur_test->test_idx,
+                                       cur_test->param.name);
+                       err = TEST_FAILED;
+               } else {
+                       printf("\t%d) %s: Encap PASS\n", cur_test->test_idx,
+                                       cur_test->param.name);
+                       err = TEST_SUCCESS;
+               }
+               all_err += err;
+       }
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_2);
-}
+       printf("Success: %d, Failure: %d\n", size + all_err, -all_err);
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_3(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_3);
+       return (all_err == TEST_SUCCESS) ? TEST_SUCCESS : TEST_FAILED;
 }
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_4(void)
+test_PDCP_SDAP_PROTO_decap_all(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_4);
-}
+       int i = 0, size = 0;
+       int err, all_err = TEST_SUCCESS;
+       const struct pdcp_sdap_test *cur_test;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_5(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_5);
-}
+       size = ARRAY_SIZE(list_pdcp_sdap_tests);
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_6(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_6);
-}
+       for (i = 0; i < size; i++) {
+               cur_test = &list_pdcp_sdap_tests[i];
+               err = test_pdcp_proto(
+                       i, 0, RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                       RTE_CRYPTO_AUTH_OP_VERIFY,
+                       cur_test->data_out,
+                       cur_test->in_len + ((cur_test->auth_key) ? 4 : 0),
+                       cur_test->data_in, cur_test->in_len,
+                       cur_test->param.cipher_alg,
+                       cur_test->cipher_key, cur_test->param.cipher_key_len,
+                       cur_test->param.auth_alg, cur_test->auth_key,
+                       cur_test->param.auth_key_len, cur_test->bearer,
+                       cur_test->param.domain, cur_test->packet_direction,
+                       cur_test->sn_size, cur_test->hfn,
+                       cur_test->hfn_threshold, SDAP_ENABLED);
+               if (err) {
+                       printf("\t%d) %s: Decapsulation failed\n",
+                                       cur_test->test_idx,
+                                       cur_test->param.name);
+                       err = TEST_FAILED;
+               } else {
+                       printf("\t%d) %s: Decap PASS\n", cur_test->test_idx,
+                                       cur_test->param.name);
+                       err = TEST_SUCCESS;
+               }
+               all_err += err;
+       }
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_7(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_7);
-}
+       printf("Success: %d, Failure: %d\n", size + all_err, -all_err);
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_8(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_8);
+       return (all_err == TEST_SUCCESS) ? TEST_SUCCESS : TEST_FAILED;
 }
 
 static int
-test_AES_GCM_J0_authenticated_encryption_test_case_1(void)
+test_PDCP_PROTO_all(void)
 {
-       return test_authenticated_encryption(&gcm_J0_test_case_1);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_cryptodev_info dev_info;
+       int status;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_1(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_1);
-}
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_2);
-}
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SECURITY))
+               return TEST_SKIPPED;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_3(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_3);
-}
+       /* Set action type */
+       ut_params->type = gbl_action_type == RTE_SECURITY_ACTION_TYPE_NONE ?
+               RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL :
+               gbl_action_type;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_4(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_4);
-}
+       if (security_proto_supported(ut_params->type,
+                       RTE_SECURITY_PROTOCOL_PDCP) < 0)
+               return TEST_SKIPPED;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_5(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_5);
+       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();
+       status += test_PDCP_SDAP_PROTO_encap_all();
+       status += test_PDCP_SDAP_PROTO_decap_all();
+
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_192_6(void)
+test_docsis_proto_uplink(int i, struct docsis_test_data *d_td)
 {
-       return test_authenticated_encryption(&gcm_test_case_192_6);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
+       uint8_t *iv_ptr;
+       int32_t cipher_len, crc_len;
+       uint32_t crc_data_len;
+       int ret = TEST_SUCCESS;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_7(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_7);
-}
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(
+                                               ts_params->valid_devs[0]);
 
-static int
-test_AES_GCM_auth_encryption_test_case_256_1(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_1);
-}
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
+       const struct rte_security_capability *sec_cap;
+       const struct rte_cryptodev_capabilities *crypto_cap;
+       const struct rte_cryptodev_symmetric_capability *sym_cap;
+       int j = 0;
 
-static int
-test_AES_GCM_auth_encryption_test_case_256_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_2);
-}
+       sec_cap_idx.action = ut_params->type;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_DOCSIS;
+       sec_cap_idx.docsis.direction = RTE_SECURITY_DOCSIS_UPLINK;
 
-static int
-test_AES_GCM_auth_encryption_test_case_256_3(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_3);
-}
+       sec_cap = rte_security_capability_get(ctx, &sec_cap_idx);
+       if (sec_cap == NULL)
+               return TEST_SKIPPED;
 
-static int
-test_AES_GCM_auth_encryption_test_case_256_4(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_4);
+       while ((crypto_cap = &sec_cap->crypto_capabilities[j++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+                               crypto_cap->sym.xform_type ==
+                                       RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                               crypto_cap->sym.cipher.algo ==
+                                       RTE_CRYPTO_CIPHER_AES_DOCSISBPI) {
+                       sym_cap = &crypto_cap->sym;
+                       if (rte_cryptodev_sym_capability_check_cipher(sym_cap,
+                                               d_td->key.len,
+                                               d_td->iv.len) == 0)
+                               break;
+               }
+       }
+
+       if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_UNDEFINED)
+               return TEST_SKIPPED;
+
+       /* Setup source mbuf payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       d_td->ciphertext.len);
+
+       memcpy(ciphertext, d_td->ciphertext.data, d_td->ciphertext.len);
+
+       /* Setup cipher session parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       ut_params->cipher_xform.cipher.key.data = d_td->key.data;
+       ut_params->cipher_xform.cipher.key.length = d_td->key.len;
+       ut_params->cipher_xform.cipher.iv.length = d_td->iv.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.next = NULL;
+
+       /* Setup DOCSIS session parameters */
+       ut_params->docsis_xform.direction = RTE_SECURITY_DOCSIS_UPLINK;
+
+       struct rte_security_session_conf sess_conf = {
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+               .docsis = ut_params->docsis_xform,
+               .crypto_xform = &ut_params->cipher_xform,
+       };
+
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx, &sess_conf,
+                                       ts_params->session_mpool,
+                                       ts_params->session_priv_mpool);
+
+       if (!ut_params->sec_session) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to allocate symmetric crypto operation");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Setup CRC operation parameters */
+       crc_len = d_td->ciphertext.no_crc == false ?
+                       (d_td->ciphertext.len -
+                               d_td->ciphertext.crc_offset -
+                               RTE_ETHER_CRC_LEN) :
+                       0;
+       crc_len = crc_len > 0 ? crc_len : 0;
+       crc_data_len = crc_len == 0 ? 0 : RTE_ETHER_CRC_LEN;
+       ut_params->op->sym->auth.data.length = crc_len;
+       ut_params->op->sym->auth.data.offset = d_td->ciphertext.crc_offset;
+
+       /* Setup cipher operation parameters */
+       cipher_len = d_td->ciphertext.no_cipher == false ?
+                       (d_td->ciphertext.len -
+                               d_td->ciphertext.cipher_offset) :
+                       0;
+       cipher_len = cipher_len > 0 ? cipher_len : 0;
+       ut_params->op->sym->cipher.data.length = cipher_len;
+       ut_params->op->sym->cipher.data.offset = d_td->ciphertext.cipher_offset;
+
+       /* Setup cipher IV */
+       iv_ptr = (uint8_t *)ut_params->op + IV_OFFSET;
+       rte_memcpy(iv_ptr, d_td->iv.data, d_td->iv.len);
+
+       /* Attach session to operation */
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
+
+       /* Set crypto operation mbufs */
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       ut_params->op->sym->m_dst = NULL;
+
+       /* Process crypto operation */
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op) ==
+                       NULL) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to process security crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Validate plaintext */
+       plaintext = ciphertext;
+
+       if (memcmp(plaintext, d_td->plaintext.data,
+                       d_td->plaintext.len - crc_data_len)) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "plaintext not as expected\n");
+               rte_hexdump(stdout, "expected", d_td->plaintext.data,
+                               d_td->plaintext.len);
+               rte_hexdump(stdout, "actual", plaintext, d_td->plaintext.len);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
+
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
+
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+
+       return ret;
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_5(void)
+test_docsis_proto_downlink(int i, struct docsis_test_data *d_td)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_5);
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
+       uint8_t *iv_ptr;
+       int32_t cipher_len, crc_len;
+       int ret = TEST_SUCCESS;
+
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(
+                                               ts_params->valid_devs[0]);
+
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
+       const struct rte_security_capability *sec_cap;
+       const struct rte_cryptodev_capabilities *crypto_cap;
+       const struct rte_cryptodev_symmetric_capability *sym_cap;
+       int j = 0;
+
+       sec_cap_idx.action = ut_params->type;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_DOCSIS;
+       sec_cap_idx.docsis.direction = RTE_SECURITY_DOCSIS_DOWNLINK;
+
+       sec_cap = rte_security_capability_get(ctx, &sec_cap_idx);
+       if (sec_cap == NULL)
+               return TEST_SKIPPED;
+
+       while ((crypto_cap = &sec_cap->crypto_capabilities[j++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+                               crypto_cap->sym.xform_type ==
+                                       RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                               crypto_cap->sym.cipher.algo ==
+                                       RTE_CRYPTO_CIPHER_AES_DOCSISBPI) {
+                       sym_cap = &crypto_cap->sym;
+                       if (rte_cryptodev_sym_capability_check_cipher(sym_cap,
+                                               d_td->key.len,
+                                               d_td->iv.len) == 0)
+                               break;
+               }
+       }
+
+       if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_UNDEFINED)
+               return TEST_SKIPPED;
+
+       /* Setup source mbuf payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       d_td->plaintext.len);
+
+       memcpy(plaintext, d_td->plaintext.data, d_td->plaintext.len);
+
+       /* Setup cipher session parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       ut_params->cipher_xform.cipher.key.data = d_td->key.data;
+       ut_params->cipher_xform.cipher.key.length = d_td->key.len;
+       ut_params->cipher_xform.cipher.iv.length = d_td->iv.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.next = NULL;
+
+       /* Setup DOCSIS session parameters */
+       ut_params->docsis_xform.direction = RTE_SECURITY_DOCSIS_DOWNLINK;
+
+       struct rte_security_session_conf sess_conf = {
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+               .docsis = ut_params->docsis_xform,
+               .crypto_xform = &ut_params->cipher_xform,
+       };
+
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx, &sess_conf,
+                                       ts_params->session_mpool,
+                                       ts_params->session_priv_mpool);
+
+       if (!ut_params->sec_session) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to allocate security crypto operation");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Setup CRC operation parameters */
+       crc_len = d_td->plaintext.no_crc == false ?
+                       (d_td->plaintext.len -
+                               d_td->plaintext.crc_offset -
+                               RTE_ETHER_CRC_LEN) :
+                       0;
+       crc_len = crc_len > 0 ? crc_len : 0;
+       ut_params->op->sym->auth.data.length = crc_len;
+       ut_params->op->sym->auth.data.offset = d_td->plaintext.crc_offset;
+
+       /* Setup cipher operation parameters */
+       cipher_len = d_td->plaintext.no_cipher == false ?
+                       (d_td->plaintext.len -
+                               d_td->plaintext.cipher_offset) :
+                       0;
+       cipher_len = cipher_len > 0 ? cipher_len : 0;
+       ut_params->op->sym->cipher.data.length = cipher_len;
+       ut_params->op->sym->cipher.data.offset = d_td->plaintext.cipher_offset;
+
+       /* Setup cipher IV */
+       iv_ptr = (uint8_t *)ut_params->op + IV_OFFSET;
+       rte_memcpy(iv_ptr, d_td->iv.data, d_td->iv.len);
+
+       /* Attach session to operation */
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
+
+       /* Set crypto operation mbufs */
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       ut_params->op->sym->m_dst = NULL;
+
+       /* Process crypto operation */
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op) ==
+                       NULL) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to process security crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Validate ciphertext */
+       ciphertext = plaintext;
+
+       if (memcmp(ciphertext, d_td->ciphertext.data, d_td->ciphertext.len)) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "ciphertext not as expected\n");
+               rte_hexdump(stdout, "expected", d_td->ciphertext.data,
+                               d_td->ciphertext.len);
+               rte_hexdump(stdout, "actual", ciphertext, d_td->ciphertext.len);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
+
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
+
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+
+       return ret;
 }
 
+#define TEST_DOCSIS_COUNT(func) do {                   \
+       int ret = func;                                 \
+       if (ret == TEST_SUCCESS)  {                     \
+               printf("\t%2d)", n++);                  \
+               printf("+++++ PASSED:" #func"\n");      \
+               p++;                                    \
+       } else if (ret == TEST_SKIPPED) {               \
+               printf("\t%2d)", n++);                  \
+               printf("~~~~~ SKIPPED:" #func"\n");     \
+               s++;                                    \
+       } else {                                        \
+               printf("\t%2d)", n++);                  \
+               printf("----- FAILED:" #func"\n");      \
+               f++;                                    \
+       }                                               \
+} while (0)
+
+static int
+test_DOCSIS_PROTO_uplink_all(void)
+{
+       int p = 0, s = 0, f = 0, n = 0;
+
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(1, &docsis_test_case_1));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(2, &docsis_test_case_2));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(3, &docsis_test_case_3));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(4, &docsis_test_case_4));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(5, &docsis_test_case_5));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(6, &docsis_test_case_6));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(7, &docsis_test_case_7));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(8, &docsis_test_case_8));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(9, &docsis_test_case_9));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(10, &docsis_test_case_10));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(11, &docsis_test_case_11));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(12, &docsis_test_case_12));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(13, &docsis_test_case_13));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(14, &docsis_test_case_14));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(15, &docsis_test_case_15));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(16, &docsis_test_case_16));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(17, &docsis_test_case_17));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(18, &docsis_test_case_18));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(19, &docsis_test_case_19));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(20, &docsis_test_case_20));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(21, &docsis_test_case_21));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(22, &docsis_test_case_22));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(23, &docsis_test_case_23));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(24, &docsis_test_case_24));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(25, &docsis_test_case_25));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(26, &docsis_test_case_26));
+
+       if (f)
+               printf("## %s: %d passed out of %d (%d skipped)\n",
+                       __func__, p, n, s);
+
+       return f;
+};
+
 static int
-test_AES_GCM_auth_encryption_test_case_256_6(void)
+test_DOCSIS_PROTO_downlink_all(void)
+{
+       int p = 0, s = 0, f = 0, n = 0;
+
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(1, &docsis_test_case_1));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(2, &docsis_test_case_2));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(3, &docsis_test_case_3));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(4, &docsis_test_case_4));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(5, &docsis_test_case_5));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(6, &docsis_test_case_6));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(7, &docsis_test_case_7));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(8, &docsis_test_case_8));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(9, &docsis_test_case_9));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(10, &docsis_test_case_10));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(11, &docsis_test_case_11));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(12, &docsis_test_case_12));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(13, &docsis_test_case_13));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(14, &docsis_test_case_14));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(15, &docsis_test_case_15));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(16, &docsis_test_case_16));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(17, &docsis_test_case_17));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(18, &docsis_test_case_18));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(19, &docsis_test_case_19));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(20, &docsis_test_case_20));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(21, &docsis_test_case_21));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(22, &docsis_test_case_22));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(23, &docsis_test_case_23));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(24, &docsis_test_case_24));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(25, &docsis_test_case_25));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(26, &docsis_test_case_26));
+
+       if (f)
+               printf("## %s: %d passed out of %d (%d skipped)\n",
+                       __func__, p, n, s);
+
+       return f;
+};
+
+static int
+test_DOCSIS_PROTO_all(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_6);
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_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 TEST_SKIPPED;
+
+       /* Set action type */
+       ut_params->type = gbl_action_type == RTE_SECURITY_ACTION_TYPE_NONE ?
+               RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL :
+               gbl_action_type;
+
+       if (security_proto_supported(ut_params->type,
+                       RTE_SECURITY_PROTOCOL_DOCSIS) < 0)
+               return TEST_SKIPPED;
+
+       status = test_DOCSIS_PROTO_uplink_all();
+       status += test_DOCSIS_PROTO_downlink_all();
+
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
 }
+#endif
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_7(void)
+test_AES_GCM_authenticated_encryption_test_case_1(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_7);
+       return test_authenticated_encryption(&gcm_test_case_1);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_aad_1(void)
+test_AES_GCM_authenticated_encryption_test_case_2(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_aad_1);
+       return test_authenticated_encryption(&gcm_test_case_2);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_aad_2(void)
+test_AES_GCM_authenticated_encryption_test_case_3(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_aad_2);
+       return test_authenticated_encryption(&gcm_test_case_3);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_iv_corrupt(void)
+test_AES_GCM_authenticated_encryption_test_case_4(void)
 {
-       struct aead_test_data tdata;
-       int res;
-
-       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
-       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
-       tdata.iv.data[0] += 1;
-       res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
-               return res;
-       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
-       return TEST_SUCCESS;
+       return test_authenticated_encryption(&gcm_test_case_4);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_in_data_corrupt(void)
+test_AES_GCM_authenticated_encryption_test_case_5(void)
 {
-       struct aead_test_data tdata;
-       int res;
-
-       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
-       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
-       tdata.plaintext.data[0] += 1;
-       res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
-               return res;
-       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
-       return TEST_SUCCESS;
+       return test_authenticated_encryption(&gcm_test_case_5);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_out_data_corrupt(void)
+test_AES_GCM_authenticated_encryption_test_case_6(void)
 {
-       struct aead_test_data tdata;
-       int res;
-
-       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
-       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
-       tdata.ciphertext.data[0] += 1;
-       res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
-               return res;
-       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
-       return TEST_SUCCESS;
+       return test_authenticated_encryption(&gcm_test_case_6);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_aad_len_corrupt(void)
+test_AES_GCM_authenticated_encryption_test_case_7(void)
 {
-       struct aead_test_data tdata;
-       int res;
+       return test_authenticated_encryption(&gcm_test_case_7);
+}
 
-       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
-       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
-       tdata.aad.len += 1;
-       res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
-               return res;
-       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
-       return TEST_SUCCESS;
+static int
+test_AES_GCM_authenticated_encryption_test_case_8(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_8);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_aad_corrupt(void)
+test_AES_GCM_J0_authenticated_encryption_test_case_1(void)
 {
-       struct aead_test_data tdata;
-       uint8_t aad[gcm_test_case_7.aad.len];
-       int res;
+       return test_authenticated_encryption(&gcm_J0_test_case_1);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_1(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_1);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_2(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_2);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_3(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_3);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_4(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_4);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_5(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_5);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_6(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_6);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_7(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_7);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_1(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_1);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_2(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_2);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_3(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_3);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_4(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_4);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_5(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_5);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_6(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_6);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_7(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_7);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_aad_1(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_aad_1);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_aad_2(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_aad_2);
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_iv_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.iv.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == TEST_SKIPPED)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_in_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.plaintext.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == TEST_SKIPPED)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_out_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.ciphertext.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == TEST_SKIPPED)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_aad_len_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.aad.len += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == TEST_SKIPPED)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_aad_corrupt(void)
+{
+       struct aead_test_data tdata;
+       uint8_t aad[gcm_test_case_7.aad.len];
+       int res;
 
        RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
        memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
@@ -7897,7 +9559,7 @@ test_AES_GCM_auth_encryption_fail_aad_corrupt(void)
        aad[0] += 1;
        tdata.aad.data = aad;
        res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
+       if (res == TEST_SKIPPED)
                return res;
        TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
        return TEST_SUCCESS;
@@ -7913,7 +9575,7 @@ test_AES_GCM_auth_encryption_fail_tag_corrupt(void)
        memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
        tdata.auth_tag.data[0] += 1;
        res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
+       if (res == TEST_SKIPPED)
                return res;
        TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
        return TEST_SUCCESS;
@@ -7928,6 +9590,16 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
        int retval;
        uint8_t *plaintext;
        uint32_t i;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -7937,11 +9609,11 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
        capability = rte_cryptodev_sym_capability_get(
                        ts_params->valid_devs[0], &cap_idx);
        if (capability == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        if (rte_cryptodev_sym_capability_check_aead(
                        capability, tdata->key.len, tdata->auth_tag.len,
                        tdata->aad.len, tdata->iv.len))
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
@@ -7977,6 +9649,9 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
        /* Process crypto operation */
        if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
                process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 0, 0, 0);
        else
                TEST_ASSERT_NOT_NULL(
                        process_crypto_request(ts_params->valid_devs[0],
@@ -8168,7 +9843,7 @@ test_AES_GCM_auth_decryption_fail_iv_corrupt(void)
        memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
        tdata.iv.data[0] += 1;
        res = test_authenticated_decryption(&tdata);
-       if (res == -ENOTSUP)
+       if (res == TEST_SKIPPED)
                return res;
        TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
        return TEST_SUCCESS;
@@ -8184,7 +9859,7 @@ test_AES_GCM_auth_decryption_fail_in_data_corrupt(void)
        memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
        tdata.plaintext.data[0] += 1;
        res = test_authenticated_decryption(&tdata);
-       if (res == -ENOTSUP)
+       if (res == TEST_SKIPPED)
                return res;
        TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
        return TEST_SUCCESS;
@@ -8199,7 +9874,7 @@ test_AES_GCM_auth_decryption_fail_out_data_corrupt(void)
        memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
        tdata.ciphertext.data[0] += 1;
        res = test_authenticated_decryption(&tdata);
-       if (res == -ENOTSUP)
+       if (res == TEST_SKIPPED)
                return res;
        TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
        return TEST_SUCCESS;
@@ -8214,7 +9889,7 @@ test_AES_GCM_auth_decryption_fail_aad_len_corrupt(void)
        memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
        tdata.aad.len += 1;
        res = test_authenticated_decryption(&tdata);
-       if (res == -ENOTSUP)
+       if (res == TEST_SKIPPED)
                return res;
        TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
        return TEST_SUCCESS;
@@ -8232,7 +9907,7 @@ test_AES_GCM_auth_decryption_fail_aad_corrupt(void)
        aad[0] += 1;
        tdata.aad.data = aad;
        res = test_authenticated_decryption(&tdata);
-       if (res == -ENOTSUP)
+       if (res == TEST_SKIPPED)
                return res;
        TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
        return TEST_SUCCESS;
@@ -8247,7 +9922,7 @@ test_AES_GCM_auth_decryption_fail_tag_corrupt(void)
        memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
        tdata.auth_tag.data[0] += 1;
        res = test_authenticated_decryption(&tdata);
-       if (res == -ENOTSUP)
+       if (res == TEST_SKIPPED)
                return res;
        TEST_ASSERT_EQUAL(res, TEST_FAILED, "authentication not failed");
        return TEST_SUCCESS;
@@ -8269,11 +9944,14 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata)
        cap_idx.algo.aead = tdata->algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
 
        /* not supported with CPU crypto */
        if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
@@ -8358,11 +10036,12 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata)
        cap_idx.algo.aead = tdata->algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
-       /* not supported with CPU crypto */
-       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-               return -ENOTSUP;
+       /* not supported with CPU crypto and raw data-path APIs*/
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ||
+                       global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               return TEST_SKIPPED;
 
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
@@ -8435,17 +10114,19 @@ 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;
 
-       /* 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))))
-               return -ENOTSUP;
+       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 TEST_SKIPPED;
+       }
 
        /* not supported with CPU crypto */
        if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -8453,7 +10134,7 @@ test_authenticated_encryption_sessionless(
        cap_idx.algo.aead = tdata->algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
@@ -8535,17 +10216,25 @@ 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))))
-               return -ENOTSUP;
+       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 TEST_SKIPPED;
+       }
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* not supported with CPU crypto */
        if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -8553,7 +10242,7 @@ test_authenticated_decryption_sessionless(
        cap_idx.algo.aead = tdata->algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* alloc mbuf and set payload */
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -8584,8 +10273,13 @@ test_authenticated_decryption_sessionless(
                        "crypto op session type not sessionless");
 
        /* 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 (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 0, 0, 0);
+       else
+               TEST_ASSERT_NOT_NULL(process_crypto_request(
+                       ts_params->valid_devs[0], ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
 
@@ -8730,8 +10424,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 TEST_SKIPPED;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -8739,12 +10434,16 @@ test_stats(void)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
+       if (rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
+                       == -ENOTSUP)
+               return TEST_SKIPPED;
 
        rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
        TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0] + 600,
@@ -8752,18 +10451,9 @@ test_stats(void)
                "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();
        test_AES_CBC_HMAC_SHA1_encrypt_digest();
-       ut_teardown();
        TEST_ASSERT_SUCCESS(rte_cryptodev_stats_get(ts_params->valid_devs[0],
                        &stats),
                "rte_cryptodev_stats_get failed");
@@ -8879,6 +10569,16 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)
 
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -8886,7 +10586,7 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_MD5_HMAC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        if (MD5_HMAC_create_session(ts_params, ut_params,
                        RTE_CRYPTO_AUTH_OP_GENERATE, test_case))
@@ -8904,8 +10604,17 @@ 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 if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 0, 0);
+       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");
@@ -8933,6 +10642,16 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)
 
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -8940,7 +10659,7 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_MD5_HMAC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        if (MD5_HMAC_create_session(ts_params, ut_params,
                        RTE_CRYPTO_AUTH_OP_VERIFY, test_case)) {
@@ -8956,8 +10675,17 @@ 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 if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 0, 0);
+       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");
@@ -9006,12 +10734,12 @@ test_multi_session(void)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA512_HMAC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(ut_params,
                        aes_cbc_key, hmac_sha512_key);
@@ -9134,12 +10862,12 @@ test_multi_session_random_usage(void)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA512_HMAC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -9217,190 +10945,79 @@ test_multi_session_random_usage(void)
        return TEST_SUCCESS;
 }
 
+uint8_t orig_data[] = {0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab};
+
 static int
-test_null_cipher_only_operation(void)
+test_null_invalid_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       int ret;
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-
-       /* Generate test mbuf data and space for digest */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+       /* This test is for NULL PMD only */
+       if (gbl_driver_id != rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
+               return TEST_SKIPPED;
 
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.next = NULL;
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
        ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
 
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
        /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                               ut_params->sess,
-                               &ut_params->cipher_xform,
-                               ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
-
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
-
-       /* Process crypto operation */
-       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");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
-
-       return TEST_SUCCESS;
-}
-uint8_t orig_data[] = {0xab, 0xab, 0xab, 0xab,
-                       0xab, 0xab, 0xab, 0xab,
-                       0xab, 0xab, 0xab, 0xab,
-                       0xab, 0xab, 0xab, 0xab};
-static int
-test_null_auth_only_operation(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
-
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-
-       /* Generate test mbuf data and space for digest */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT(ret < 0,
+                       "Session creation succeeded unexpectedly");
 
-       /* create a pointer for digest, but don't expect anything to be written
-        * here in a NULL auth algo so no mbuf append done.
-        */
-       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                       QUOTE_512_BYTES);
-       /* prefill the memory pointed to by digest */
-       memcpy(digest, orig_data, sizeof(orig_data));
 
        /* Setup HMAC Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
        ut_params->auth_xform.next = NULL;
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
        ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
 
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
        /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->auth_xform,
                        ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       sym_op->m_src = ut_params->ibuf;
-
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
-       sym_op->auth.digest.data = digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                       QUOTE_512_BYTES);
-
-       /* Process crypto operation */
-       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");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
-       /* Make sure memory pointed to by digest hasn't been overwritten */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       orig_data,
-                       digest,
-                       sizeof(orig_data),
-                       "Memory at digest ptr overwritten unexpectedly");
+       TEST_ASSERT(ret < 0,
+                       "Session creation succeeded unexpectedly");
 
        return TEST_SUCCESS;
 }
 
 
+#define NULL_BURST_LENGTH (32)
+
 static int
-test_null_cipher_auth_operation(void)
+test_null_burst_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       unsigned i, burst_len = NULL_BURST_LENGTH;
 
-       /* Generate test mbuf data and space for digest */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+       struct rte_crypto_op *burst[NULL_BURST_LENGTH] = { NULL };
+       struct rte_crypto_op *burst_dequeued[NULL_BURST_LENGTH] = { NULL };
 
-       /* create a pointer for digest, but don't expect anything to be written
-        * here in a NULL auth algo so no mbuf append done.
-        */
-       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                       QUOTE_512_BYTES);
-       /* prefill the memory pointed to by digest */
-       memcpy(digest, orig_data, sizeof(orig_data));
+       /* This test is for NULL PMD only */
+       if (gbl_driver_id != rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
+               return TEST_SKIPPED;
 
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
@@ -9425,287 +11042,287 @@ test_null_cipher_auth_operation(void)
                        ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       TEST_ASSERT_EQUAL(rte_crypto_op_bulk_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC, burst, burst_len),
+                       burst_len, "failed to generate burst of crypto ops");
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       /* Generate an operation for each mbuf in burst */
+       for (i = 0; i < burst_len; i++) {
+               struct rte_mbuf *m = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+               TEST_ASSERT_NOT_NULL(m, "Failed to allocate mbuf");
 
-       sym_op->m_src = ut_params->ibuf;
+               unsigned *data = (unsigned *)rte_pktmbuf_append(m,
+                               sizeof(unsigned));
+               *data = i;
 
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
+               rte_crypto_op_attach_sym_session(burst[i], ut_params->sess);
 
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
-       sym_op->auth.digest.data = digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                       QUOTE_512_BYTES);
+               burst[i]->sym->m_src = m;
+       }
 
        /* Process crypto operation */
-       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");
+       TEST_ASSERT_EQUAL(rte_cryptodev_enqueue_burst(ts_params->valid_devs[0],
+                       0, burst, burst_len),
+                       burst_len,
+                       "Error enqueuing burst");
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
+       TEST_ASSERT_EQUAL(rte_cryptodev_dequeue_burst(ts_params->valid_devs[0],
+                       0, burst_dequeued, burst_len),
+                       burst_len,
+                       "Error dequeuing burst");
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
-       /* Make sure memory pointed to by digest hasn't been overwritten */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       orig_data,
-                       digest,
-                       sizeof(orig_data),
-                       "Memory at digest ptr overwritten unexpectedly");
+
+       for (i = 0; i < burst_len; i++) {
+               TEST_ASSERT_EQUAL(
+                       *rte_pktmbuf_mtod(burst[i]->sym->m_src, uint32_t *),
+                       *rte_pktmbuf_mtod(burst_dequeued[i]->sym->m_src,
+                                       uint32_t *),
+                       "data not as expected");
+
+               rte_pktmbuf_free(burst[i]->sym->m_src);
+               rte_crypto_op_free(burst[i]);
+       }
 
        return TEST_SUCCESS;
 }
 
-static int
-test_null_auth_cipher_operation(void)
+static uint16_t
+test_enq_callback(uint16_t dev_id, uint16_t qp_id, struct rte_crypto_op **ops,
+                 uint16_t nb_ops, void *user_param)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
+       RTE_SET_USED(dev_id);
+       RTE_SET_USED(qp_id);
+       RTE_SET_USED(ops);
+       RTE_SET_USED(user_param);
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       printf("crypto enqueue callback called\n");
+       return nb_ops;
+}
 
-       /* Generate test mbuf data */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+static uint16_t
+test_deq_callback(uint16_t dev_id, uint16_t qp_id, struct rte_crypto_op **ops,
+                 uint16_t nb_ops, void *user_param)
+{
+       RTE_SET_USED(dev_id);
+       RTE_SET_USED(qp_id);
+       RTE_SET_USED(ops);
+       RTE_SET_USED(user_param);
 
-       /* create a pointer for digest, but don't expect anything to be written
-        * here in a NULL auth algo so no mbuf append done.
-        */
-       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                               QUOTE_512_BYTES);
-       /* prefill the memory pointed to by digest */
-       memcpy(digest, orig_data, sizeof(orig_data));
+       printf("crypto dequeue callback called\n");
+       return nb_ops;
+}
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+/*
+ * Thread using enqueue/dequeue callback with RCU.
+ */
+static int
+test_enqdeq_callback_thread(void *arg)
+{
+       RTE_SET_USED(arg);
+       /* DP thread calls rte_cryptodev_enqueue_burst()/
+        * rte_cryptodev_dequeue_burst() and invokes callback.
+        */
+       test_null_burst_operation();
+       return 0;
+}
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+static int
+test_enq_callback_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
+       };
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
+       struct rte_cryptodev_cb *cb;
+       uint16_t qp_id = 0;
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       /* Stop the device in case it's started so it can be configured */
+       rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       sym_op->m_src = ut_params->ibuf;
-
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
-
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
-       sym_op->auth.digest.data = digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                                       QUOTE_512_BYTES);
-
-       /* Process crypto operation */
-       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");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
-       /* Make sure memory pointed to by digest hasn't been overwritten */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       orig_data,
-                       digest,
-                       sizeof(orig_data),
-                       "Memory at digest ptr overwritten unexpectedly");
-
-       return TEST_SUCCESS;
-}
-
-
-static int
-test_null_invalid_operation(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       int ret;
+       TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
+                       &ts_params->conf),
+                       "Failed to configure cryptodev %u",
+                       ts_params->valid_devs[0]);
 
-       /* This test is for NULL PMD only */
-       if (gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
-               return -ENOTSUP;
+       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
+       qp_conf.mp_session = ts_params->session_mpool;
+       qp_conf.mp_session_private = ts_params->session_priv_mpool;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+                       ts_params->valid_devs[0], qp_id, &qp_conf,
+                       rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+                       "Failed 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]);
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       /* Test with invalid crypto device */
+       cb = rte_cryptodev_add_enq_callback(RTE_CRYPTO_MAX_DEVS,
+                       qp_id, test_enq_callback, NULL);
+       TEST_ASSERT_NULL(cb, "Add callback on qp %u on "
+                       "cryptodev %u did not fail",
+                       qp_id, RTE_CRYPTO_MAX_DEVS);
+
+       /* Test with invalid queue pair */
+       cb = rte_cryptodev_add_enq_callback(ts_params->valid_devs[0],
+                       dev_info.max_nb_queue_pairs + 1,
+                       test_enq_callback, NULL);
+       TEST_ASSERT_NULL(cb, "Add callback on qp %u on "
+                       "cryptodev %u did not fail",
+                       dev_info.max_nb_queue_pairs + 1,
+                       ts_params->valid_devs[0]);
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Test with NULL callback */
+       cb = rte_cryptodev_add_enq_callback(ts_params->valid_devs[0],
+                       qp_id, NULL, NULL);
+       TEST_ASSERT_NULL(cb, "Add callback on qp %u on "
+                       "cryptodev %u did not fail",
+                       qp_id, ts_params->valid_devs[0]);
 
-       /* Create Crypto session*/
-       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT(ret < 0,
-                       "Session creation succeeded unexpectedly");
+       /* Test with valid configuration */
+       cb = rte_cryptodev_add_enq_callback(ts_params->valid_devs[0],
+                       qp_id, test_enq_callback, NULL);
+       TEST_ASSERT_NOT_NULL(cb, "Failed test to add callback on "
+                       "qp %u on cryptodev %u",
+                       qp_id, ts_params->valid_devs[0]);
 
+       rte_cryptodev_start(ts_params->valid_devs[0]);
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       /* Launch a thread */
+       rte_eal_remote_launch(test_enqdeq_callback_thread, NULL,
+                               rte_get_next_lcore(-1, 1, 0));
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       /* Wait until reader exited. */
+       rte_eal_mp_wait_lcore();
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Test with invalid crypto device */
+       TEST_ASSERT_FAIL(rte_cryptodev_remove_enq_callback(
+                       RTE_CRYPTO_MAX_DEVS, qp_id, cb),
+                       "Expected call to fail as crypto device is invalid");
 
-       /* Create Crypto session*/
-       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT(ret < 0,
-                       "Session creation succeeded unexpectedly");
+       /* Test with invalid queue pair */
+       TEST_ASSERT_FAIL(rte_cryptodev_remove_enq_callback(
+                       ts_params->valid_devs[0],
+                       dev_info.max_nb_queue_pairs + 1, cb),
+                       "Expected call to fail as queue pair is invalid");
+
+       /* Test with NULL callback */
+       TEST_ASSERT_FAIL(rte_cryptodev_remove_enq_callback(
+                       ts_params->valid_devs[0], qp_id, NULL),
+                       "Expected call to fail as callback is NULL");
+
+       /* Test with valid configuration */
+       TEST_ASSERT_SUCCESS(rte_cryptodev_remove_enq_callback(
+                       ts_params->valid_devs[0], qp_id, cb),
+                       "Failed test to remove callback on "
+                       "qp %u on cryptodev %u",
+                       qp_id, ts_params->valid_devs[0]);
 
        return TEST_SUCCESS;
 }
 
-
-#define NULL_BURST_LENGTH (32)
-
 static int
-test_null_burst_operation(void)
+test_deq_callback_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       unsigned i, burst_len = NULL_BURST_LENGTH;
-
-       struct rte_crypto_op *burst[NULL_BURST_LENGTH] = { NULL };
-       struct rte_crypto_op *burst_dequeued[NULL_BURST_LENGTH] = { NULL };
-
-       /* This test is for NULL PMD only */
-       if (gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
-               return -ENOTSUP;
-
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
-
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_qp_conf qp_conf = {
+               .nb_descriptors = MAX_NUM_OPS_INFLIGHT
+       };
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       struct rte_cryptodev_cb *cb;
+       uint16_t qp_id = 0;
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Stop the device in case it's started so it can be configured */
+       rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       TEST_ASSERT_EQUAL(rte_crypto_op_bulk_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC, burst, burst_len),
-                       burst_len, "failed to generate burst of crypto ops");
+       TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
+                       &ts_params->conf),
+                       "Failed to configure cryptodev %u",
+                       ts_params->valid_devs[0]);
 
-       /* Generate an operation for each mbuf in burst */
-       for (i = 0; i < burst_len; i++) {
-               struct rte_mbuf *m = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
+       qp_conf.mp_session = ts_params->session_mpool;
+       qp_conf.mp_session_private = ts_params->session_priv_mpool;
 
-               TEST_ASSERT_NOT_NULL(m, "Failed to allocate mbuf");
+       TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+                       ts_params->valid_devs[0], qp_id, &qp_conf,
+                       rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+                       "Failed 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]);
 
-               unsigned *data = (unsigned *)rte_pktmbuf_append(m,
-                               sizeof(unsigned));
-               *data = i;
+       /* Test with invalid crypto device */
+       cb = rte_cryptodev_add_deq_callback(RTE_CRYPTO_MAX_DEVS,
+                       qp_id, test_deq_callback, NULL);
+       TEST_ASSERT_NULL(cb, "Add callback on qp %u on "
+                       "cryptodev %u did not fail",
+                       qp_id, RTE_CRYPTO_MAX_DEVS);
+
+       /* Test with invalid queue pair */
+       cb = rte_cryptodev_add_deq_callback(ts_params->valid_devs[0],
+                       dev_info.max_nb_queue_pairs + 1,
+                       test_deq_callback, NULL);
+       TEST_ASSERT_NULL(cb, "Add callback on qp %u on "
+                       "cryptodev %u did not fail",
+                       dev_info.max_nb_queue_pairs + 1,
+                       ts_params->valid_devs[0]);
 
-               rte_crypto_op_attach_sym_session(burst[i], ut_params->sess);
+       /* Test with NULL callback */
+       cb = rte_cryptodev_add_deq_callback(ts_params->valid_devs[0],
+                       qp_id, NULL, NULL);
+       TEST_ASSERT_NULL(cb, "Add callback on qp %u on "
+                       "cryptodev %u did not fail",
+                       qp_id, ts_params->valid_devs[0]);
 
-               burst[i]->sym->m_src = m;
-       }
+       /* Test with valid configuration */
+       cb = rte_cryptodev_add_deq_callback(ts_params->valid_devs[0],
+                       qp_id, test_deq_callback, NULL);
+       TEST_ASSERT_NOT_NULL(cb, "Failed test to add callback on "
+                       "qp %u on cryptodev %u",
+                       qp_id, ts_params->valid_devs[0]);
 
-       /* Process crypto operation */
-       TEST_ASSERT_EQUAL(rte_cryptodev_enqueue_burst(ts_params->valid_devs[0],
-                       0, burst, burst_len),
-                       burst_len,
-                       "Error enqueuing burst");
+       rte_cryptodev_start(ts_params->valid_devs[0]);
 
-       TEST_ASSERT_EQUAL(rte_cryptodev_dequeue_burst(ts_params->valid_devs[0],
-                       0, burst_dequeued, burst_len),
-                       burst_len,
-                       "Error dequeuing burst");
+       /* Launch a thread */
+       rte_eal_remote_launch(test_enqdeq_callback_thread, NULL,
+                               rte_get_next_lcore(-1, 1, 0));
 
+       /* Wait until reader exited. */
+       rte_eal_mp_wait_lcore();
 
-       for (i = 0; i < burst_len; i++) {
-               TEST_ASSERT_EQUAL(
-                       *rte_pktmbuf_mtod(burst[i]->sym->m_src, uint32_t *),
-                       *rte_pktmbuf_mtod(burst_dequeued[i]->sym->m_src,
-                                       uint32_t *),
-                       "data not as expected");
+       /* Test with invalid crypto device */
+       TEST_ASSERT_FAIL(rte_cryptodev_remove_deq_callback(
+                       RTE_CRYPTO_MAX_DEVS, qp_id, cb),
+                       "Expected call to fail as crypto device is invalid");
 
-               rte_pktmbuf_free(burst[i]->sym->m_src);
-               rte_crypto_op_free(burst[i]);
-       }
+       /* Test with invalid queue pair */
+       TEST_ASSERT_FAIL(rte_cryptodev_remove_deq_callback(
+                       ts_params->valid_devs[0],
+                       dev_info.max_nb_queue_pairs + 1, cb),
+                       "Expected call to fail as queue pair is invalid");
+
+       /* Test with NULL callback */
+       TEST_ASSERT_FAIL(rte_cryptodev_remove_deq_callback(
+                       ts_params->valid_devs[0], qp_id, NULL),
+                       "Expected call to fail as callback is NULL");
+
+       /* Test with valid configuration */
+       TEST_ASSERT_SUCCESS(rte_cryptodev_remove_deq_callback(
+                       ts_params->valid_devs[0], qp_id, cb),
+                       "Failed test to remove callback on "
+                       "qp %u on cryptodev %u",
+                       qp_id, ts_params->valid_devs[0]);
 
        return TEST_SUCCESS;
 }
@@ -9769,6 +11386,53 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
        return 0;
 }
 
+static int
+create_gmac_operation_sgl(enum rte_crypto_auth_operation op,
+               const struct gmac_test_data *tdata,
+               void *digest_mem, uint64_t digest_phys)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_crypto_sym_op *sym_op;
+
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate symmetric crypto operation struct");
+
+       sym_op = ut_params->op->sym;
+
+       sym_op->auth.digest.data = digest_mem;
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append digest");
+
+       sym_op->auth.digest.phys_addr = digest_phys;
+
+       if (op == RTE_CRYPTO_AUTH_OP_VERIFY) {
+               rte_memcpy(sym_op->auth.digest.data, tdata->gmac_tag.data,
+                               tdata->gmac_tag.len);
+               debug_hexdump(stdout, "digest:",
+                               sym_op->auth.digest.data,
+                               tdata->gmac_tag.len);
+       }
+
+       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);
+
+       sym_op->cipher.data.length = 0;
+       sym_op->cipher.data.offset = 0;
+
+       sym_op->auth.data.offset = 0;
+       sym_op->auth.data.length = tdata->plaintext.len;
+
+       return 0;
+}
+
 static int create_gmac_session(uint8_t dev_id,
                const struct gmac_test_data *tdata,
                enum rte_crypto_auth_operation auth_op)
@@ -9809,6 +11473,16 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        int retval;
 
@@ -9824,7 +11498,7 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        retval = create_gmac_session(ts_params->valid_devs[0],
                        tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
@@ -9870,7 +11544,11 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
        ut_params->op->sym->m_src = ut_params->ibuf;
 
        if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-               process_cpu_gmac_op(ts_params->valid_devs[0], ut_params->op);
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 0, 0);
        else
                TEST_ASSERT_NOT_NULL(
                        process_crypto_request(ts_params->valid_devs[0],
@@ -9929,6 +11607,16 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
        int retval;
        uint32_t plaintext_pad_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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
                              "No GMAC length in the source data");
@@ -9939,7 +11627,7 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
        cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        retval = create_gmac_session(ts_params->valid_devs[0],
                        tdata, RTE_CRYPTO_AUTH_OP_VERIFY);
@@ -9986,7 +11674,11 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
        ut_params->op->sym->m_src = ut_params->ibuf;
 
        if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-               process_cpu_gmac_op(ts_params->valid_devs[0], ut_params->op);
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 0, 0);
        else
                TEST_ASSERT_NOT_NULL(
                        process_crypto_request(ts_params->valid_devs[0],
@@ -10023,13 +11715,173 @@ test_AES_GMAC_authentication_verify_test_case_4(void)
        return test_AES_GMAC_authentication_verify(&gmac_test_case_4);
 }
 
-struct test_crypto_vector {
-       enum rte_crypto_cipher_algorithm crypto_algo;
-       unsigned int cipher_offset;
-       unsigned int cipher_len;
+static int
+test_AES_GMAC_authentication_SGL(const struct gmac_test_data *tdata,
+                               uint32_t fragsz)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_cryptodev_info dev_info;
+       uint64_t feature_flags;
+       unsigned int trn_data = 0;
+       void *digest_mem = NULL;
+       uint32_t segs = 1;
+       unsigned int to_trn = 0;
+       struct rte_mbuf *buf = NULL;
+       uint8_t *auth_tag, *plaintext;
+       int retval;
 
-       struct {
-               uint8_t data[64];
+       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
+                             "No GMAC length in the source data");
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return TEST_SKIPPED;
+
+       /* Check for any input SGL support */
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       feature_flags = dev_info.feature_flags;
+
+       if ((!(feature_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) ||
+                       (!(feature_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT)) ||
+                       (!(feature_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)))
+               return TEST_SKIPPED;
+
+       if (fragsz > tdata->plaintext.len)
+               fragsz = tdata->plaintext.len;
+
+       uint16_t plaintext_len = fragsz;
+
+       retval = create_gmac_session(ts_params->valid_devs[0],
+                       tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
+
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+
+       trn_data += plaintext_len;
+
+       buf = ut_params->ibuf;
+
+       /*
+        * Loop until no more fragments
+        */
+
+       while (trn_data < tdata->plaintext.len) {
+               ++segs;
+               to_trn = (tdata->plaintext.len - trn_data < fragsz) ?
+                               (tdata->plaintext.len - trn_data) : fragsz;
+
+               buf->next = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               buf = buf->next;
+
+               memset(rte_pktmbuf_mtod(buf, uint8_t *), 0,
+                               rte_pktmbuf_tailroom(buf));
+
+               plaintext = (uint8_t *)rte_pktmbuf_append(buf,
+                               to_trn);
+
+               memcpy(plaintext, tdata->plaintext.data + trn_data,
+                               to_trn);
+               trn_data += to_trn;
+               if (trn_data  == tdata->plaintext.len)
+                       digest_mem = (uint8_t *)rte_pktmbuf_append(buf,
+                                       tdata->gmac_tag.len);
+       }
+       ut_params->ibuf->nb_segs = segs;
+
+       /*
+        * Place digest at the end of the last buffer
+        */
+       uint64_t digest_phys = rte_pktmbuf_iova(buf) + to_trn;
+
+       if (!digest_mem) {
+               digest_mem = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               + tdata->gmac_tag.len);
+               digest_phys = rte_pktmbuf_iova_offset(ut_params->ibuf,
+                               tdata->plaintext.len);
+       }
+
+       retval = create_gmac_operation_sgl(RTE_CRYPTO_AUTH_OP_GENERATE,
+                       tdata, digest_mem, digest_phys);
+
+       if (retval < 0)
+               return retval;
+
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+
+       ut_params->op->sym->m_src = ut_params->ibuf;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return TEST_SKIPPED;
+
+       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");
+
+       auth_tag = digest_mem;
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       auth_tag,
+                       tdata->gmac_tag.data,
+                       tdata->gmac_tag.len,
+                       "GMAC Generated auth tag not as expected");
+
+       return 0;
+}
+
+/* Segment size not multiple of block size (16B) */
+static int
+test_AES_GMAC_authentication_SGL_40B(void)
+{
+       return test_AES_GMAC_authentication_SGL(&gmac_test_case_1, 40);
+}
+
+static int
+test_AES_GMAC_authentication_SGL_80B(void)
+{
+       return test_AES_GMAC_authentication_SGL(&gmac_test_case_1, 80);
+}
+
+static int
+test_AES_GMAC_authentication_SGL_2048B(void)
+{
+       return test_AES_GMAC_authentication_SGL(&gmac_test_case_5, 2048);
+}
+
+/* Segment size not multiple of block size (16B) */
+static int
+test_AES_GMAC_authentication_SGL_2047B(void)
+{
+       return test_AES_GMAC_authentication_SGL(&gmac_test_case_5, 2047);
+}
+
+struct test_crypto_vector {
+       enum rte_crypto_cipher_algorithm crypto_algo;
+       unsigned int cipher_offset;
+       unsigned int cipher_len;
+
+       struct {
+               uint8_t data[64];
                unsigned int len;
        } cipher_key;
 
@@ -10172,7 +12024,7 @@ aes128cbc_hmac_sha1_test_vector = {
 static const struct test_crypto_vector
 aes128cbc_hmac_sha1_aad_test_vector = {
        .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
-       .cipher_offset = 12,
+       .cipher_offset = 8,
        .cipher_len = 496,
        .cipher_key = {
                .data = {
@@ -10208,9 +12060,9 @@ aes128cbc_hmac_sha1_aad_test_vector = {
        },
        .digest = {
                .data = {
-                       0x1F, 0x6A, 0xD2, 0x8B, 0x4B, 0xB3, 0xC0, 0x9E,
-                       0x86, 0x9B, 0x3A, 0xF2, 0x00, 0x5B, 0x4F, 0x08,
-                       0x62, 0x8D, 0x62, 0x65
+                       0x6D, 0xF3, 0x50, 0x79, 0x7A, 0x2A, 0xAC, 0x7F,
+                       0xA6, 0xF0, 0xC6, 0x38, 0x1F, 0xA4, 0xDD, 0x9B,
+                       0x62, 0x0F, 0xFB, 0x10
                },
                .len = 20
        }
@@ -10502,6 +12354,16 @@ test_authentication_verify_fail_when_data_corruption(
        int retval;
 
        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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -10509,7 +12371,8 @@ test_authentication_verify_fail_when_data_corruption(
        cap_idx.algo.auth = reference->auth_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
+
 
        /* Create session */
        retval = create_auth_session(ut_params,
@@ -10546,10 +12409,20 @@ 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 if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 0, 0);
+       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;
 }
@@ -10563,6 +12436,16 @@ test_authentication_verify_GMAC_fail_when_corruption(
 {
        int retval;
        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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -10570,7 +12453,7 @@ test_authentication_verify_GMAC_fail_when_corruption(
        cap_idx.algo.auth = reference->auth_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create session */
        retval = create_auth_cipher_session(ut_params,
@@ -10611,11 +12494,15 @@ test_authentication_verify_GMAC_fail_when_corruption(
                tag_corruption(plaintext, reference->aad.len);
 
        if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
-               process_cpu_gmac_op(ts_params->valid_devs[0], ut_params->op);
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
                TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
                        RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "authentication not failed");
-       } else {
+       } else if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 1, 0, 0);
+       else {
                ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
                TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
@@ -10634,6 +12521,16 @@ test_authenticated_decryption_fail_when_corruption(
        int retval;
 
        uint8_t *ciphertext;
+       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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -10641,12 +12538,12 @@ test_authenticated_decryption_fail_when_corruption(
        cap_idx.algo.auth = reference->auth_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = reference->crypto_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create session */
        retval = create_auth_cipher_session(ut_params,
@@ -10684,10 +12581,20 @@ 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 if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 0, 0);
+       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;
 }
@@ -10704,6 +12611,16 @@ test_authenticated_encryt_with_esn(
        uint16_t plaintext_pad_len;
        uint8_t cipher_key[reference->cipher_key.len + 1];
        uint8_t auth_key[reference->auth_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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -10711,12 +12628,12 @@ test_authenticated_encryt_with_esn(
        cap_idx.algo.auth = reference->auth_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = reference->crypto_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create session */
        memcpy(cipher_key, reference->cipher_key.data,
@@ -10775,8 +12692,15 @@ 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 if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 0, 0);
+       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");
 
@@ -10820,6 +12744,16 @@ test_authenticated_decrypt_with_esn(
        uint8_t *ciphertext;
        uint8_t cipher_key[reference->cipher_key.len + 1];
        uint8_t auth_key[reference->auth_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;
+
+       if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+               printf("Device doesn't support RAW data-path APIs.\n");
+               return TEST_SKIPPED;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -10827,12 +12761,12 @@ test_authenticated_decrypt_with_esn(
        cap_idx.algo.auth = reference->auth_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = reference->crypto_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Create session */
        memcpy(cipher_key, reference->cipher_key.data,
@@ -10891,7 +12825,14 @@ 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 if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 1, 1, 0, 0);
+       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");
@@ -11017,11 +12958,11 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
        cap_idx.algo.aead = tdata->algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* OOP not supported with CPU crypto */
        if (oop && gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        /* Detailed check for the particular SGL support flag */
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
@@ -11029,23 +12970,34 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
                unsigned int sgl_in = fragsz < tdata->plaintext.len;
                if (sgl_in && (!(dev_info.feature_flags &
                                RTE_CRYPTODEV_FF_IN_PLACE_SGL)))
-                       return -ENOTSUP;
+                       return TEST_SKIPPED;
+
+               uint64_t feat_flags = dev_info.feature_flags;
+
+               if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
+                       (!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
+                       printf("Device doesn't support RAW data-path APIs.\n");
+                       return TEST_SKIPPED;
+               }
        } else {
                unsigned int sgl_in = fragsz < tdata->plaintext.len;
                unsigned int sgl_out = (fragsz_oop ? fragsz_oop : fragsz) <
                                tdata->plaintext.len;
+               /* Raw data path API does not support OOP */
+               if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+                       return TEST_SKIPPED;
                if (sgl_in && !sgl_out) {
                        if (!(dev_info.feature_flags &
                                        RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT))
-                               return -ENOTSUP;
+                               return TEST_SKIPPED;
                } else if (!sgl_in && sgl_out) {
                        if (!(dev_info.feature_flags &
                                        RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT))
-                               return -ENOTSUP;
+                               return TEST_SKIPPED;
                } else if (sgl_in && sgl_out) {
                        if (!(dev_info.feature_flags &
                                        RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT))
-                               return -ENOTSUP;
+                               return TEST_SKIPPED;
                }
        }
 
@@ -11229,6 +13181,9 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
        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 if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
+               process_sym_raw_dp_op(ts_params->valid_devs[0], 0,
+                               ut_params->op, 0, 0, 0, 0);
        else
                TEST_ASSERT_NOT_NULL(
                        process_crypto_request(ts_params->valid_devs[0],
@@ -11313,7 +13268,7 @@ test_AES_GCM_auth_encrypt_SGL_in_place_1500B(void)
        /* This test is not for OPENSSL PMD */
        if (gbl_driver_id == rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)))
-               return -ENOTSUP;
+               return TEST_SKIPPED;
 
        return test_authenticated_encryption_SGL(
                        &gcm_test_case_SGL_1, IN_PLACE, 1500, 0);
@@ -11447,1119 +13402,349 @@ auth_decrypt_AES128CBC_HMAC_SHA1_esn_check(void)
                        &aes128cbc_hmac_sha1_aad_test_vector);
 }
 
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
-
-/* global AESNI slave IDs for the scheduler test */
-uint8_t aesni_ids[2];
+static int
+test_chacha20_poly1305_encrypt_test_case_rfc8439(void)
+{
+       return test_authenticated_encryption(&chacha20_poly1305_case_rfc8439);
+}
 
 static int
-test_scheduler_attach_slave_op(void)
+test_chacha20_poly1305_decrypt_test_case_rfc8439(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       uint32_t nb_devs, i, nb_devs_attached = 0;
-       int ret;
-       char vdev_name[32];
+       return test_authenticated_decryption(&chacha20_poly1305_case_rfc8439);
+}
 
-       /* create 2 AESNI_MB if necessary */
-       nb_devs = rte_cryptodev_device_count_by_driver(
-                       rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)));
-       if (nb_devs < 2) {
-               for (i = nb_devs; i < 2; i++) {
-                       snprintf(vdev_name, sizeof(vdev_name), "%s_%u",
-                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD),
-                                       i);
-                       ret = rte_vdev_init(vdev_name, NULL);
+#ifdef RTE_CRYPTO_SCHEDULER
 
-                       TEST_ASSERT(ret == 0,
-                               "Failed to create instance %u of"
-                               " pmd : %s",
-                               i, RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-               }
-       }
+/* global AESNI worker IDs for the scheduler test */
+uint8_t aesni_ids[2];
 
-       /* attach 2 AESNI_MB cdevs */
-       for (i = 0; i < rte_cryptodev_count() && nb_devs_attached < 2;
-                       i++) {
-               struct rte_cryptodev_info info;
-               unsigned int session_size;
+static int
+scheduler_testsuite_setup(void)
+{
+       uint32_t i = 0;
+       int32_t nb_devs, ret;
+       char vdev_args[VDEV_ARGS_SIZE] = {""};
+       char temp_str[VDEV_ARGS_SIZE] = {"mode=multi-core,"
+               "ordering=enable,name=cryptodev_test_scheduler,corelist="};
+       uint16_t worker_core_count = 0;
+       uint16_t socket_id = 0;
 
-               rte_cryptodev_info_get(i, &info);
-               if (info.driver_id != rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)))
-                       continue;
+       if (gbl_driver_id == rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD))) {
 
-               session_size = rte_cryptodev_sym_get_private_session_size(i);
-               /*
-                * Create the session mempool again, since now there are new devices
-                * to use the mempool.
+               /* Identify the Worker Cores
+                * Use 2 worker cores for the device args
                 */
-               if (ts_params->session_mpool) {
-                       rte_mempool_free(ts_params->session_mpool);
-                       ts_params->session_mpool = NULL;
-               }
-               if (ts_params->session_priv_mpool) {
-                       rte_mempool_free(ts_params->session_priv_mpool);
-                       ts_params->session_priv_mpool = NULL;
+               RTE_LCORE_FOREACH_WORKER(i) {
+                       if (worker_core_count > 1)
+                               break;
+                       snprintf(vdev_args, sizeof(vdev_args),
+                                       "%s%d", temp_str, i);
+                       strcpy(temp_str, vdev_args);
+                       strlcat(temp_str, ";", sizeof(temp_str));
+                       worker_core_count++;
+                       socket_id = rte_lcore_to_socket_id(i);
                }
-
-               if (info.sym.max_nb_sessions != 0 &&
-                               info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+               if (worker_core_count != 2) {
                        RTE_LOG(ERR, USER1,
-                                       "Device does not support "
-                                       "at least %u sessions\n",
-                                       MAX_NB_SESSIONS);
+                               "Cryptodev scheduler test require at least "
+                               "two worker cores to run. "
+                               "Please use the correct coremask.\n");
                        return TEST_FAILED;
                }
-               /*
-                * Create mempool with maximum number of sessions,
-                * to include the session headers
-                */
-               if (ts_params->session_mpool == NULL) {
-                       ts_params->session_mpool =
-                               rte_cryptodev_sym_session_pool_create(
-                                               "test_sess_mp",
-                                               MAX_NB_SESSIONS, 0, 0, 0,
-                                               SOCKET_ID_ANY);
-                       TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
-                                       "session mempool allocation failed");
-               }
-
-               /*
-                * Create mempool with maximum number of sessions,
-                * to include device specific session private data
-                */
-               if (ts_params->session_priv_mpool == NULL) {
-                       ts_params->session_priv_mpool = rte_mempool_create(
-                                       "test_sess_mp_priv",
-                                       MAX_NB_SESSIONS,
-                                       session_size,
-                                       0, 0, NULL, NULL, NULL,
-                                       NULL, SOCKET_ID_ANY,
-                                       0);
-
-                       TEST_ASSERT_NOT_NULL(ts_params->session_priv_mpool,
-                                       "session mempool allocation failed");
+               strcpy(temp_str, vdev_args);
+               snprintf(vdev_args, sizeof(vdev_args), "%s,socket_id=%d",
+                               temp_str, socket_id);
+               RTE_LOG(DEBUG, USER1, "vdev_args: %s\n", vdev_args);
+               nb_devs = rte_cryptodev_device_count_by_driver(
+                               rte_cryptodev_driver_id_get(
+                               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)));
+               if (nb_devs < 1) {
+                       ret = rte_vdev_init(
+                               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),
+                                       vdev_args);
+                       TEST_ASSERT(ret == 0,
+                               "Failed to create instance %u of pmd : %s",
+                               i, RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD));
                }
-
-               ts_params->qp_conf.mp_session = ts_params->session_mpool;
-               ts_params->qp_conf.mp_session_private =
-                               ts_params->session_priv_mpool;
-
-               ret = rte_cryptodev_scheduler_slave_attach(sched_id,
-                               (uint8_t)i);
-
-               TEST_ASSERT(ret == 0,
-                       "Failed to attach device %u of pmd : %s", i,
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-
-               aesni_ids[nb_devs_attached] = (uint8_t)i;
-
-               nb_devs_attached++;
        }
-
-       return 0;
+       return testsuite_setup();
 }
 
 static int
-test_scheduler_detach_slave_op(void)
+test_scheduler_attach_slave_op(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        uint8_t sched_id = ts_params->valid_devs[0];
-       uint32_t i;
+       uint32_t nb_devs, i, nb_devs_attached = 0;
        int ret;
+       char vdev_name[32];
 
-       for (i = 0; i < 2; i++) {
-               ret = rte_cryptodev_scheduler_slave_detach(sched_id,
-                               aesni_ids[i]);
-               TEST_ASSERT(ret == 0,
-                       "Failed to detach device %u", aesni_ids[i]);
-       }
-
-       return 0;
-}
-
-static int
-test_scheduler_mode_op(enum rte_cryptodev_scheduler_mode scheduler_mode)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       /* set mode */
-       return rte_cryptodev_scheduler_mode_set(sched_id,
-               scheduler_mode);
-}
-
-static int
-test_scheduler_mode_roundrobin_op(void)
-{
-       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_ROUNDROBIN) ==
-                       0, "Failed to set roundrobin mode");
-       return 0;
-
-}
-
-static int
-test_scheduler_mode_multicore_op(void)
-{
-       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_MULTICORE) ==
-                       0, "Failed to set multicore mode");
-
-       return 0;
-}
-
-static int
-test_scheduler_mode_failover_op(void)
-{
-       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_FAILOVER) ==
-                       0, "Failed to set failover mode");
-
-       return 0;
-}
-
-static int
-test_scheduler_mode_pkt_size_distr_op(void)
-{
-       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_PKT_SIZE_DISTR) ==
-                       0, "Failed to set pktsize mode");
-
-       return 0;
-}
-
-static struct unit_test_suite cryptodev_scheduler_testsuite  = {
-       .suite_name = "Crypto Device Scheduler Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /* Multi Core */
-               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_multicore_op),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
-
-               /* Round Robin */
-               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_roundrobin_op),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
-
-               /* Fail over */
-               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_failover_op),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
-
-               /* PKT SIZE */
-               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_pkt_size_distr_op),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
-
-static struct unit_test_suite cryptodev_testsuite  = {
-       .suite_name = "Crypto 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_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_multi_session),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_invalid_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_null_burst_operation),
-
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_docsis_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_docsis_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_stats),
-
-               /** AES CCM Authenticated Encryption 128 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_3),
-
-               /** AES CCM Authenticated Decryption 128 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_3),
-
-               /** AES CCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_3),
-
-               /** AES CCM Authenticated Decryption 192 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_3),
-
-               /** AES CCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_3),
-
-               /** AES CCM Authenticated Decryption 256 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_3),
-
-               /** 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),
-               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,
-                       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),
-               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,
-                       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),
-
-               /** AES GCM Authenticated Encryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_2),
-
-               /** AES GCM Authenticated Decryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_2),
-
-               /** 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),
-
-               /** Session-less tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
-
-               /** AES GMAC Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_4),
-
-               /** 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_encryption_test_case_1_offset_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
-
-               /** SNOW 3G generate auth, then encrypt (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
-
-               /** SNOW 3G decrypt (UEA2), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl),
-
-               /** 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_decryption_with_digest_test_case_1),
-               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),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_6),
-               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),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_cipher_auth_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_with_digest_test_case_1),
-
-               /** 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),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
-
-               /** ZUC authenticate (EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
-               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),
-
-               /** ZUC alg-chain (EEA3/EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_cipher_auth_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_cipher_auth_test_case_2),
-
-               /** ZUC generate auth, then encrypt (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_oop_sgl),
-
-               /** ZUC decrypt (EEA3), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_oop_sgl),
-
-               /** 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),
-
-               /** KASUMI hash only (UIA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_6),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
-
-               /** KASUMI encrypt only (UEA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
-
-               /** KASUMI decrypt only (UEA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
+       /* create 2 AESNI_MB if necessary */
+       nb_devs = rte_cryptodev_device_count_by_driver(
+                       rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)));
+       if (nb_devs < 2) {
+               for (i = nb_devs; i < 2; i++) {
+                       snprintf(vdev_name, sizeof(vdev_name), "%s_%u",
+                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD),
+                                       i);
+                       ret = rte_vdev_init(vdev_name, NULL);
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_cipher_auth_test_case_1),
+                       TEST_ASSERT(ret == 0,
+                               "Failed to create instance %u of"
+                               " pmd : %s",
+                               i, RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+               }
+       }
 
-               /** KASUMI generate auth, then encrypt (F8) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
+       /* attach 2 AESNI_MB cdevs */
+       for (i = 0; i < rte_cryptodev_count() && nb_devs_attached < 2;
+                       i++) {
+               struct rte_cryptodev_info info;
+               unsigned int session_size;
 
-               /** KASUMI decrypt (F8), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
+               rte_cryptodev_info_get(i, &info);
+               if (info.driver_id != rte_cryptodev_driver_id_get(
+                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)))
+                       continue;
 
-               /** 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),
+               session_size = rte_cryptodev_sym_get_private_session_size(i);
+               /*
+                * Create the session mempool again, since now there are new devices
+                * to use the mempool.
+                */
+               if (ts_params->session_mpool) {
+                       rte_mempool_free(ts_params->session_mpool);
+                       ts_params->session_mpool = NULL;
+               }
+               if (ts_params->session_priv_mpool) {
+                       rte_mempool_free(ts_params->session_priv_mpool);
+                       ts_params->session_priv_mpool = NULL;
+               }
 
-               /** Negative tests */
-               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,
-                       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_AES128_GMAC_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_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),
+               if (info.sym.max_nb_sessions != 0 &&
+                               info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+                       RTE_LOG(ERR, USER1,
+                                       "Device does not support "
+                                       "at least %u sessions\n",
+                                       MAX_NB_SESSIONS);
+                       return TEST_FAILED;
+               }
+               /*
+                * Create mempool with maximum number of sessions,
+                * to include the session headers
+                */
+               if (ts_params->session_mpool == NULL) {
+                       ts_params->session_mpool =
+                               rte_cryptodev_sym_session_pool_create(
+                                               "test_sess_mp",
+                                               MAX_NB_SESSIONS, 0, 0, 0,
+                                               SOCKET_ID_ANY);
+                       TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
+                                       "session mempool allocation failed");
+               }
 
-               /** Mixed CIPHER + HASH algorithms */
-               /** AUTH AES CMAC + CIPHER AES CTR */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_aes_cmac_aes_ctr_digest_enc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                  test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
+               /*
+                * Create mempool with maximum number of sessions,
+                * to include device specific session private data
+                */
+               if (ts_params->session_priv_mpool == NULL) {
+                       ts_params->session_priv_mpool = rte_mempool_create(
+                                       "test_sess_mp_priv",
+                                       MAX_NB_SESSIONS,
+                                       session_size,
+                                       0, 0, NULL, NULL, NULL,
+                                       NULL, SOCKET_ID_ANY,
+                                       0);
 
-               /** AUTH ZUC + CIPHER SNOW3G */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_zuc_cipher_snow_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_zuc_cipher_snow_test_case_1),
-               /** AUTH AES CMAC + CIPHER SNOW3G */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_aes_cmac_cipher_snow_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_aes_cmac_cipher_snow_test_case_1),
-               /** AUTH ZUC + CIPHER AES CTR */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_zuc_cipher_aes_ctr_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_zuc_cipher_aes_ctr_test_case_1),
-               /** AUTH SNOW3G + CIPHER AES CTR */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_snow_cipher_aes_ctr_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_snow_cipher_aes_ctr_test_case_1),
-               /** AUTH SNOW3G + CIPHER ZUC */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_snow_cipher_zuc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_snow_cipher_zuc_test_case_1),
-               /** AUTH AES CMAC + CIPHER ZUC */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_aes_cmac_cipher_zuc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_aes_cmac_cipher_zuc_test_case_1),
+                       TEST_ASSERT_NOT_NULL(ts_params->session_priv_mpool,
+                                       "session mempool allocation failed");
+               }
 
-               /** AUTH NULL + CIPHER SNOW3G */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_null_cipher_snow_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_null_cipher_snow_test_case_1),
-               /** AUTH NULL + CIPHER ZUC */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_null_cipher_zuc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_null_cipher_zuc_test_case_1),
-               /** AUTH SNOW3G + CIPHER NULL */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_snow_cipher_null_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_snow_cipher_null_test_case_1),
-               /** AUTH ZUC + CIPHER NULL */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_zuc_cipher_null_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_zuc_cipher_null_test_case_1),
-               /** AUTH NULL + CIPHER AES CTR */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_null_cipher_aes_ctr_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_null_cipher_aes_ctr_test_case_1),
-               /** AUTH AES CMAC + CIPHER NULL */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_aes_cmac_cipher_null_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_aes_cmac_cipher_null_test_case_1),
+               ts_params->qp_conf.mp_session = ts_params->session_mpool;
+               ts_params->qp_conf.mp_session_private =
+                               ts_params->session_priv_mpool;
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               ret = rte_cryptodev_scheduler_worker_attach(sched_id,
+                               (uint8_t)i);
 
-static struct unit_test_suite cryptodev_virtio_testsuite = {
-       .suite_name = "Crypto VIRTIO Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_ASSERT(ret == 0,
+                       "Failed to attach device %u of pmd : %s", i,
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
+               aesni_ids[nb_devs_attached] = (uint8_t)i;
+
+               nb_devs_attached++;
        }
-};
 
-static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
-       .suite_name = "Crypto CAAM JR 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),
+       return 0;
+}
 
-               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),
+static int
+test_scheduler_detach_slave_op(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t sched_id = ts_params->valid_devs[0];
+       uint32_t i;
+       int ret;
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
+       for (i = 0; i < 2; i++) {
+               ret = rte_cryptodev_scheduler_worker_detach(sched_id,
+                               aesni_ids[i]);
+               TEST_ASSERT(ret == 0,
+                       "Failed to detach device %u", aesni_ids[i]);
        }
-};
 
-static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
-       .suite_name = "Crypto DPAA_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),
+       return 0;
+}
 
-               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),
+static int
+test_scheduler_mode_op(enum rte_cryptodev_scheduler_mode scheduler_mode)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t sched_id = ts_params->valid_devs[0];
+       /* set mode */
+       return rte_cryptodev_scheduler_mode_set(sched_id,
+               scheduler_mode);
+}
 
-#ifdef RTE_LIBRTE_SECURITY
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_all),
+static int
+test_scheduler_mode_roundrobin_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_ROUNDROBIN) ==
+                       0, "Failed to set roundrobin mode");
+       return 0;
 
-               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),
+static int
+test_scheduler_mode_multicore_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_MULTICORE) ==
+                       0, "Failed to set multicore mode");
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
+       return 0;
+}
 
-               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),
+static int
+test_scheduler_mode_failover_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_FAILOVER) ==
+                       0, "Failed to set failover mode");
 
-               /** 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),
+       return 0;
+}
 
-               /** 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),
+static int
+test_scheduler_mode_pkt_size_distr_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_PKT_SIZE_DISTR) ==
+                       0, "Failed to set pktsize mode");
 
-               /** 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),
+       return 0;
+}
 
-               /** 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),
+static int
+scheduler_multicore_testsuite_setup(void)
+{
+       if (test_scheduler_attach_slave_op() < 0)
+               return TEST_SKIPPED;
+       if (test_scheduler_mode_op(CDEV_SCHED_MODE_MULTICORE) < 0)
+               return TEST_SKIPPED;
+       return 0;
+}
 
-               /** 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),
+static int
+scheduler_roundrobin_testsuite_setup(void)
+{
+       if (test_scheduler_attach_slave_op() < 0)
+               return TEST_SKIPPED;
+       if (test_scheduler_mode_op(CDEV_SCHED_MODE_ROUNDROBIN) < 0)
+               return TEST_SKIPPED;
+       return 0;
+}
 
-               /** 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),
+static int
+scheduler_failover_testsuite_setup(void)
+{
+       if (test_scheduler_attach_slave_op() < 0)
+               return TEST_SKIPPED;
+       if (test_scheduler_mode_op(CDEV_SCHED_MODE_FAILOVER) < 0)
+               return TEST_SKIPPED;
+       return 0;
+}
 
-               /** 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),
+static int
+scheduler_pkt_size_distr_testsuite_setup(void)
+{
+       if (test_scheduler_attach_slave_op() < 0)
+               return TEST_SKIPPED;
+       if (test_scheduler_mode_op(CDEV_SCHED_MODE_PKT_SIZE_DISTR) < 0)
+               return TEST_SKIPPED;
+       return 0;
+}
 
-               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),
+static void
+scheduler_mode_testsuite_teardown(void)
+{
+       test_scheduler_detach_slave_op();
+}
 
-               /** 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),
+#endif /* RTE_CRYPTO_SCHEDULER */
 
-               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),
+static struct unit_test_suite end_testsuite = {
+       .suite_name = NULL,
+       .setup = NULL,
+       .teardown = NULL,
+       .unit_test_suites = NULL
+};
 
-               /** 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),
+#ifdef RTE_LIB_SECURITY
+static struct unit_test_suite pdcp_proto_testsuite  = {
+       .suite_name = "PDCP Proto Unit Test Suite",
+       .setup = pdcp_proto_testsuite_setup,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup_security, ut_teardown,
+                       test_PDCP_PROTO_all),
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
 
-               /** 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),
+static struct unit_test_suite docsis_proto_testsuite  = {
+       .suite_name = "Docsis Proto Unit Test Suite",
+       .setup = docsis_proto_testsuite_setup,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup_security, ut_teardown,
+                       test_DOCSIS_PROTO_all),
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+#endif
 
-               /** 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),
+static struct unit_test_suite cryptodev_gen_testsuite  = {
+       .suite_name = "Crypto General Unit Test Suite",
+       .setup = crypto_gen_testsuite_setup,
+       .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
+                               test_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
+                               test_queue_pair_descriptor_setup),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
+                               test_device_configure_invalid_queue_pair_ids),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_stats),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_enq_callback_setup),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_deq_callback_setup),
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_negative_hmac_sha1_testsuite = {
+       .suite_name = "Negative HMAC SHA1 Unit Test Suite",
+       .setup = negative_hmac_sha1_testsuite_setup,
+       .unit_test_cases = {
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12569,53 +13754,92 @@ static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
                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_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_multi_session_testsuite = {
+       .suite_name = "Multi Session Unit Test Suite",
+       .setup = multi_session_testsuite_setup,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
+                               test_multi_session_random_usage),
 
                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,
+static struct unit_test_suite cryptodev_null_testsuite  = {
+       .suite_name = "NULL Test Suite",
+       .setup = null_testsuite_setup,
        .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),
+                       test_null_invalid_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_null_burst_operation),
+               TEST_CASES_END()
+       }
+};
 
-#ifdef RTE_LIBRTE_SECURITY
+static struct unit_test_suite cryptodev_aes_ccm_auth_testsuite  = {
+       .suite_name = "AES CCM Authenticated Test Suite",
+       .setup = aes_ccm_auth_testsuite_setup,
+       .unit_test_cases = {
+               /** AES CCM Authenticated Encryption 128 bits key*/
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_128_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_128_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_all),
+                       test_AES_CCM_authenticated_encryption_test_case_128_3),
 
+               /** AES CCM Authenticated Decryption 128 bits key*/
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_128_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_128_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_decap_all),
+                       test_AES_CCM_authenticated_decryption_test_case_128_3),
 
+               /** AES CCM Authenticated Encryption 192 bits key */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_192_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_encap_all),
+                       test_AES_CCM_authenticated_encryption_test_case_192_3),
 
+               /** AES CCM Authenticated Decryption 192 bits key*/
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_192_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
+                       test_AES_CCM_authenticated_decryption_test_case_192_3),
 
+               /** AES CCM Authenticated Encryption 256 bits key */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_256_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_in_place_32B),
+                       test_AES_CCM_authenticated_encryption_test_case_256_3),
+
+               /** AES CCM Authenticated Decryption 256 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_128B),
+                       test_AES_CCM_authenticated_decryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_40B),
+                       test_AES_CCM_authenticated_decryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_128B_32B),
-#endif
+                       test_AES_CCM_authenticated_decryption_test_case_256_3),
+               TEST_CASES_END()
+       }
+};
+
+static struct unit_test_suite cryptodev_aes_gcm_auth_testsuite  = {
+       .suite_name = "AES GCM Authenticated Test Suite",
+       .setup = aes_gcm_auth_testsuite_setup,
+       .unit_test_cases = {
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
@@ -12641,6 +13865,8 @@ static struct unit_test_suite cryptodev_dpaa2_sec_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,
@@ -12659,6 +13885,8 @@ static struct unit_test_suite cryptodev_dpaa2_sec_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,
@@ -12724,278 +13952,143 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                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),
+               /** AES GCM Authenticated Encryption big aad size */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
+                       test_AES_GCM_auth_encryption_test_case_aad_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
+                       test_AES_GCM_auth_encryption_test_case_aad_2),
 
+               /** AES GCM Authenticated Decryption big aad size */
                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_AES_GCM_auth_decryption_test_case_aad_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
+                       test_AES_GCM_auth_decryption_test_case_aad_2),
 
-               /** 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),
+               /** Out of place tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
+                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
+                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
-               /** ZUC authenticate (EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_6),
+               /** Session-less tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_7),
+                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_8),
+                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
 
-               /** 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),
+               TEST_CASES_END()
+       }
+};
 
-               /** 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),
+static struct unit_test_suite cryptodev_aes_gmac_auth_testsuite  = {
+       .suite_name = "AES GMAC Authentication Test Suite",
+       .setup = aes_gmac_auth_testsuite_setup,
+       .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
+                       test_AES_GMAC_authentication_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
+                       test_AES_GMAC_authentication_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
+                       test_AES_GMAC_authentication_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
+                       test_AES_GMAC_authentication_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_AES_GMAC_authentication_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_AES_GMAC_authentication_verify_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_AES_GMAC_authentication_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-
-               /* ESN Testcase */
+                       test_AES_GMAC_authentication_verify_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
-
+                       test_AES_GMAC_authentication_SGL_40B),
                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_AES_GMAC_authentication_SGL_80B),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_AES_GMAC_authentication_SGL_2048B),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                       test_AES_GMAC_authentication_SGL_2047B),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
+               TEST_CASES_END()
        }
 };
 
-static struct unit_test_suite cryptodev_mrvl_testsuite  = {
-       .suite_name = "Crypto Device Marvell Component Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
+static struct unit_test_suite cryptodev_chacha20_poly1305_testsuite  = {
+       .suite_name = "Chacha20-Poly1305 Test Suite",
+       .setup = chacha20_poly1305_testsuite_setup,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-
-               /** Negative tests */
-               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_chacha20_poly1305_encrypt_test_case_rfc8439),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
+                       test_chacha20_poly1305_decrypt_test_case_rfc8439),
+               TEST_CASES_END()
        }
 };
 
-static struct unit_test_suite cryptodev_ccp_testsuite  = {
-       .suite_name = "Crypto Device CCP Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
+static struct unit_test_suite cryptodev_snow3g_testsuite  = {
+       .suite_name = "SNOW 3G Test Suite",
+       .setup = snow3g_testsuite_setup,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
+               /** SNOW 3G encrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-               /** Negative tests */
+                       test_snow3g_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_snow3g_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_snow3g_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_snow3g_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_octeontx_testsuite  = {
-       .suite_name = "Crypto Device OCTEONTX Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+                       test_snow3g_encryption_test_case_5),
 
-               /** AES GCM Authenticated Encryption */
                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_snow3g_encryption_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
+                       test_snow3g_encryption_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
+                       test_snow3g_encryption_test_case_1_offset_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+                       test_snow3g_decryption_test_case_1_oop),
 
-               /** 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),
+               /** SNOW 3G generate auth, then encrypt (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
+                       test_snow3g_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
+                       test_snow3g_auth_cipher_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-               /** AES GMAC Authentication */
+                       test_snow3g_auth_cipher_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
+                       test_snow3g_auth_cipher_part_digest_enc),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
+                       test_snow3g_auth_cipher_part_digest_enc_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
+                       test_snow3g_auth_cipher_test_case_3_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
+                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
+                       test_snow3g_auth_cipher_part_digest_enc_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
+                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
 
-               /** SNOW 3G encrypt only (UEA2) */
+               /** SNOW 3G decrypt (UEA2), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
+                       test_snow3g_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
+                       test_snow3g_auth_cipher_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
+                       test_snow3g_auth_cipher_verify_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
+                       test_snow3g_auth_cipher_verify_part_digest_enc),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
-
+                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
+                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
+                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop_sgl),
+                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl),
 
                /** SNOW 3G decrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -13008,13 +14101,22 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                        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_decryption_with_digest_test_case_1),
                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),
+
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -13022,6 +14124,25 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_3),
 
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_cipher_auth_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_with_digest_test_case_1),
+               TEST_CASES_END()
+       }
+};
+
+static struct unit_test_suite cryptodev_zuc_testsuite  = {
+       .suite_name = "ZUC Test Suite",
+       .setup = zuc_testsuite_setup,
+       .unit_test_cases = {
                /** ZUC encrypt only (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_encryption_test_case_1),
@@ -13033,6 +14154,10 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                        test_zuc_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_encryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_6_sgl),
+
+               /** ZUC authenticate (EIA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -13044,40 +14169,61 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
-
-               /** KASUMI encrypt only (UEA1) */
+                       test_zuc_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
+                       test_zuc_hash_generate_test_case_7),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
+                       test_zuc_hash_generate_test_case_8),
+
+               /** ZUC alg-chain (EEA3/EIA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
+                       test_zuc_cipher_auth_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
+                       test_zuc_cipher_auth_test_case_2),
+
+               /** ZUC generate auth, then encrypt (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
+                       test_zuc_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
+                       test_zuc_auth_cipher_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-               /** KASUMI decrypt only (UEA1) */
+                       test_zuc_auth_cipher_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
+                       test_zuc_auth_cipher_test_case_1_oop_sgl),
+
+               /** ZUC decrypt (EEA3), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
+                       test_zuc_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
+                       test_zuc_auth_cipher_verify_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
+                       test_zuc_auth_cipher_verify_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
+                       test_zuc_auth_cipher_verify_test_case_1_oop_sgl),
+               TEST_CASES_END()
+       }
+};
 
+static struct unit_test_suite cryptodev_hmac_md5_auth_testsuite  = {
+       .suite_name = "HMAC_MD5 Authentication Test Suite",
+       .setup = hmac_md5_auth_testsuite_setup,
+       .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
+                       test_MD5_HMAC_generate_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
+                       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),
+               TEST_CASES_END()
+       }
+};
 
+static struct unit_test_suite cryptodev_kasumi_testsuite  = {
+       .suite_name = "Kasumi Test Suite",
+       .setup = kasumi_testsuite_setup,
+       .unit_test_cases = {
                /** KASUMI hash only (UIA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_hash_generate_test_case_1),
@@ -13091,6 +14237,7 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                        test_kasumi_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_hash_generate_test_case_6),
+
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_hash_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -13102,355 +14249,324 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_hash_verify_test_case_5),
 
-               /** NULL tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_only_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_only_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_auth_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_cipher_operation),
-
-               /** Negative tests */
+               /** KASUMI encrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_kasumi_encryption_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
+                       test_kasumi_encryption_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+                       test_kasumi_encryption_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_nitrox_testsuite  = {
-       .suite_name = "Crypto NITROX Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+                       test_kasumi_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
+                       test_kasumi_encryption_test_case_4),
                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 */
-       }
-};
-
-static struct unit_test_suite cryptodev_octeontx2_testsuite  = {
-       .suite_name = "Crypto Device OCTEON TX2 Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+                       test_kasumi_encryption_test_case_5),
 
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
+               /** KASUMI decrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
+                       test_kasumi_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
+                       test_kasumi_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
+                       test_kasumi_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
+                       test_kasumi_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
+                       test_kasumi_decryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+                       test_kasumi_decryption_test_case_1_oop),
 
-               /** 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),
-               /** AES GMAC Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
+                       test_kasumi_cipher_auth_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),
+               /** KASUMI generate auth, then encrypt (F8) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
+                       test_kasumi_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
-
+                       test_kasumi_auth_cipher_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
+                       test_kasumi_auth_cipher_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
+                       test_kasumi_auth_cipher_test_case_2_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop_sgl),
+                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
 
-               /** SNOW 3G decrypt only (UEA2) */
+               /** KASUMI decrypt (F8), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
+                       test_kasumi_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
+                       test_kasumi_auth_cipher_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
+                       test_kasumi_auth_cipher_verify_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
+                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
+                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
 
-               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),
+               TEST_CASES_END()
+       }
+};
 
-               /** ZUC encrypt only (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
+static struct unit_test_suite cryptodev_esn_testsuite  = {
+       .suite_name = "ESN Test Suite",
+       .setup = esn_testsuite_setup,
+       .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
+                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
+                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
+               TEST_CASES_END()
+       }
+};
+
+static struct unit_test_suite cryptodev_negative_aes_gcm_testsuite  = {
+       .suite_name = "Negative AES GCM Test Suite",
+       .setup = negative_aes_gcm_testsuite_setup,
+       .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
+                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
+                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
+                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
+                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
+                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
+                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
+                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
-
-               /** KASUMI encrypt only (UEA1) */
+                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
+                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
+                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
+                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
+                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
+
+               TEST_CASES_END()
+       }
+};
+
+static struct unit_test_suite cryptodev_negative_aes_gmac_testsuite  = {
+       .suite_name = "Negative AES GMAC Test Suite",
+       .setup = negative_aes_gmac_testsuite_setup,
+       .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
+                       authentication_verify_AES128_GMAC_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
+                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+
+               TEST_CASES_END()
+       }
+};
+
+static struct unit_test_suite cryptodev_mixed_cipher_hash_testsuite  = {
+       .suite_name = "Mixed CIPHER + HASH algorithms Test Suite",
+       .setup = mixed_cipher_hash_testsuite_setup,
+       .unit_test_cases = {
+               /** AUTH AES CMAC + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-               /** KASUMI decrypt only (UEA1) */
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
+                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
-
+                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
+                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
+                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
 
-               /** KASUMI hash only (UIA1) */
+               /** AUTH ZUC + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_1),
+                       test_auth_zuc_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_2),
+                       test_verify_auth_zuc_cipher_snow_test_case_1),
+               /** AUTH AES CMAC + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_3),
+                       test_auth_aes_cmac_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_4),
+                       test_verify_auth_aes_cmac_cipher_snow_test_case_1),
+               /** AUTH ZUC + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_5),
+                       test_auth_zuc_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_6),
+                       test_verify_auth_zuc_cipher_aes_ctr_test_case_1),
+               /** AUTH SNOW3G + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
+                       test_auth_snow_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
+                       test_verify_auth_snow_cipher_aes_ctr_test_case_1),
+               /** AUTH SNOW3G + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
+                       test_auth_snow_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
+                       test_verify_auth_snow_cipher_zuc_test_case_1),
+               /** AUTH AES CMAC + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
+                       test_auth_aes_cmac_cipher_zuc_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_verify_auth_aes_cmac_cipher_zuc_test_case_1),
 
-               /** NULL tests */
+               /** AUTH NULL + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_only_operation),
+                       test_auth_null_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_only_operation),
+                       test_verify_auth_null_cipher_snow_test_case_1),
+               /** AUTH NULL + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_auth_operation),
+                       test_auth_null_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_cipher_operation),
-
-               /** Negative tests */
+                       test_verify_auth_null_cipher_zuc_test_case_1),
+               /** AUTH SNOW3G + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_auth_snow_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_verify_auth_snow_cipher_null_test_case_1),
+               /** AUTH ZUC + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
+                       test_auth_zuc_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+                       test_verify_auth_zuc_cipher_null_test_case_1),
+               /** AUTH NULL + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_auth_null_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASES_END() /**< NULL terminate unit test array */
+                       test_verify_auth_null_cipher_aes_ctr_test_case_1),
+               /** AUTH AES CMAC + CIPHER NULL */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_auth_aes_cmac_cipher_null_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_verify_auth_aes_cmac_cipher_null_test_case_1),
+               TEST_CASES_END()
        }
 };
 
 static int
-test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
-{
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
+run_cryptodev_testsuite(const char *pmd_name)
+{
+       uint8_t ret, j, i = 0, blk_start_idx = 0;
+       const enum blockcipher_test_type blk_suites[] = {
+               BLKCIPHER_AES_CHAIN_TYPE,
+               BLKCIPHER_AES_CIPHERONLY_TYPE,
+               BLKCIPHER_AES_DOCSIS_TYPE,
+               BLKCIPHER_3DES_CHAIN_TYPE,
+               BLKCIPHER_3DES_CIPHERONLY_TYPE,
+               BLKCIPHER_DES_CIPHERONLY_TYPE,
+               BLKCIPHER_DES_DOCSIS_TYPE,
+               BLKCIPHER_AUTHONLY_TYPE};
+       struct unit_test_suite *static_suites[] = {
+               &cryptodev_multi_session_testsuite,
+               &cryptodev_null_testsuite,
+               &cryptodev_aes_ccm_auth_testsuite,
+               &cryptodev_aes_gcm_auth_testsuite,
+               &cryptodev_aes_gmac_auth_testsuite,
+               &cryptodev_snow3g_testsuite,
+               &cryptodev_chacha20_poly1305_testsuite,
+               &cryptodev_zuc_testsuite,
+               &cryptodev_hmac_md5_auth_testsuite,
+               &cryptodev_kasumi_testsuite,
+               &cryptodev_esn_testsuite,
+               &cryptodev_negative_aes_gcm_testsuite,
+               &cryptodev_negative_aes_gmac_testsuite,
+               &cryptodev_mixed_cipher_hash_testsuite,
+               &cryptodev_negative_hmac_sha1_testsuite,
+               &cryptodev_gen_testsuite,
+#ifdef RTE_LIB_SECURITY
+               &pdcp_proto_testsuite,
+               &docsis_proto_testsuite,
+#endif
+               &end_testsuite
+       };
+       static struct unit_test_suite ts = {
+               .suite_name = "Cryptodev Unit Test Suite",
+               .setup = testsuite_setup,
+               .teardown = testsuite_teardown,
+               .unit_test_cases = {TEST_CASES_END()}
+       };
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(pmd_name);
 
        if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both "
-               "CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM "
-               "are enabled in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
+               RTE_LOG(ERR, USER1, "%s PMD must be loaded.\n", pmd_name);
+               return TEST_FAILED;
        }
 
-       return unit_test_suite_runner(&cryptodev_testsuite);
+       ts.unit_test_suites = malloc(sizeof(struct unit_test_suite *) *
+                       (RTE_DIM(blk_suites) + RTE_DIM(static_suites)));
+
+       ADD_BLOCKCIPHER_TESTSUITE(i, ts, blk_suites, RTE_DIM(blk_suites));
+       ADD_STATIC_TESTSUITE(i, ts, static_suites, RTE_DIM(static_suites));
+       ret = unit_test_suite_runner(&ts);
+
+       FREE_BLOCKCIPHER_TESTSUITE(blk_start_idx, ts, RTE_DIM(blk_suites));
+       free(ts.unit_test_suites);
+       return ret;
 }
 
 static int
-test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_FAILED;
-       }
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
+}
 
-       return unit_test_suite_runner(&cryptodev_virtio_testsuite);
+static int
+test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
+{
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
 }
 
 static int
 test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       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;
-       }
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+}
 
-       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_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+       gbl_action_type = at;
+       return rc;
 }
 
 static int
 test_cryptodev_openssl(void)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD));
 }
 
 static int
 test_cryptodev_aesni_gcm(void)
 {
-       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;
-       }
-
-       return unit_test_suite_runner(&cryptodev_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
 }
 
 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;
+       enum rte_security_session_action_type at = gbl_action_type;
        gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
-       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       rc  = run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
        gbl_action_type = at;
        return rc;
 }
@@ -13458,121 +14574,143 @@ test_cryptodev_cpu_aesni_gcm(void)
 static int
 test_cryptodev_null(void)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NULL_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_NULL is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_NULL_PMD));
 }
 
 static int
 test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_SNOW3G is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
 }
 
 static int
 test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_KASUMI_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_KASUMI is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_KASUMI_PMD));
 }
 
 static int
 test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_ZUC_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_ZUC_PMD));
 }
 
 static int
 test_cryptodev_armv8(void)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_ARMV8_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_ARMV8 is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_armv8_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_ARMV8_PMD));
 }
 
 static int
 test_cryptodev_mrvl(void)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_MVSAM_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_mrvl_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_MVSAM_PMD));
 }
 
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+#ifdef RTE_CRYPTO_SCHEDULER
 
 static int
 test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/)
 {
+       uint8_t ret, sched_i, j, i = 0, blk_start_idx = 0;
+       const enum blockcipher_test_type blk_suites[] = {
+               BLKCIPHER_AES_CHAIN_TYPE,
+               BLKCIPHER_AES_CIPHERONLY_TYPE,
+               BLKCIPHER_AUTHONLY_TYPE
+       };
+       static struct unit_test_suite scheduler_multicore = {
+               .suite_name = "Scheduler Multicore Unit Test Suite",
+               .setup = scheduler_multicore_testsuite_setup,
+               .teardown = scheduler_mode_testsuite_teardown,
+               .unit_test_cases = {TEST_CASES_END()}
+       };
+       static struct unit_test_suite scheduler_round_robin = {
+               .suite_name = "Scheduler Round Robin Unit Test Suite",
+               .setup = scheduler_roundrobin_testsuite_setup,
+               .teardown = scheduler_mode_testsuite_teardown,
+               .unit_test_cases = {TEST_CASES_END()}
+       };
+       static struct unit_test_suite scheduler_failover = {
+               .suite_name = "Scheduler Failover Unit Test Suite",
+               .setup = scheduler_failover_testsuite_setup,
+               .teardown = scheduler_mode_testsuite_teardown,
+               .unit_test_cases = {TEST_CASES_END()}
+       };
+       static struct unit_test_suite scheduler_pkt_size_distr = {
+               .suite_name = "Scheduler Pkt Size Distr Unit Test Suite",
+               .setup = scheduler_pkt_size_distr_testsuite_setup,
+               .teardown = scheduler_mode_testsuite_teardown,
+               .unit_test_cases = {TEST_CASES_END()}
+       };
+       struct unit_test_suite *sched_mode_suites[] = {
+               &scheduler_multicore,
+               &scheduler_round_robin,
+               &scheduler_failover,
+               &scheduler_pkt_size_distr
+       };
+       static struct unit_test_suite scheduler_config = {
+               .suite_name = "Crypto Device Scheduler Config Unit Test Suite",
+               .unit_test_cases = {
+                       TEST_CASE(test_scheduler_attach_slave_op),
+                       TEST_CASE(test_scheduler_mode_multicore_op),
+                       TEST_CASE(test_scheduler_mode_roundrobin_op),
+                       TEST_CASE(test_scheduler_mode_failover_op),
+                       TEST_CASE(test_scheduler_mode_pkt_size_distr_op),
+                       TEST_CASE(test_scheduler_detach_slave_op),
+
+                       TEST_CASES_END() /**< NULL terminate array */
+               }
+       };
+       struct unit_test_suite *static_suites[] = {
+               &scheduler_config,
+               &end_testsuite
+       };
+       static struct unit_test_suite ts = {
+               .suite_name = "Scheduler Unit Test Suite",
+               .setup = scheduler_testsuite_setup,
+               .teardown = testsuite_teardown,
+               .unit_test_cases = {TEST_CASES_END()}
+       };
+
        gbl_driver_id = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD));
 
        if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is enabled "
-                               "in config file to run this testsuite.\n");
+               RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded.\n");
                return TEST_SKIPPED;
        }
 
        if (rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) {
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be"
-                       " enabled in config file to run this testsuite.\n");
+               RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n");
                return TEST_SKIPPED;
-}
-       return unit_test_suite_runner(&cryptodev_scheduler_testsuite);
+       }
+
+       for (sched_i = 0; sched_i < RTE_DIM(sched_mode_suites); sched_i++) {
+               uint8_t blk_i = 0;
+               sched_mode_suites[sched_i]->unit_test_suites = malloc(sizeof
+                               (struct unit_test_suite *) *
+                               (RTE_DIM(blk_suites) + 1));
+               ADD_BLOCKCIPHER_TESTSUITE(blk_i, (*sched_mode_suites[sched_i]),
+                               blk_suites, RTE_DIM(blk_suites));
+               sched_mode_suites[sched_i]->unit_test_suites[blk_i] = &end_testsuite;
+       }
+
+       ts.unit_test_suites = malloc(sizeof(struct unit_test_suite *) *
+                       (RTE_DIM(static_suites) + RTE_DIM(sched_mode_suites)));
+       ADD_STATIC_TESTSUITE(i, ts, sched_mode_suites,
+                       RTE_DIM(sched_mode_suites));
+       ADD_STATIC_TESTSUITE(i, ts, static_suites, RTE_DIM(static_suites));
+       ret = unit_test_suite_runner(&ts);
+
+       for (sched_i = 0; sched_i < RTE_DIM(sched_mode_suites); sched_i++) {
+               FREE_BLOCKCIPHER_TESTSUITE(blk_start_idx,
+                               (*sched_mode_suites[sched_i]),
+                               RTE_DIM(blk_suites));
+               free(sched_mode_suites[sched_i]->unit_test_suites);
+       }
+       free(ts.unit_test_suites);
+       return ret;
 }
 
 REGISTER_TEST_COMMAND(cryptodev_scheduler_autotest, test_cryptodev_scheduler);
@@ -13582,115 +14720,69 @@ REGISTER_TEST_COMMAND(cryptodev_scheduler_autotest, test_cryptodev_scheduler);
 static int
 test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD));
 }
 
 static int
 test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_SKIPPED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_dpaa_sec_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD));
 }
 
 static int
 test_cryptodev_ccp(void)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_CCP_PMD));
-
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_CCP is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_FAILED;
-       }
-
-       return unit_test_suite_runner(&cryptodev_ccp_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_CCP_PMD));
 }
 
 static int
 test_cryptodev_octeontx(void)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is "
-                               "enabled in config file to run this "
-                               "testsuite.\n");
-               return TEST_FAILED;
-       }
-       return unit_test_suite_runner(&cryptodev_octeontx_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));
 }
 
 static int
 test_cryptodev_octeontx2(void)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is "
-                               "enabled in config file to run this "
-                               "testsuite.\n");
-               return TEST_FAILED;
-       }
-       return unit_test_suite_runner(&cryptodev_octeontx2_testsuite);
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
 }
 
 static int
 test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD));
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD));
+}
 
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_CAAM_JR is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_FAILED;
-       }
+static int
+test_cryptodev_nitrox(void)
+{
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_NITROX_PMD));
+}
 
-       return unit_test_suite_runner(&cryptodev_caam_jr_testsuite);
+static int
+test_cryptodev_bcmfs(void)
+{
+       return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_BCMFS_PMD));
 }
 
 static int
-test_cryptodev_nitrox(void)
+test_cryptodev_qat_raw_api(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NITROX_PMD));
+       int ret;
 
-       if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_NITROX is enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_FAILED;
-       }
+       global_api_test_type = CRYPTODEV_RAW_API_TEST;
+       ret = run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
+       global_api_test_type = CRYPTODEV_API_TEST;
 
-       return unit_test_suite_runner(&cryptodev_nitrox_testsuite);
+       return ret;
 }
 
+REGISTER_TEST_COMMAND(cryptodev_qat_raw_api_autotest,
+               test_cryptodev_qat_raw_api);
 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,
@@ -13709,3 +14801,4 @@ REGISTER_TEST_COMMAND(cryptodev_octeontx_autotest, test_cryptodev_octeontx);
 REGISTER_TEST_COMMAND(cryptodev_octeontx2_autotest, test_cryptodev_octeontx2);
 REGISTER_TEST_COMMAND(cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);
 REGISTER_TEST_COMMAND(cryptodev_nitrox_autotest, test_cryptodev_nitrox);
+REGISTER_TEST_COMMAND(cryptodev_bcmfs_autotest, test_cryptodev_bcmfs);