test/crypto: do not check for internal PMD information
authorPablo de Lara <pablo.de.lara.guarch@intel.com>
Thu, 16 Apr 2020 17:24:24 +0000 (18:24 +0100)
committerAkhil Goyal <akhil.goyal@nxp.com>
Sun, 19 Apr 2020 20:34:26 +0000 (22:34 +0200)
Now that capabilities are checked to see if an algorithm
is supported by a device, there is no need to check
for a specific version of a library used in a PMD.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Adam Dybkowski <adamx.dybkowski@intel.com>
Tested-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
app/test/test_cryptodev_hash_test_vectors.h

index cff2831..2ed077f 100644 (file)
@@ -9,11 +9,6 @@
 #include <intel-ipsec-mb.h>
 #endif
 
-#if !defined(IMB_VERSION_NUM)
-#define IMB_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-#define IMB_VERSION_NUM IMB_VERSION(0, 49, 0)
-#endif
-
 static const uint8_t plaintext_hash[] = {
        "What a lousy earth! He wondered how many people "
        "were destitute that same night even in his own "
@@ -462,9 +457,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
@@ -475,9 +468,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
@@ -542,9 +533,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
@@ -555,9 +544,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
@@ -598,9 +585,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
@@ -611,9 +596,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
@@ -656,9 +639,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
@@ -669,9 +650,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
@@ -714,9 +693,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
        },
        {
@@ -726,9 +703,7 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
-#endif
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },