test/crypto: fix dpaa2 sec macros and definitions

[dpdk.git] / test / test / test_cryptodev_perf.c

diff --git a/test/test/test_cryptodev_perf.c b/test/test/test_cryptodev_perf.c
index e21f5e7..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 "";
@@ -423,7 +423,7 @@ testsuite_setup(void)
                        "session mempool allocation failed");
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->dev_id,
-                       &ts_params->conf, ts_params->sess_mp),
+                       &ts_params->conf),
                        "Failed to configure cryptodev %u",
                        ts_params->dev_id);
 
@@ -433,7 +433,8 @@ testsuite_setup(void)
                TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
                        ts_params->dev_id, qp_id,
                                &ts_params->qp_conf,
-                               rte_cryptodev_socket_id(ts_params->dev_id)),
+                               rte_cryptodev_socket_id(ts_params->dev_id),
+                               ts_params->sess_mp),
                                "Failed to setup queue pair %u on cryptodev %u",
                                qp_id, ts_params->dev_id);
        }
@@ -2880,7 +2881,7 @@ test_perf_create_openssl_session(uint8_t dev_id, enum chain_mode chain,
                case RTE_CRYPTO_AEAD_AES_GCM:
                        aead_xform.aead.key.data = aes_key;
                        aead_xform.aead.iv.length = AES_CIPHER_IV_LENGTH;
-                       aead_xform.aead.add_auth_data_length = AES_GCM_AAD_LENGTH;
+                       aead_xform.aead.aad_length = AES_GCM_AAD_LENGTH;
                        aead_xform.aead.digest_length = get_aead_digest_length(aead_algo);
                        break;
                default:
@@ -2949,7 +2950,7 @@ test_perf_create_armv8_session(uint8_t dev_id, enum chain_mode chain,
 
        auth_xform.auth.digest_length = get_auth_digest_length(auth_algo);
 
-       rte_cryptodev_sym_session_create(ts_params->sess_mp);
+       test_crypto_session = rte_cryptodev_sym_session_create(ts_params->sess_mp);
 
        switch (chain) {
        case CIPHER_HASH:
@@ -4266,7 +4267,7 @@ test_perf_create_session(uint8_t dev_id, struct perf_test_params *pparams)
        aead_xform.aead.key.length = pparams->session_attrs->key_aead_len;
        aead_xform.aead.iv.length = pparams->session_attrs->iv_len;
        aead_xform.aead.iv.offset = IV_OFFSET;
-       aead_xform.aead.add_auth_data_length = pparams->session_attrs->aad_len;
+       aead_xform.aead.aad_length = pparams->session_attrs->aad_len;
        aead_xform.aead.digest_length = pparams->session_attrs->digest_len;
 
        test_crypto_session = rte_cryptodev_sym_session_create(ts_params->sess_mp);