cryptodev: remove crypto device type enumeration
[dpdk.git] / test / test / test_cryptodev.c
index bc56cc8..2a71f72 100644 (file)
@@ -61,7 +61,7 @@
 #include "test_cryptodev_gcm_test_vectors.h"
 #include "test_cryptodev_hmac_test_vectors.h"
 
-static enum rte_cryptodev_type gbl_cryptodev_type;
+static int gbl_driver_id;
 
 struct crypto_testsuite_params {
        struct rte_mempool *mbuf_pool;
@@ -77,6 +77,7 @@ struct crypto_testsuite_params {
 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;
 
        struct rte_cryptodev_sym_session *sess;
 
@@ -212,14 +213,11 @@ testsuite_setup(void)
        }
 
        /* Create an AESNI MB device if required */
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_AESNI_MB_PMD) {
-#ifndef RTE_LIBRTE_PMD_AESNI_MB
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(
-                               RTE_CRYPTODEV_AESNI_MB_PMD);
+       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);
@@ -232,14 +230,11 @@ testsuite_setup(void)
        }
 
        /* Create an AESNI GCM device if required */
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_AESNI_GCM_PMD) {
-#ifndef RTE_LIBRTE_PMD_AESNI_GCM
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(
-                               RTE_CRYPTODEV_AESNI_GCM_PMD);
+       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),
@@ -250,13 +245,11 @@ testsuite_setup(void)
        }
 
        /* Create a SNOW 3G device if required */
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_SNOW3G_PMD) {
-#ifndef RTE_LIBRTE_PMD_SNOW3G
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_SNOW3G must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_SNOW3G_PMD);
+       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),
@@ -267,13 +260,11 @@ testsuite_setup(void)
        }
 
        /* Create a KASUMI device if required */
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_KASUMI_PMD) {
-#ifndef RTE_LIBRTE_PMD_KASUMI
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_KASUMI must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_KASUMI_PMD);
+       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),
@@ -284,13 +275,11 @@ testsuite_setup(void)
        }
 
        /* Create a ZUC device if required */
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_ZUC_PMD) {
-#ifndef RTE_LIBRTE_PMD_ZUC
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_ZUC must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_ZUC_PMD);
+       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),
@@ -301,14 +290,11 @@ testsuite_setup(void)
        }
 
        /* Create a NULL device if required */
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_NULL_PMD) {
-#ifndef RTE_LIBRTE_PMD_NULL_CRYPTO
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(
-                               RTE_CRYPTODEV_NULL_PMD);
+       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);
@@ -321,14 +307,11 @@ testsuite_setup(void)
        }
 
        /* Create an OPENSSL device if required */
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_OPENSSL_PMD) {
-#ifndef RTE_LIBRTE_PMD_OPENSSL
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_OPENSSL must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(
-                               RTE_CRYPTODEV_OPENSSL_PMD);
+       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),
@@ -341,14 +324,11 @@ testsuite_setup(void)
        }
 
        /* Create a ARMv8 device if required */
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_ARMV8_PMD) {
-#ifndef RTE_LIBRTE_PMD_ARMV8_CRYPTO
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(
-                               RTE_CRYPTODEV_ARMV8_PMD);
+       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),
@@ -361,15 +341,12 @@ testsuite_setup(void)
        }
 
 #ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (gbl_driver_id == rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD))) {
 
-#ifndef RTE_LIBRTE_PMD_AESNI_MB
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
-               nb_devs = rte_cryptodev_count_devtype(
-                               RTE_CRYPTODEV_SCHEDULER_PMD);
+               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),
@@ -383,14 +360,6 @@ testsuite_setup(void)
        }
 #endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
 
-#ifndef RTE_LIBRTE_PMD_QAT
-       if (gbl_cryptodev_type == RTE_CRYPTODEV_QAT_SYM_PMD) {
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_QAT must be enabled "
-                               "in config file to run this testsuite.\n");
-               return TEST_FAILED;
-       }
-#endif
-
        nb_devs = rte_cryptodev_count();
        if (nb_devs < 1) {
                RTE_LOG(ERR, USER1, "No crypto devices found?\n");
@@ -400,7 +369,7 @@ testsuite_setup(void)
        /* Create list of valid crypto devs */
        for (i = 0; i < nb_devs; i++) {
                rte_cryptodev_info_get(i, &info);
-               if (info.dev_type == gbl_cryptodev_type)
+               if (info.driver_id == gbl_driver_id)
                        ts_params->valid_devs[ts_params->valid_dev_count++] = i;
        }
 
@@ -1340,7 +1309,8 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
 
        TEST_ASSERT_BUFFERS_ARE_EQUAL(digest,
                        catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA1_digest,
-                       gbl_cryptodev_type == RTE_CRYPTODEV_AESNI_MB_PMD ?
+                       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");
@@ -1501,7 +1471,8 @@ test_AES_cipheronly_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_AESNI_MB_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
                BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1517,7 +1488,8 @@ test_AES_docsis_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_AESNI_MB_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
                BLKCIPHER_AES_DOCSIS_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1533,7 +1505,8 @@ test_AES_docsis_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_QAT_SYM_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_AES_DOCSIS_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1549,7 +1522,8 @@ test_DES_docsis_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_QAT_SYM_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_DES_DOCSIS_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1565,7 +1539,8 @@ test_authonly_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_AESNI_MB_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
                BLKCIPHER_AUTHONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1581,7 +1556,8 @@ test_AES_chain_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_AESNI_MB_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1599,7 +1575,8 @@ test_AES_cipheronly_scheduler_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_SCHEDULER_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
                BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1615,7 +1592,8 @@ test_AES_chain_scheduler_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_SCHEDULER_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1631,7 +1609,8 @@ test_authonly_scheduler_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_SCHEDULER_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
                BLKCIPHER_AUTHONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1649,7 +1628,8 @@ test_AES_chain_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_OPENSSL_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1665,7 +1645,8 @@ test_AES_cipheronly_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_OPENSSL_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
                BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1681,7 +1662,8 @@ test_AES_chain_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_QAT_SYM_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1697,7 +1679,8 @@ test_AES_cipheronly_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_QAT_SYM_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1713,7 +1696,8 @@ test_AES_chain_dpaa2_sec_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_DPAA2_SEC_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1729,7 +1713,8 @@ test_AES_cipheronly_dpaa2_sec_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_DPAA2_SEC_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
                BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1737,6 +1722,23 @@ test_AES_cipheronly_dpaa2_sec_all(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_authonly_dpaa2_sec_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
+
+       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+               ts_params->op_mpool, ts_params->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(RTE_CRYPTODEV_DPAA2_SEC_PMD)),
+               BLKCIPHER_AUTHONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
 static int
 test_authonly_openssl_all(void)
 {
@@ -1745,7 +1747,8 @@ test_authonly_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_OPENSSL_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
                BLKCIPHER_AUTHONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1761,7 +1764,8 @@ test_AES_chain_armv8_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_ARMV8_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4507,7 +4511,8 @@ test_3DES_chain_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_QAT_SYM_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_3DES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4523,7 +4528,8 @@ test_DES_cipheronly_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_QAT_SYM_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_DES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4539,7 +4545,8 @@ test_DES_docsis_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_OPENSSL_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
                BLKCIPHER_DES_DOCSIS_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4555,7 +4562,8 @@ test_3DES_chain_dpaa2_sec_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_DPAA2_SEC_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
                BLKCIPHER_3DES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4571,7 +4579,8 @@ test_3DES_cipheronly_dpaa2_sec_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_DPAA2_SEC_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
                BLKCIPHER_3DES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4587,7 +4596,8 @@ test_3DES_cipheronly_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_QAT_SYM_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_3DES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4603,7 +4613,8 @@ test_3DES_chain_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_OPENSSL_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
                BLKCIPHER_3DES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4619,7 +4630,8 @@ test_3DES_cipheronly_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool, ts_params->valid_devs[0],
-               RTE_CRYPTODEV_OPENSSL_PMD,
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
                BLKCIPHER_3DES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4630,54 +4642,34 @@ test_3DES_cipheronly_openssl_all(void)
 /* ***** AES-GCM Tests ***** */
 
 static int
-create_gcm_session(uint8_t dev_id, enum rte_crypto_cipher_operation op,
+create_gcm_session(uint8_t dev_id, enum rte_crypto_aead_operation op,
                const uint8_t *key, const uint8_t key_len,
                const uint16_t aad_len, const uint8_t auth_len,
-               uint8_t iv_len,
-               enum rte_crypto_auth_operation auth_op)
+               uint8_t iv_len)
 {
-       uint8_t cipher_key[key_len];
+       uint8_t aead_key[key_len];
 
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(cipher_key, key, key_len);
+       memcpy(aead_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 = RTE_CRYPTO_CIPHER_AES_GCM;
-       ut_params->auth_xform.auth.op = auth_op;
-       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 = iv_len;
+       /* Setup AEAD Parameters */
+       ut_params->aead_xform.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       ut_params->aead_xform.next = NULL;
+       ut_params->aead_xform.aead.algo = RTE_CRYPTO_AEAD_AES_GCM;
+       ut_params->aead_xform.aead.op = op;
+       ut_params->aead_xform.aead.key.data = aead_key;
+       ut_params->aead_xform.aead.key.length = key_len;
+       ut_params->aead_xform.aead.iv.offset = IV_OFFSET;
+       ut_params->aead_xform.aead.iv.length = iv_len;
+       ut_params->aead_xform.aead.digest_length = auth_len;
+       ut_params->aead_xform.aead.add_auth_data_length = aad_len;
 
        TEST_HEXDUMP(stdout, "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.algo = RTE_CRYPTO_AUTH_AES_GCM;
-
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       ut_params->auth_xform.auth.add_auth_data_length = aad_len;
-       ut_params->auth_xform.auth.key.length = 0;
-       ut_params->auth_xform.auth.key.data = NULL;
-
-       if (op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {
-               ut_params->cipher_xform.next = &ut_params->auth_xform;
-
-               /* Create Crypto session*/
-               ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
-                               &ut_params->cipher_xform);
-       } else {/* Create Crypto session*/
-               ut_params->auth_xform.next = &ut_params->cipher_xform;
-               ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
-                               &ut_params->auth_xform);
-       }
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
+                       &ut_params->aead_xform);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
@@ -4686,43 +4678,35 @@ create_gcm_session(uint8_t dev_id, enum rte_crypto_cipher_operation op,
 
 static int
 create_gcm_xforms(struct rte_crypto_op *op,
-               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_aead_operation aead_op,
                uint8_t *key, const uint8_t key_len,
                const uint8_t aad_len, const uint8_t auth_len,
-               uint8_t iv_len,
-               enum rte_crypto_auth_operation auth_op)
+               uint8_t iv_len)
 {
-       TEST_ASSERT_NOT_NULL(rte_crypto_op_sym_xforms_alloc(op, 2),
-                       "failed to allocate space for crypto transforms");
+       TEST_ASSERT_NOT_NULL(rte_crypto_op_sym_xforms_alloc(op, 1),
+                       "failed to allocate space for crypto transform");
 
        struct rte_crypto_sym_op *sym_op = op->sym;
 
-       /* Setup Cipher Parameters */
-       sym_op->xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       sym_op->xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_GCM;
-       sym_op->xform->cipher.op = cipher_op;
-       sym_op->xform->cipher.key.data = key;
-       sym_op->xform->cipher.key.length = key_len;
-       sym_op->xform->cipher.iv.offset = IV_OFFSET;
-       sym_op->xform->cipher.iv.length = iv_len;
+       /* Setup AEAD Parameters */
+       sym_op->xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       sym_op->xform->next = NULL;
+       sym_op->xform->aead.algo = RTE_CRYPTO_AEAD_AES_GCM;
+       sym_op->xform->aead.op = aead_op;
+       sym_op->xform->aead.key.data = key;
+       sym_op->xform->aead.key.length = key_len;
+       sym_op->xform->aead.iv.offset = IV_OFFSET;
+       sym_op->xform->aead.iv.length = iv_len;
+       sym_op->xform->aead.digest_length = auth_len;
+       sym_op->xform->aead.add_auth_data_length = aad_len;
 
        TEST_HEXDUMP(stdout, "key:", key, key_len);
 
-       /* Setup Authentication Parameters */
-       sym_op->xform->next->type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       sym_op->xform->next->auth.algo = RTE_CRYPTO_AUTH_AES_GCM;
-       sym_op->xform->next->auth.op = auth_op;
-       sym_op->xform->next->auth.digest_length = auth_len;
-       sym_op->xform->next->auth.add_auth_data_length = aad_len;
-       sym_op->xform->next->auth.key.length = 0;
-       sym_op->xform->next->auth.key.data = NULL;
-       sym_op->xform->next->next = NULL;
-
        return 0;
 }
 
 static int
-create_gcm_operation(enum rte_crypto_cipher_operation op,
+create_gcm_operation(enum rte_crypto_aead_operation op,
                const struct gcm_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -4741,15 +4725,15 @@ create_gcm_operation(enum rte_crypto_cipher_operation op,
 
        /* Append aad data */
        aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
-       sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+       sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                        aad_pad_len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.aad.data,
+       TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
                        "no room to append aad");
 
-       sym_op->auth.aad.phys_addr =
+       sym_op->aead.aad.phys_addr =
                        rte_pktmbuf_mtophys(ut_params->ibuf);
-       memcpy(sym_op->auth.aad.data, tdata->aad.data, tdata->aad.len);
-       TEST_HEXDUMP(stdout, "aad:", sym_op->auth.aad.data,
+       memcpy(sym_op->aead.aad.data, tdata->aad.data, tdata->aad.len);
+       TEST_HEXDUMP(stdout, "aad:", sym_op->aead.aad.data,
                tdata->aad.len);
 
        /* Append IV at the end of the crypto operation*/
@@ -4761,7 +4745,7 @@ create_gcm_operation(enum rte_crypto_cipher_operation op,
                tdata->iv.len);
 
        /* Append plaintext/ciphertext */
-       if (op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {
+       if (op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
                plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
                plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                plaintext_pad_len);
@@ -4806,46 +4790,43 @@ create_gcm_operation(enum rte_crypto_cipher_operation op,
        }
 
        /* Append digest data */
-       if (op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {
-               sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+       if (op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
+               sym_op->aead.digest.data = (uint8_t *)rte_pktmbuf_append(
                                ut_params->obuf ? ut_params->obuf :
                                                ut_params->ibuf,
                                                tdata->auth_tag.len);
-               TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+               TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
                                "no room to append digest");
-               memset(sym_op->auth.digest.data, 0, tdata->auth_tag.len);
-               sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+               memset(sym_op->aead.digest.data, 0, tdata->auth_tag.len);
+               sym_op->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                                ut_params->obuf ? ut_params->obuf :
                                                ut_params->ibuf,
                                                plaintext_pad_len +
                                                aad_pad_len);
        } else {
-               sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+               sym_op->aead.digest.data = (uint8_t *)rte_pktmbuf_append(
                                ut_params->ibuf, tdata->auth_tag.len);
-               TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+               TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
                                "no room to append digest");
-               sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+               sym_op->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                                ut_params->ibuf,
                                plaintext_pad_len + aad_pad_len);
 
-               rte_memcpy(sym_op->auth.digest.data, tdata->auth_tag.data,
+               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
                        tdata->auth_tag.len);
                TEST_HEXDUMP(stdout, "digest:",
-                       sym_op->auth.digest.data,
+                       sym_op->aead.digest.data,
                        tdata->auth_tag.len);
        }
 
-       sym_op->cipher.data.length = tdata->plaintext.len;
-       sym_op->cipher.data.offset = aad_pad_len;
-
-       sym_op->auth.data.length = tdata->plaintext.len;
-       sym_op->auth.data.offset = aad_pad_len;
+       sym_op->aead.data.length = tdata->plaintext.len;
+       sym_op->aead.data.offset = aad_pad_len;
 
        return 0;
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
+test_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -4857,11 +4838,10 @@ test_mb_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -4878,7 +4858,7 @@ test_mb_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_ENCRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
        if (retval < 0)
                return retval;
 
@@ -4928,103 +4908,145 @@ test_mb_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_1(void)
+test_AES_GCM_authenticated_encryption_test_case_1(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_1);
+}
+
+static int
+test_AES_GCM_authenticated_encryption_test_case_2(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_1);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_2);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_2(void)
+test_AES_GCM_authenticated_encryption_test_case_3(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_2);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_3);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_3(void)
+test_AES_GCM_authenticated_encryption_test_case_4(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_3);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_4);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_4(void)
+test_AES_GCM_authenticated_encryption_test_case_5(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_4);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_5);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_5(void)
+test_AES_GCM_authenticated_encryption_test_case_6(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_5);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_6);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_6(void)
+test_AES_GCM_authenticated_encryption_test_case_7(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_6);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_7);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_7(void)
+test_AES_GCM_auth_encryption_test_case_192_1(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_7);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_1);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_1(void)
+test_AES_GCM_auth_encryption_test_case_192_2(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_1);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_2);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_2(void)
+test_AES_GCM_auth_encryption_test_case_192_3(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_2);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_3);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_3(void)
+test_AES_GCM_auth_encryption_test_case_192_4(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_3);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_4);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_4(void)
+test_AES_GCM_auth_encryption_test_case_192_5(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_4);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_5);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_5(void)
+test_AES_GCM_auth_encryption_test_case_192_6(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_5);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_6);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_6(void)
+test_AES_GCM_auth_encryption_test_case_192_7(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_6);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_7);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_7(void)
+test_AES_GCM_auth_encryption_test_case_256_1(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_7);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_1);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_aad_1(void)
+test_AES_GCM_auth_encryption_test_case_256_2(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_aad_1);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_2);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_aad_2(void)
+test_AES_GCM_auth_encryption_test_case_256_3(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_aad_2);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_3);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
+test_AES_GCM_auth_encryption_test_case_256_4(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_4);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_5(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_5);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_6(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_6);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_7(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_7);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_aad_1(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_aad_1);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_aad_2(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_aad_2);
+}
+
+static int
+test_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -5035,11 +5057,10 @@ test_mb_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5056,7 +5077,7 @@ test_mb_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_DECRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
        if (retval < 0)
                return retval;
 
