Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 58297,
    "url": "https://patches.dpdk.org/api/patches/58297/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1567146501-8224-11-git-send-email-anoobj@marvell.com/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<1567146501-8224-11-git-send-email-anoobj@marvell.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1567146501-8224-11-git-send-email-anoobj@marvell.com",
    "date": "2019-08-30T06:28:20",
    "name": "[10/11] test: add OCTEON TX2 tests",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "622ad926335e002ba7463a53b4ce06e84708e1b7",
    "submitter": {
        "id": 1205,
        "url": "https://patches.dpdk.org/api/people/1205/?format=api",
        "name": "Anoob Joseph",
        "email": "anoobj@marvell.com"
    },
    "delegate": {
        "id": 6690,
        "url": "https://patches.dpdk.org/api/users/6690/?format=api",
        "username": "akhil",
        "first_name": "akhil",
        "last_name": "goyal",
        "email": "gakhil@marvell.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1567146501-8224-11-git-send-email-anoobj@marvell.com/mbox/",
    "series": [
        {
            "id": 6176,
            "url": "https://patches.dpdk.org/api/series/6176/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6176",
            "date": "2019-08-30T06:28:10",
            "name": "add OCTEON TX2 crypto PMD",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/6176/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/58297/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/58297/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D29F21E8BF;\n\tFri, 30 Aug 2019 08:32:47 +0200 (CEST)",
            "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n\t[67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 9DC381E8BF\n\tfor <dev@dpdk.org>; Fri, 30 Aug 2019 08:32:46 +0200 (CEST)",
            "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n\tby mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n\tx7U6ULgJ027727; Thu, 29 Aug 2019 23:32:46 -0700",
            "from sc-exch03.marvell.com ([199.233.58.183])\n\tby mx0b-0016f401.pphosted.com with ESMTP id 2uk4rkyg4c-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); \n\tThu, 29 Aug 2019 23:32:45 -0700",
            "from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH03.marvell.com\n\t(10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tThu, 29 Aug 2019 23:32:43 -0700",
            "from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com\n\t(10.93.176.83) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n\tTransport; Thu, 29 Aug 2019 23:32:43 -0700",
            "from ajoseph83.caveonetworks.com.com (unknown [10.29.45.56])\n\tby maili.marvell.com (Postfix) with ESMTP id F13D73F7040;\n\tThu, 29 Aug 2019 23:32:39 -0700 (PDT)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n\th=from : to : cc :\n\tsubject : date : message-id : in-reply-to : references : mime-version\n\t: content-transfer-encoding : content-type; s=pfpt0818;\n\tbh=jxdXshCT0vSDWsvyQ9a6CxvnD4HzKDEW3gq9ZxvdkRc=;\n\tb=BfRXI6ECz6ZAZWK/6ToLvg7kBHE0ksxbgr0MCp/bNTHwt8TYw1UXZKYqEp+OE2WpQNC2\n\tvEyK0eV2e8OUtBmOx8IbbblR0keIbBJfE5lEV8Spnl1O9hzb1CB0MDdBCsHMpG891QrD\n\ttQdNMdnfSlNLiSLApUKGPfrs0WSCXpfY8PbvNjqhkrdVqBMTRcMqf2ec75qtf5McuKa/\n\tYTF81mIXfmxMjMJvJ5qHc3p6+ilCzbtOFsMHOIqXEm8Pv9Nqz+o75+ad+6HfPoSRtJ4B\n\tXzyyM0GBD+mpoebjoDx5nOnwiEYcuu5UFte/5P2W263bkguZfH2Qo+WpYDDY3ZBh030C\n\t0w== ",
        "From": "Anoob Joseph <anoobj@marvell.com>",
        "To": "Akhil Goyal <akhil.goyal@nxp.com>, Pablo de Lara\n\t<pablo.de.lara.guarch@intel.com>, Thomas Monjalon <thomas@monjalon.net>",
        "CC": "Anoob Joseph <anoobj@marvell.com>, Jerin Jacob <jerinj@marvell.com>,\n\tNarayana Prasad <pathreya@marvell.com>,\n\tAnkur Dwivedi <adwivedi@marvell.com>,\n\tTejasree Kondoj <ktejasree@marvell.com>, <dev@dpdk.org>",
        "Date": "Fri, 30 Aug 2019 11:58:20 +0530",
        "Message-ID": "<1567146501-8224-11-git-send-email-anoobj@marvell.com>",
        "X-Mailer": "git-send-email 2.7.4",
        "In-Reply-To": "<1567146501-8224-1-git-send-email-anoobj@marvell.com>",
        "References": "<1567146501-8224-1-git-send-email-anoobj@marvell.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Content-Type": "text/plain",
        "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.70,1.0.8\n\tdefinitions=2019-08-30_02:2019-08-29,2019-08-30 signatures=0",
        "Subject": "[dpdk-dev] [PATCH 10/11] test: add OCTEON TX2 tests",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "This patch adds the OCTEON TX2 crypto validation tests.\n\nSigned-off-by: Ankur Dwivedi <adwivedi@marvell.com>\nSigned-off-by: Anoob Joseph <anoobj@marvell.com>\nSigned-off-by: Tejasree Kondoj <ktejasree@marvell.com>\n---\n app/test/meson.build                        |   1 +\n app/test/test_cryptodev.c                   | 323 ++++++++++++++++++++++++++++\n app/test/test_cryptodev.h                   |   1 +\n app/test/test_cryptodev_aes_test_vectors.h  | 112 ++++++----\n app/test/test_cryptodev_blockcipher.c       |   7 +\n app/test/test_cryptodev_blockcipher.h       |   1 +\n app/test/test_cryptodev_des_test_vectors.h  |  12 +-\n app/test/test_cryptodev_hash_test_vectors.h |  75 ++++---\n 8 files changed, 466 insertions(+), 66 deletions(-)",
    "diff": "diff --git a/app/test/meson.build b/app/test/meson.build\nindex ec40943..b40fe9d 100644\n--- a/app/test/meson.build\n+++ b/app/test/meson.build\n@@ -270,6 +270,7 @@ driver_test_names = [\n         'cryptodev_dpaa_sec_autotest',\n         'cryptodev_dpaa2_sec_autotest',\n         'cryptodev_null_autotest',\n+        'cryptodev_octeontx2_autotest',\n         'cryptodev_openssl_autotest',\n         'cryptodev_openssl_asym_autotest',\n         'cryptodev_qat_autotest',\ndiff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c\nindex 4197feb..fe2322f 100644\n--- a/app/test/test_cryptodev.c\n+++ b/app/test/test_cryptodev.c\n@@ -2368,6 +2368,101 @@ test_authonly_octeontx_all(void)\n \treturn TEST_SUCCESS;\n }\n \n+static int\n+test_AES_chain_octeontx2_all(void)\n+{\n+\tstruct crypto_testsuite_params *ts_params = &testsuite_params;\n+\tint status;\n+\n+\tstatus = test_blockcipher_all_tests(ts_params->mbuf_pool,\n+\t\tts_params->op_mpool, ts_params->session_mpool,\n+\t\tts_params->session_priv_mpool,\n+\t\tts_params->valid_devs[0],\n+\t\trte_cryptodev_driver_id_get(\n+\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),\n+\t\tBLKCIPHER_AES_CHAIN_TYPE);\n+\n+\tTEST_ASSERT_EQUAL(status, 0, \"Test failed\");\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+static int\n+test_AES_cipheronly_octeontx2_all(void)\n+{\n+\tstruct crypto_testsuite_params *ts_params = &testsuite_params;\n+\tint status;\n+\n+\tstatus = test_blockcipher_all_tests(ts_params->mbuf_pool,\n+\t\tts_params->op_mpool, ts_params->session_mpool,\n+\t\tts_params->session_priv_mpool,\n+\t\tts_params->valid_devs[0],\n+\t\trte_cryptodev_driver_id_get(\n+\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),\n+\t\tBLKCIPHER_AES_CIPHERONLY_TYPE);\n+\n+\tTEST_ASSERT_EQUAL(status, 0, \"Test failed\");\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+static int\n+test_3DES_chain_octeontx2_all(void)\n+{\n+\tstruct crypto_testsuite_params *ts_params = &testsuite_params;\n+\tint status;\n+\n+\tstatus = test_blockcipher_all_tests(ts_params->mbuf_pool,\n+\t\tts_params->op_mpool, ts_params->session_mpool,\n+\t\tts_params->session_priv_mpool,\n+\t\tts_params->valid_devs[0],\n+\t\trte_cryptodev_driver_id_get(\n+\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),\n+\t\tBLKCIPHER_3DES_CHAIN_TYPE);\n+\n+\tTEST_ASSERT_EQUAL(status, 0, \"Test failed\");\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+static int\n+test_3DES_cipheronly_octeontx2_all(void)\n+{\n+\tstruct crypto_testsuite_params *ts_params = &testsuite_params;\n+\tint status;\n+\n+\tstatus = test_blockcipher_all_tests(ts_params->mbuf_pool,\n+\t\tts_params->op_mpool, ts_params->session_mpool,\n+\t\tts_params->session_priv_mpool,\n+\t\tts_params->valid_devs[0],\n+\t\trte_cryptodev_driver_id_get(\n+\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),\n+\t\tBLKCIPHER_3DES_CIPHERONLY_TYPE);\n+\n+\tTEST_ASSERT_EQUAL(status, 0, \"Test failed\");\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+static int\n+test_authonly_octeontx2_all(void)\n+{\n+\tstruct crypto_testsuite_params *ts_params = &testsuite_params;\n+\tint status;\n+\n+\tstatus = test_blockcipher_all_tests(ts_params->mbuf_pool,\n+\t\tts_params->op_mpool, ts_params->session_mpool,\n+\t\tts_params->session_priv_mpool,\n+\t\tts_params->valid_devs[0],\n+\t\trte_cryptodev_driver_id_get(\n+\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),\n+\t\tBLKCIPHER_AUTHONLY_TYPE);\n+\n+\tTEST_ASSERT_EQUAL(status, 0, \"Test failed\");\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n /* ***** SNOW 3G Tests ***** */\n static int\n create_wireless_algo_hash_session(uint8_t dev_id,\n@@ -11969,6 +12064,218 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {\n \t}\n };\n \n+static struct unit_test_suite cryptodev_octeontx2_testsuite  = {\n+\t.suite_name = \"Crypto Device OCTEON TX2 Unit Test Suite\",\n+\t.setup = testsuite_setup,\n+\t.teardown = testsuite_teardown,\n+\t.unit_test_cases = {\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_chain_octeontx2_all),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_cipheronly_octeontx2_all),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_3DES_chain_octeontx2_all),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_3DES_cipheronly_octeontx2_all),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_authonly_octeontx2_all),\n+\n+\t\t/** AES GCM Authenticated Encryption */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_encryption_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_encryption_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_encryption_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_encryption_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_encryption_test_case_5),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_encryption_test_case_6),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_encryption_test_case_7),\n+\n+\t\t/** AES GCM Authenticated Decryption */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_decryption_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_decryption_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_decryption_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_decryption_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_decryption_test_case_5),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_decryption_test_case_6),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GCM_authenticated_decryption_test_case_7),\n+\t\t/** AES GMAC Authentication */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GMAC_authentication_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GMAC_authentication_verify_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GMAC_authentication_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GMAC_authentication_verify_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GMAC_authentication_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_AES_GMAC_authentication_verify_test_case_3),\n+\n+\t\t/** SNOW 3G encrypt only (UEA2) */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_encryption_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_encryption_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_encryption_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_encryption_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_encryption_test_case_5),\n+\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_encryption_test_case_1_oop),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_decryption_test_case_1_oop),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_encryption_test_case_1_oop_sgl),\n+\n+\t\t/** SNOW 3G decrypt only (UEA2) */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_decryption_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_decryption_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_decryption_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_decryption_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_decryption_test_case_5),\n+\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_hash_generate_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_hash_generate_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_hash_generate_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_hash_verify_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_hash_verify_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_snow3g_hash_verify_test_case_3),\n+\n+\t\t/** ZUC encrypt only (EEA3) */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_encryption_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_encryption_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_encryption_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_encryption_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_encryption_test_case_5),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_hash_generate_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_hash_generate_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_hash_generate_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_hash_generate_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_hash_generate_test_case_5),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_zuc_encryption_test_case_6_sgl),\n+\n+\t\t/** KASUMI encrypt only (UEA1) */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_encryption_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_encryption_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_encryption_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_encryption_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_encryption_test_case_5),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_encryption_test_case_1_sgl),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_encryption_test_case_1_oop_sgl),\n+\t\t/** KASUMI decrypt only (UEA1) */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_decryption_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_decryption_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_decryption_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_decryption_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_decryption_test_case_5),\n+\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_encryption_test_case_1_oop),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_decryption_test_case_1_oop),\n+\n+\t\t/** KASUMI hash only (UIA1) */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_generate_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_generate_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_generate_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_generate_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_generate_test_case_5),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_generate_test_case_6),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_verify_test_case_1),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_verify_test_case_2),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_verify_test_case_3),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_verify_test_case_4),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_kasumi_hash_verify_test_case_5),\n+\n+\t\t/** NULL tests */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_null_cipher_only_operation),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_null_auth_only_operation),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_null_cipher_auth_operation),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\ttest_null_auth_cipher_operation),\n+\n+\t\t/** Negative tests */\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\tauthentication_verify_HMAC_SHA1_fail_data_corrupt),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\tauthentication_verify_HMAC_SHA1_fail_tag_corrupt),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\tauthentication_verify_AES128_GMAC_fail_data_corrupt),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\tauthentication_verify_AES128_GMAC_fail_tag_corrupt),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\tauth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),\n+\t\tTEST_CASE_ST(ut_setup, ut_teardown,\n+\t\t\tauth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),\n+\t\tTEST_CASES_END() /**< NULL terminate unit test array */\n+\t}\n+};\n+\n static int\n test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)\n {\n@@ -12237,6 +12544,21 @@ test_cryptodev_octeontx(void)\n }\n \n static int\n+test_cryptodev_octeontx2(void)\n+{\n+\tgbl_driver_id =\trte_cryptodev_driver_id_get(\n+\t\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));\n+\tif (gbl_driver_id == -1) {\n+\t\tRTE_LOG(ERR, USER1, \"OCTEON TX2 PMD must be loaded. Check if \"\n+\t\t\t\t\"CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is \"\n+\t\t\t\t\"enabled in config file to run this \"\n+\t\t\t\t\"testsuite.\\n\");\n+\t\treturn TEST_FAILED;\n+\t}\n+\treturn unit_test_suite_runner(&cryptodev_octeontx2_testsuite);\n+}\n+\n+static int\n test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/)\n {\n \tgbl_driver_id =\trte_cryptodev_driver_id_get(\n@@ -12267,4 +12589,5 @@ REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);\n REGISTER_TEST_COMMAND(cryptodev_ccp_autotest, test_cryptodev_ccp);\n REGISTER_TEST_COMMAND(cryptodev_virtio_autotest, test_cryptodev_virtio);\n REGISTER_TEST_COMMAND(cryptodev_octeontx_autotest, test_cryptodev_octeontx);\n+REGISTER_TEST_COMMAND(cryptodev_octeontx2_autotest, test_cryptodev_octeontx2);\n REGISTER_TEST_COMMAND(cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);\ndiff --git a/app/test/test_cryptodev.h b/app/test/test_cryptodev.h\nindex 14b54dc..241ed72 100644\n--- a/app/test/test_cryptodev.h\n+++ b/app/test/test_cryptodev.h\n@@ -66,6 +66,7 @@\n #define CRYPTODEV_NAME_CCP_PMD\t\tcrypto_ccp\n #define CRYPTODEV_NAME_VIRTIO_PMD\tcrypto_virtio\n #define CRYPTODEV_NAME_OCTEONTX_SYM_PMD\tcrypto_octeontx\n+#define CRYPTODEV_NAME_OCTEONTX2_PMD\tcrypto_octeontx2\n #define CRYPTODEV_NAME_CAAM_JR_PMD\tcrypto_caam_jr\n \n /**\ndiff --git a/app/test/test_cryptodev_aes_test_vectors.h b/app/test/test_cryptodev_aes_test_vectors.h\nindex ee4fdc9..986476d 100644\n--- a/app/test/test_cryptodev_aes_test_vectors.h\n+++ b/app/test/test_cryptodev_aes_test_vectors.h\n@@ -1638,7 +1638,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA1 Encryption Digest \"\n@@ -1647,7 +1648,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA1 Encryption Digest \"\n@@ -1663,7 +1665,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA1 Decryption Digest \"\n@@ -1680,7 +1683,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA1 Decryption Digest \"\n@@ -1691,7 +1695,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA1 Decryption Digest \"\n@@ -1700,7 +1705,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA256 Encryption Digest\",\n@@ -1716,7 +1722,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA256 Encryption Digest \"\n@@ -1725,7 +1732,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA256 Decryption Digest \"\n@@ -1741,7 +1749,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA256 Decryption Digest \"\n@@ -1750,7 +1759,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA512 Encryption Digest\",\n@@ -1765,7 +1775,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA512 Encryption Digest \"\n@@ -1776,7 +1787,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA512 Encryption Digest \"\n@@ -1788,7 +1800,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_FEATURE_OOP,\n \t\t.pmd_mask =\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA512 Decryption Digest \"\n@@ -1804,7 +1817,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA512 Decryption Digest \"\n@@ -1819,7 +1833,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC XCBC Encryption Digest\",\n@@ -1850,7 +1865,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MB |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA1 Encryption Digest \"\n@@ -1874,6 +1890,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2 |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MB\n \t},\n \t{\n@@ -1888,7 +1905,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA224 Decryption Digest \"\n@@ -1903,7 +1921,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC HMAC-SHA384 Encryption Digest\",\n@@ -1943,7 +1962,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr =\n@@ -1955,7 +1975,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"NULL-CIPHER-NULL-AUTH encrypt & gen x8byte\",\n@@ -2058,7 +2079,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CBC Decryption\",\n@@ -2074,7 +2096,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-192-CBC Encryption\",\n@@ -2089,7 +2112,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-192-CBC Encryption Scater gather\",\n@@ -2101,7 +2125,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-192-CBC Decryption\",\n@@ -2116,7 +2141,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-192-CBC Decryption Scatter Gather\",\n@@ -2126,7 +2152,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-256-CBC Encryption\",\n@@ -2142,7 +2169,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-256-CBC Decryption\",\n@@ -2158,7 +2186,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-256-CBC OOP Encryption\",\n@@ -2201,7 +2230,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CTR Decryption\",\n@@ -2216,7 +2246,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-192-CTR Encryption\",\n@@ -2230,7 +2261,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-192-CTR Decryption\",\n@@ -2244,7 +2276,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-256-CTR Encryption\",\n@@ -2259,7 +2292,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-256-CTR Decryption\",\n@@ -2274,28 +2308,32 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-CTR Encryption (12-byte IV)\",\n \t\t.test_data = &aes_test_data_1_IV_12_bytes,\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-192-CTR Encryption (12-byte IV)\",\n \t\t.test_data = &aes_test_data_2_IV_12_bytes,\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-256-CTR Encryption (12-byte IV)\",\n \t\t.test_data = &aes_test_data_3_IV_12_bytes,\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"AES-128-XTS Encryption (16-byte plaintext)\",\ndiff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c\nindex b8dcc39..4f0278c 100644\n--- a/app/test/test_cryptodev_blockcipher.c\n+++ b/app/test/test_cryptodev_blockcipher.c\n@@ -77,6 +77,8 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,\n \t\t\tRTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));\n \tint octeontx_pmd = rte_cryptodev_driver_id_get(\n \t\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));\n+\tint octeontx2_pmd = rte_cryptodev_driver_id_get(\n+\t\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));\n \tint null_pmd = rte_cryptodev_driver_id_get(\n \t\t\t\tRTE_STR(CRYPTODEV_NAME_NULL_PMD));\n \n@@ -125,6 +127,7 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,\n \t\t\tdriver_id == ccp_pmd ||\n \t\t\tdriver_id == virtio_pmd ||\n \t\t\tdriver_id == octeontx_pmd ||\n+\t\t\tdriver_id == octeontx2_pmd ||\n \t\t\tdriver_id == null_pmd) { /* Fall through */\n \t\tdigest_len = tdata->digest.len;\n \t} else if (driver_id == aesni_mb_pmd ||\n@@ -715,6 +718,8 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,\n \t\t\tRTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));\n \tint octeontx_pmd = rte_cryptodev_driver_id_get(\n \t\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));\n+\tint octeontx2_pmd = rte_cryptodev_driver_id_get(\n+\t\t\tRTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));\n \tint null_pmd = rte_cryptodev_driver_id_get(\n \t\t\t\tRTE_STR(CRYPTODEV_NAME_NULL_PMD));\n \n@@ -787,6 +792,8 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,\n \t\ttarget_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO;\n \telse if (driver_id == octeontx_pmd)\n \t\ttarget_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX;\n+\telse if (driver_id == octeontx2_pmd)\n+\t\ttarget_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2;\n \telse if (driver_id == null_pmd)\n \t\ttarget_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_NULL;\n \telse\ndiff --git a/app/test/test_cryptodev_blockcipher.h b/app/test/test_cryptodev_blockcipher.h\nindex 3d4b975..d5e0801 100644\n--- a/app/test/test_cryptodev_blockcipher.h\n+++ b/app/test/test_cryptodev_blockcipher.h\n@@ -32,6 +32,7 @@\n #define BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR\t0x0400 /* CAAM_JR flag */\n #define BLOCKCIPHER_TEST_TARGET_PMD_CCP\t\t0x0800 /* CCP flag */\n #define BLOCKCIPHER_TEST_TARGET_PMD_NULL\t0x1000 /* NULL flag */\n+#define BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\t0x2000 /* OCTEON TX2 flag */\n \n #define BLOCKCIPHER_TEST_OP_CIPHER\t(BLOCKCIPHER_TEST_OP_ENCRYPT | \\\n \t\t\t\t\tBLOCKCIPHER_TEST_OP_DECRYPT)\ndiff --git a/app/test/test_cryptodev_des_test_vectors.h b/app/test/test_cryptodev_des_test_vectors.h\nindex a71b0e9..9d2d0e7 100644\n--- a/app/test/test_cryptodev_des_test_vectors.h\n+++ b/app/test/test_cryptodev_des_test_vectors.h\n@@ -1114,7 +1114,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"3DES-192-CBC HMAC-SHA1 Decryption Digest Verify\",\n@@ -1127,7 +1128,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"3DES-192-CBC SHA1 Encryption Digest\",\n@@ -1296,7 +1298,8 @@ static const struct blockcipher_test_case triple_des_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MB |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"3DES-192-CBC Decryption\",\n@@ -1310,7 +1313,8 @@ static const struct blockcipher_test_case triple_des_cipheronly_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MB |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"3DES-128-CTR Encryption\",\ndiff --git a/app/test/test_cryptodev_hash_test_vectors.h b/app/test/test_cryptodev_hash_test_vectors.h\nindex 6f201c0..cff2831 100644\n--- a/app/test/test_cryptodev_hash_test_vectors.h\n+++ b/app/test/test_cryptodev_hash_test_vectors.h\n@@ -413,7 +413,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"MD5 Digest Verify\",\n@@ -421,7 +422,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-MD5 Digest\",\n@@ -435,7 +437,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-MD5 Digest Verify\",\n@@ -449,7 +452,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA1 Digest\",\n@@ -461,7 +465,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA1 Digest Verify\",\n@@ -473,7 +478,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA1 Digest\",\n@@ -488,7 +494,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA1 Digest Scatter Gather\",\n@@ -498,7 +505,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA1 Digest Verify\",\n@@ -513,7 +521,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA1 Digest Verify Scatter Gather\",\n@@ -523,7 +532,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA224 Digest\",\n@@ -535,7 +545,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA224 Digest Verify\",\n@@ -547,7 +558,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA224 Digest\",\n@@ -561,7 +573,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA224 Digest Verify\",\n@@ -575,7 +588,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA256 Digest\",\n@@ -587,7 +601,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA256 Digest Verify\",\n@@ -599,7 +614,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA256 Digest\",\n@@ -614,7 +630,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA256 Digest Verify\",\n@@ -629,7 +646,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA384 Digest\",\n@@ -641,7 +659,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA384 Digest Verify\",\n@@ -653,7 +672,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA384 Digest\",\n@@ -668,7 +688,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA384 Digest Verify\",\n@@ -683,7 +704,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"SHA512 Digest\",\n@@ -707,7 +729,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)\n \t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_MB |\n #endif\n-\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\t    BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA512 Digest\",\n@@ -722,7 +745,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"HMAC-SHA512 Digest Verify\",\n@@ -737,7 +761,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_QAT |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_CCP |\n \t\t\tBLOCKCIPHER_TEST_TARGET_PMD_MVSAM |\n-\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |\n+\t\t\tBLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2\n \t},\n \t{\n \t\t.test_descr = \"CMAC Digest 12B\",\n",
    "prefixes": [
        "10/11"
    ]
}