test/crypto: fix dpaa2 sec macros and definitions

Fixes: 7a364faef185 ("cryptodev: remove crypto device type enumeration")

Cc: stable@dpdk.org
Signed-off-by: Akhil Goyal <akhil.goyal@nxp.com>

diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index a4116c6..132f99c 100644 (file)
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -1816,7 +1816,7 @@ test_authonly_dpaa2_sec_all(void)
                ts_params->session_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(RTE_CRYPTODEV_DPAA2_SEC_PMD)),
+               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
                BLKCIPHER_AUTHONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");

diff --git a/test/test/test_cryptodev_blockcipher.c b/test/test/test_cryptodev_blockcipher.c
index f8222bd..89b02e5 100644 (file)
--- a/test/test/test_cryptodev_blockcipher.c
+++ b/test/test/test_cryptodev_blockcipher.c
@@ -577,7 +577,7 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,
 
        int openssl_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD));
-       int dpaa2_pmd = rte_cryptodev_driver_id_get(
+       int dpaa2_sec_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD));
        int scheduler_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD));
@@ -643,7 +643,7 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8;
        else if (driver_id == scheduler_pmd)
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER;
-       else if (driver_id == dpaa2_pmd)
+       else if (driver_id == dpaa2_sec_pmd)
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC;
        else
                TEST_ASSERT(0, "Unrecognized cryptodev type");

diff --git a/test/test/test_cryptodev_perf.c b/test/test/test_cryptodev_perf.c
index 3b57e6d..5df2e6e 100644 (file)
--- a/test/test/test_cryptodev_perf.c
+++ b/test/test/test_cryptodev_perf.c
@@ -211,7 +211,7 @@ static const char *pmd_name(uint8_t driver_id)
 {
        uint8_t null_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_NULL_PMD));
-       uint8_t dpaa2_pmd = rte_cryptodev_driver_id_get(
+       uint8_t dpaa2_sec_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD));
        uint8_t snow3g_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
@@ -232,7 +232,7 @@ static const char *pmd_name(uint8_t driver_id)
                return RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD);
        else if (driver_id == snow3g_pmd)
                return RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD);
-       else if (driver_id == dpaa2_pmd)
+       else if (driver_id == dpaa2_sec_pmd)
                return RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD);
        else
                return "";