@@ -5095,99 +5116,141 @@ test_mb_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_1(void)
+test_AES_GCM_authenticated_decryption_test_case_1(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_1);
+}
+
+static int
+test_AES_GCM_authenticated_decryption_test_case_2(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_2);
+}
+
+static int
+test_AES_GCM_authenticated_decryption_test_case_3(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_3);
+}
+
+static int
+test_AES_GCM_authenticated_decryption_test_case_4(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_4);
+}
+
+static int
+test_AES_GCM_authenticated_decryption_test_case_5(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_1);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_5);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_2(void)
+test_AES_GCM_authenticated_decryption_test_case_6(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_2);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_6);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_3(void)
+test_AES_GCM_authenticated_decryption_test_case_7(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_3);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_7);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_4(void)
+test_AES_GCM_auth_decryption_test_case_192_1(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_4);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_1);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_5(void)
+test_AES_GCM_auth_decryption_test_case_192_2(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_5);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_2);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_6(void)
+test_AES_GCM_auth_decryption_test_case_192_3(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_6);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_3);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_7(void)
+test_AES_GCM_auth_decryption_test_case_192_4(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_7);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_4);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_1(void)
+test_AES_GCM_auth_decryption_test_case_192_5(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_1);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_5);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_2(void)
+test_AES_GCM_auth_decryption_test_case_192_6(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_2);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_6);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_3(void)
+test_AES_GCM_auth_decryption_test_case_192_7(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_3);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_7);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_4(void)
+test_AES_GCM_auth_decryption_test_case_256_1(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_4);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_1);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_5(void)
+test_AES_GCM_auth_decryption_test_case_256_2(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_5);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_2);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_6(void)
+test_AES_GCM_auth_decryption_test_case_256_3(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_6);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_3);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_7(void)
+test_AES_GCM_auth_decryption_test_case_256_4(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_7);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_4);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_aad_1(void)
+test_AES_GCM_auth_decryption_test_case_256_5(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_aad_1);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_5);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_aad_2(void)
+test_AES_GCM_auth_decryption_test_case_256_6(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_aad_2);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_6);
+}
+
+static int
+test_AES_GCM_auth_decryption_test_case_256_7(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_7);
+}
+
+static int
+test_AES_GCM_auth_decryption_test_case_aad_1(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_aad_1);
+}
+
+static int
+test_AES_GCM_auth_decryption_test_case_aad_2(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_aad_2);
 }
 
 static int
@@ -5202,11 +5265,10 @@ test_AES_GCM_authenticated_encryption_oop(const struct gcm_test_data *tdata)
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5220,7 +5282,7 @@ test_AES_GCM_authenticated_encryption_oop(const struct gcm_test_data *tdata)
                        rte_pktmbuf_tailroom(ut_params->obuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_ENCRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
        if (retval < 0)
                return retval;
 
@@ -5263,7 +5325,7 @@ test_AES_GCM_authenticated_encryption_oop(const struct gcm_test_data *tdata)
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_oop(void)
+test_AES_GCM_authenticated_encryption_oop_test_case_1(void)
 {
        return test_AES_GCM_authenticated_encryption_oop(&gcm_test_case_5);
 }
@@ -5279,11 +5341,10 @@ test_AES_GCM_authenticated_decryption_oop(const struct gcm_test_data *tdata)
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5297,7 +5358,7 @@ test_AES_GCM_authenticated_decryption_oop(const struct gcm_test_data *tdata)
                        rte_pktmbuf_tailroom(ut_params->obuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_DECRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
        if (retval < 0)
                return retval;
 
@@ -5332,7 +5393,7 @@ test_AES_GCM_authenticated_decryption_oop(const struct gcm_test_data *tdata)
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_oop(void)
+test_AES_GCM_authenticated_decryption_oop_test_case_1(void)
 {
        return test_AES_GCM_authenticated_decryption_oop(&gcm_test_case_5);
 }
@@ -5356,18 +5417,17 @@ test_AES_GCM_authenticated_encryption_sessionless(
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_ENCRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
        if (retval < 0)
                return retval;
 
        /* Create GCM xforms */
        memcpy(key, tdata->key.data, tdata->key.len);
        retval = create_gcm_xforms(ut_params->op,
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        key, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5413,7 +5473,7 @@ test_AES_GCM_authenticated_encryption_sessionless(
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_sessionless(void)
+test_AES_GCM_authenticated_encryption_sessionless_test_case_1(void)
 {
        return test_AES_GCM_authenticated_encryption_sessionless(
                        &gcm_test_case_5);
@@ -5437,18 +5497,17 @@ test_AES_GCM_authenticated_decryption_sessionless(
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_DECRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
        if (retval < 0)
                return retval;
 
        /* Create GCM xforms */
        memcpy(key, tdata->key.data, tdata->key.len);
        retval = create_gcm_xforms(ut_params->op,
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
                        key, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5486,7 +5545,7 @@ test_AES_GCM_authenticated_decryption_sessionless(
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_sessionless(void)
+test_AES_GCM_authenticated_decryption_sessionless_test_case_1(void)
 {
        return test_AES_GCM_authenticated_decryption_sessionless(
                        &gcm_test_case_5);
@@ -5567,7 +5626,6 @@ static int MD5_HMAC_create_session(struct crypto_testsuite_params *ts_params,
        ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_MD5_HMAC;
 
        ut_params->auth_xform.auth.digest_length = MD5_DIGEST_LEN;
-       ut_params->auth_xform.auth.add_auth_data_length = 0;
        ut_params->auth_xform.auth.key.length = test_case->key.len;
        ut_params->auth_xform.auth.key.data = key;
 
@@ -6340,7 +6398,6 @@ static int create_gmac_session(uint8_t dev_id,
        ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_AES_GMAC;
        ut_params->auth_xform.auth.op = auth_op;
        ut_params->auth_xform.auth.digest_length = tdata->gmac_tag.len;
-       ut_params->auth_xform.auth.add_auth_data_length = 0;
        ut_params->auth_xform.auth.key.length = tdata->key.len;
        ut_params->auth_xform.auth.key.data = auth_key;
        ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
@@ -6720,7 +6777,6 @@ create_auth_session(struct crypto_unittest_params *ut_params,
        ut_params->auth_xform.auth.key.length = reference->auth_key.len;
        ut_params->auth_xform.auth.key.data = auth_key;
        ut_params->auth_xform.auth.digest_length = reference->digest.len;
-       ut_params->auth_xform.auth.add_auth_data_length = reference->aad.len;
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
@@ -6758,7 +6814,6 @@ create_auth_cipher_session(struct crypto_unittest_params *ut_params,
                ut_params->auth_xform.auth.iv.length = reference->iv.len;
        } else {
                ut_params->auth_xform.next = &ut_params->cipher_xform;
-               ut_params->auth_xform.auth.add_auth_data_length = reference->aad.len;
 
                /* Setup Cipher Parameters */
                ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
@@ -7138,7 +7193,7 @@ test_authenticated_decryption_fail_when_corruption(
 }
 
 static int
-create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
+create_gcm_operation_SGL(enum rte_crypto_aead_operation op,
                const struct gcm_test_data *tdata,
                void *digest_mem, uint64_t digest_phys)
 {
@@ -7157,18 +7212,18 @@ create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
 
        struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       sym_op->auth.digest.data = digest_mem;
+       sym_op->aead.digest.data = digest_mem;
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+       TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
                        "no room to append digest");
 
-       sym_op->auth.digest.phys_addr = digest_phys;
+       sym_op->aead.digest.phys_addr = digest_phys;
 
-       if (op == RTE_CRYPTO_CIPHER_OP_DECRYPT) {
-               rte_memcpy(sym_op->auth.digest.data, tdata->auth_tag.data,
+       if (op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
+               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
                                auth_tag_len);
                TEST_HEXDUMP(stdout, "digest:",
-                               sym_op->auth.digest.data,
+                               sym_op->aead.digest.data,
                                auth_tag_len);
        }
 
@@ -7177,25 +7232,22 @@ create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
 
        rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
 
-       sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_prepend(
+       sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
                        ut_params->ibuf, aad_len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.aad.data,
+       TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
                        "no room to prepend aad");
-       sym_op->auth.aad.phys_addr = rte_pktmbuf_mtophys(
+       sym_op->aead.aad.phys_addr = rte_pktmbuf_mtophys(
                        ut_params->ibuf);
 
-       memset(sym_op->auth.aad.data, 0, aad_len);
-       rte_memcpy(sym_op->auth.aad.data, tdata->aad.data, aad_len);
+       memset(sym_op->aead.aad.data, 0, aad_len);
+       rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
 
        TEST_HEXDUMP(stdout, "iv:", iv_ptr, iv_len);
        TEST_HEXDUMP(stdout, "aad:",
-                       sym_op->auth.aad.data, aad_len);
+                       sym_op->aead.aad.data, aad_len);
 
-       sym_op->cipher.data.length = tdata->plaintext.len;
-       sym_op->cipher.data.offset = aad_len;
-
-       sym_op->auth.data.offset = aad_len;
-       sym_op->auth.data.length = tdata->plaintext.len;
+       sym_op->aead.data.length = tdata->plaintext.len;
+       sym_op->aead.data.offset = aad_len;
 
        return 0;
 }
@@ -7250,11 +7302,10 @@ test_AES_GCM_authenticated_encryption_SGL(const struct gcm_test_data *tdata,
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -7380,7 +7431,7 @@ test_AES_GCM_authenticated_encryption_SGL(const struct gcm_test_data *tdata,
        }
 
        /* Create GCM opertaion */
-       retval = create_gcm_operation_SGL(RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+       retval = create_gcm_operation_SGL(RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        tdata, digest_mem, digest_phys);
 
        if (retval < 0)
@@ -7605,8 +7656,9 @@ test_scheduler_attach_slave_op(void)
        char vdev_name[32];
 
        /* create 2 AESNI_MB if necessary */
-       nb_devs = rte_cryptodev_count_devtype(
-                       RTE_CRYPTODEV_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 < 2) {
                for (i = nb_devs; i < 2; i++) {
                        snprintf(vdev_name, sizeof(vdev_name), "%s_%u",
@@ -7627,7 +7679,8 @@ test_scheduler_attach_slave_op(void)
                struct rte_cryptodev_info info;
 
                rte_cryptodev_info_get(i, &info);
-               if (info.dev_type != RTE_CRYPTODEV_AESNI_MB_PMD)
+               if (info.driver_id != rte_cryptodev_driver_id_get(
+                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)))
                        continue;
 
                ret = rte_cryptodev_scheduler_slave_attach(sched_id,
@@ -7751,35 +7804,83 @@ static struct unit_test_suite cryptodev_qat_testsuite  = {
                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_mb_AES_GCM_authenticated_encryption_test_case_1),
+                       test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_2),
+                       test_AES_GCM_authenticated_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_3),
+                       test_AES_GCM_authenticated_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_4),
+                       test_AES_GCM_authenticated_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_5),
+                       test_AES_GCM_authenticated_encryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_6),
+                       test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_7),
+                       test_AES_GCM_authenticated_encryption_test_case_7),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_1),
+                       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_mb_AES_GCM_authenticated_decryption_test_case_2),
+                       test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_3),
+                       test_AES_GCM_authenticated_decryption_test_case_7),
+
+               /** 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_mb_AES_GCM_authenticated_decryption_test_case_4),
+                       test_AES_GCM_auth_encryption_test_case_192_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_5),
+                       test_AES_GCM_auth_encryption_test_case_192_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_6),
+                       test_AES_GCM_auth_encryption_test_case_192_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_7),
+                       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 GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -7954,35 +8055,100 @@ static struct unit_test_suite cryptodev_openssl_testsuite  = {
 
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_1),
+                       test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_2),
+                       test_AES_GCM_authenticated_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_3),
+                       test_AES_GCM_authenticated_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_4),
+                       test_AES_GCM_authenticated_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_5),
+                       test_AES_GCM_authenticated_encryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_6),
+                       test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_7),
+                       test_AES_GCM_authenticated_encryption_test_case_7),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_1),
+                       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 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_mb_AES_GCM_authenticated_decryption_test_case_2),
+                       test_AES_GCM_auth_encryption_test_case_256_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_3),
+                       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_mb_AES_GCM_authenticated_decryption_test_case_4),
+                       test_AES_GCM_auth_decryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_5),
+                       test_AES_GCM_auth_decryption_test_case_256_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_6),
+                       test_AES_GCM_auth_decryption_test_case_256_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_7),
+                       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 GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8031,79 +8197,111 @@ static struct unit_test_suite cryptodev_aesni_gcm_testsuite  = {
        .unit_test_cases = {
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_1),
+                       test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_2),
+                       test_AES_GCM_authenticated_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_3),
+                       test_AES_GCM_authenticated_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_4),
+                       test_AES_GCM_authenticated_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_5),
+                       test_AES_GCM_authenticated_encryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_6),
+                       test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_7),
+                       test_AES_GCM_authenticated_encryption_test_case_7),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_1),
+                       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 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_mb_AES_GCM_authenticated_decryption_test_case_2),
+                       test_AES_GCM_auth_decryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_3),
+                       test_AES_GCM_auth_decryption_test_case_192_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_4),
+                       test_AES_GCM_auth_decryption_test_case_192_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_5),
+                       test_AES_GCM_auth_decryption_test_case_192_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_6),
+                       test_AES_GCM_auth_decryption_test_case_192_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_7),
+                       test_AES_GCM_auth_decryption_test_case_192_7),
 
                /** AES GCM Authenticated Encryption 256 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_1),
+                       test_AES_GCM_auth_encryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_2),
+                       test_AES_GCM_auth_encryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_3),
+                       test_AES_GCM_auth_encryption_test_case_256_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_4),
+                       test_AES_GCM_auth_encryption_test_case_256_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_5),
+                       test_AES_GCM_auth_encryption_test_case_256_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_6),
+                       test_AES_GCM_auth_encryption_test_case_256_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_7),
+                       test_AES_GCM_auth_encryption_test_case_256_7),
 
                /** AES GCM Authenticated Decryption 256 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_1),
+                       test_AES_GCM_auth_decryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_2),
+                       test_AES_GCM_auth_decryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_3),
+                       test_AES_GCM_auth_decryption_test_case_256_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_4),
+                       test_AES_GCM_auth_decryption_test_case_256_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_5),
+                       test_AES_GCM_auth_decryption_test_case_256_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_6),
+                       test_AES_GCM_auth_decryption_test_case_256_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_7),
+                       test_AES_GCM_auth_decryption_test_case_256_7),
 
                /** AES GCM Authenticated Encryption big aad size */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_aad_1),
+                       test_AES_GCM_auth_encryption_test_case_aad_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_aad_2),
+                       test_AES_GCM_auth_encryption_test_case_aad_2),
 
                /** AES GCM Authenticated Decryption big aad size */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_aad_1),
+                       test_AES_GCM_auth_decryption_test_case_aad_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_aad_2),
+                       test_AES_GCM_auth_decryption_test_case_aad_2),
 
                /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8127,15 +8325,15 @@ static struct unit_test_suite cryptodev_aesni_gcm_testsuite  = {
 
                /** Out of place tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_oop),
+                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_oop),
+                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
                /** Session-less tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_sessionless),
+                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_sessionless),
+                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
 
                /** Scatter-Gather */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8325,28 +8523,116 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
        .teardown = testsuite_teardown,
        .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
+                       test_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
+                       test_multi_session),
 
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_chain_dpaa2_sec_all),
+                       test_AES_chain_dpaa2_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_chain_dpaa2_sec_all),
+                       test_3DES_chain_dpaa2_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_cipheronly_dpaa2_sec_all),
+                       test_AES_cipheronly_dpaa2_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_cipheronly_dpaa2_sec_all),
+                       test_3DES_cipheronly_dpaa2_sec_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_authonly_dpaa2_sec_all),
 
-               /** HMAC_MD5 Authentication */
+               /** 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_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),
+
+               /** 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_MD5_HMAC_generate_case_1),
+                       test_AES_GCM_authenticated_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_MD5_HMAC_verify_case_1),
+                       test_AES_GCM_authenticated_decryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_MD5_HMAC_generate_case_2),
+                       test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_MD5_HMAC_verify_case_2),
+                       test_AES_GCM_authenticated_decryption_test_case_7),
+
+               /** 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),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
@@ -8394,14 +8680,31 @@ static struct unit_test_suite cryptodev_armv8_testsuite  = {
 static int
 test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_QAT_SYM_PMD;
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_QAT is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_FAILED;
+       }
+
        return unit_test_suite_runner(&cryptodev_qat_testsuite);
 }
 
 static int
 test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_AESNI_MB_PMD;
+       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_FAILED;
+       }
 
        return unit_test_suite_runner(&cryptodev_aesni_mb_testsuite);
 }
@@ -8409,7 +8712,15 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
 static int
 test_cryptodev_openssl(void)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_OPENSSL_PMD;
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OPENSSL_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_FAILED;
+       }
 
        return unit_test_suite_runner(&cryptodev_openssl_testsuite);
 }
@@ -8417,7 +8728,15 @@ test_cryptodev_openssl(void)
 static int
 test_cryptodev_aesni_gcm(void)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_AESNI_GCM_PMD;
+       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_FAILED;
+       }
 
        return unit_test_suite_runner(&cryptodev_aesni_gcm_testsuite);
 }
@@ -8425,7 +8744,15 @@ test_cryptodev_aesni_gcm(void)
 static int
 test_cryptodev_null(void)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_NULL_PMD;
+       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_FAILED;
+       }
 
        return unit_test_suite_runner(&cryptodev_null_testsuite);
 }
@@ -8433,7 +8760,15 @@ test_cryptodev_null(void)
 static int
 test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_SNOW3G_PMD;
+       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_FAILED;
+       }
 
        return unit_test_suite_runner(&cryptodev_sw_snow3g_testsuite);
 }
@@ -8441,7 +8776,15 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
 static int
 test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_KASUMI_PMD;
+       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_FAILED;
+       }
 
        return unit_test_suite_runner(&cryptodev_sw_kasumi_testsuite);
 }
@@ -8449,7 +8792,15 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
 static int
 test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_ZUC_PMD;
+       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_FAILED;
+       }
 
        return unit_test_suite_runner(&cryptodev_sw_zuc_testsuite);
 }
@@ -8457,7 +8808,15 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/)
 static int
 test_cryptodev_armv8(void)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_ARMV8_PMD;
+       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_FAILED;
+       }
 
        return unit_test_suite_runner(&cryptodev_armv8_testsuite);
 }
@@ -8467,7 +8826,22 @@ test_cryptodev_armv8(void)
 static int
 test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_SCHEDULER_PMD;
+       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");
+               return TEST_FAILED;
+       }
+
+       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");
+               return TEST_FAILED;
+}
        return unit_test_suite_runner(&cryptodev_scheduler_testsuite);
 }
 
@@ -8478,7 +8852,16 @@ REGISTER_TEST_COMMAND(cryptodev_scheduler_autotest, test_cryptodev_scheduler);
 static int
 test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
 {
-       gbl_cryptodev_type = RTE_CRYPTODEV_DPAA2_SEC_PMD;
+       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_FAILED;
+       }
+
        return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite);
 }