From patchwork Thu Oct 5 12:50:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil Goyal X-Patchwork-Id: 29709 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 00A1A1B1BB; Thu, 5 Oct 2017 14:52:52 +0200 (CEST) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0060.outbound.protection.outlook.com [104.47.33.60]) by dpdk.org (Postfix) with ESMTP id 69BD01B1AB; Thu, 5 Oct 2017 14:52:49 +0200 (CEST) Received: from BN3PR03CA0109.namprd03.prod.outlook.com (2603:10b6:400:4::27) by SN2PR03MB2365.namprd03.prod.outlook.com (2603:10b6:804:e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 5 Oct 2017 12:52:48 +0000 Received: from BN1AFFO11FD047.protection.gbl (2a01:111:f400:7c10::145) by BN3PR03CA0109.outlook.office365.com (2603:10b6:400:4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Thu, 5 Oct 2017 12:52:48 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; NXP1.onmicrosoft.com; dkim=none (message not signed) header.d=none;NXP1.onmicrosoft.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD047.mail.protection.outlook.com (10.58.53.62) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Thu, 5 Oct 2017 12:52:48 +0000 Received: from netperf2.ap.freescale.net ([10.232.133.164]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v95Cqhpj014901; Thu, 5 Oct 2017 05:52:44 -0700 From: Akhil Goyal To: CC: , , , , Akhil Goyal Date: Thu, 5 Oct 2017 18:20:08 +0530 Message-ID: <20171005125008.18783-1-akhil.goyal@nxp.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171003092911.32447-1-akhil.goyal@nxp.com> References: <20171003092911.32447-1-akhil.goyal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131516815683165892; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7966004)(39860400002)(39380400002)(376002)(346002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(97736004)(8936002)(16586007)(2906002)(305945005)(86362001)(50986999)(1076002)(76176999)(47776003)(50226002)(36756003)(5003940100001)(4326008)(81156014)(498600001)(81166006)(8676002)(105606002)(2351001)(106466001)(33646002)(53936002)(104016004)(2950100002)(189998001)(68736007)(6666003)(85426001)(356003)(6916009)(50466002)(48376002)(77096006)(54906003)(316002)(8656003)(69596002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2365; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD047; 1:bRbFAFGNonROOFIOEMSgrbcSI2qaMRnUF6JtcGURl0Df29J/DFMdJeZNceD3QX7lNCgOJ72OSn9kJw2jRP4z+ts9BqXv3JrZXgkNW8l/LsgtwcqeM/auJemyzmHGEIF2 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 659e13a1-4f5f-48a4-bd65-08d50beffb3d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:SN2PR03MB2365; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 3:Xurbu/23VxaLXFedLWhYzLEd6e0FnNjsZwsjPhqMBXAJpfI4OnAf05RaLjrgI1s1txsAF7JEDyK45iH+ZCOzr7TID+KWeYhHWLtZxo7NblOo758qhnGJizNzbCqf0m6VVmmpvKTJWDrMd9VuAfZCkS0l2w2XdBSI3FV1HyEq1KevvHqtEx5gsErD3XCavw2hL5MX9NAMeB0zKDdOuPwN23j/3TCgP9GKQuE5iaLyBXrm1Ez4C3tm0OnFFkeTiacxGfqDk4zFHRrQEo6IrOg4AoMot2xYi/4QwOGLgaq/vLQcyzU0ml7qVUEjrqMju32mGLKUtAyPRsRZrKaBBDesXw==; 25:767ZGptc8SoTXqL32Kvm9mngljZSerzm4MDW8PWaqjKpFk9sKLDh3CvoNVFcBLUaxom/4C/sC6AVk/1AeBHDNH06lKpzX+inwBDdvM5ofKrBGJZEQndRk6PHRl5NvR+EhH7/+32nWm4oszDfVK5+rDwyxNg2c18mCGpJR90VugfDmj0yCBLi4k7RVl5ccOQTUimgviBR8/6LnW/exzFK1xyTYkyY3LzuSGjYEYwpVjQJSdcW2KHZA6SryqWJVbKeaFpHZnTIOeinElfN44TYvazPOvF5IqQmKuAn3S8r4ARS/MwIX7mmD+LYi9sB5FbU8FhyZlyaD8Q2gE8ZwdnG7w==; 31:RNmfJfMZ8hzxsffV/D5G4m1jBw+jUJCpB4ItDTybz6CSbiRFDOp4ulCM+3k6e01rQTC6ETonyMM6cKSRYFQOLyXE1XV2tMCf8E59w2+yh05yJfF3VqsrzkZ19NBo04xUmTPuHbk2anJw8a5eg4iz9HTkXKxizNq4RD7crsKdBiQFNpTOl289QF77l03EMmbDZvaOh/agQTN+UXczcxNCTQcQohu08OODcUlWmaVsmbI= X-MS-TrafficTypeDiagnostic: SN2PR03MB2365: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(100000703101)(100105400095)(10201501046)(6055026)(6096035)(20161123556025)(20161123563025)(20161123565025)(20161123561025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN2PR03MB2365; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN2PR03MB2365; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 4:tdOkpwEdHC6e1HpRVQiI5xjOFx42wzSdrNSv2PLutb/mpEpXcJH6sva9CChl3Wsd27RraZczW5aPgWkkjeFUW/sRBAQAK4d1xfxmRtSwjcJDqfVU4lsQJfk5XsMC9vo2pQyzNndOKSSbwkScgVRwEPGGsJene9EOUdsgrG9NDqFRryWPiRAhmSfWd4v/BiC7Gvctzh5JQSs5mEb4DebfoncAHytW15Je64coCAKJIAwJNWeBVfekhjWPa1hUe+7iz9Fj85FOsMbILKRsVEDhmdRNpg8Jkh3pOB2M6SLiFig= X-Forefront-PRVS: 04519BA941 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2365; 23:52Q2nq0xfAWjPgmrVPkwhbnXSKSCypZe3xrB7CJZV?= 9zbH77cyKuCzL5EbTvLwFNLa8N/gweDKN/m4V+4Tm5Hza/yLcUtD/qvUvXgSddpFfWHGdhCTfuKYFDAvAh+/ToPQdpOgmIXdQ+uFsFkX5x0s/KPv+Y5kIojc992GUSaBQ6U72Bd+DYC/uHpOM6JmdmvZY/oz7OFmQxcZrGk8C0OtvfGMRWcUHW+GtlO2jmsx477nh33XIYnaAz0lkHzw3NNIHbSimJMTS1RwqpP761Q5+n78vROQM7nJQdCBibfB+6yy/OpbMgzgL+KZUs/+PhVfxbwTnVRVsw0I5Ec9t6OA30VkfaoUeKjB+GBuLvXZTeXNeYVBCC4w+8i/RLM3RV3y08/5odesbmHQm691KRmK5KqJ9PAmPi/vKP1yZTDY0N/zZ7i7Z2Ns4uLMykAAr9pV2VUHIXnku4M4vo6X713VbhglEFnj71AZ/cV8fBm7iKB5BGCQagpkki9hvWLyejzZS0qnt1b0cniCgS9DKIRxOExLrKQLTqRj3PqU4sc3IwTDAeWoIrxnxbzryQYHKyIWm95UokcyFWwJj3JO7KSOMNXsOfj1LLKfbGExM46KJnMmBMJ1mtG/8LeFgx5gl7bkIc1YHXK71lT5nZM4IxRL7hQgsL38DsJELHlZoIMAdFQGnKlf37IeGTu3nxFTmKDW0Grq+jVrmAOXf1LGSvoI0rFx3BDcLwAOBRooKIXmi3KjGSoLTrguzt8+cv0it4d5q/ishuAdXkPkuAxJhpHGwuOVV4NSArHzTMWlB5MPedSZvkqlwieU/kcMDDE8x+Zw/QJnD1mVw3ibX9MA3bDTZ5Bl8pDdeRhj7E7lC9fcQgE+q2QOH1q/LBeVVMNaLM2mDZcMimzuR0w926URe93djNUiYIiCn0pnJtUvuUUROm9n3yvZmcHIU5n+5ptRGNeEV3PWQDGIy9waFN8x0s8lbIYOAUb/0UXSkBTQaIfaC7UkjM8SajQDFVNOtP48B61ZWnrd/GEl+8GW+6FVRimKerxSQaDnLQVkgyBCYiQmKfSQPzGn+biQ17Y/z+1Dt5SYjBSLQRr5GnLWjYcenMDinZpgz3GEdjxhZE/DOS3H5qWvUTpKHLJ+yYhLClMIbbLjD1eZE4xbkq+3xdr5/SWWE8ydBKckh3floFZM7OlCCnz1EORJrSigxEGSnKslxqutmwijpYBEdzkfnOkBZx6+g== X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 6:aOEdyBzQorw9fsDcjQzngxiAnK7KGgsEFop9ZfntBBcuVdzDKxQdgzTI0r46Tj4ZHESRVTzkthf3ybBx+uyCWgaJTClYVpHlp9pItnYt5QNIqwvZZX0Vrganlc/0CVTboMC+SLIc6hlSk9XIxUJ03f3EcxKrjxPHIWkIZvcOOzQmvTUFtlfGY+P9FarIrNGMLDqXPT6uS5tuSatI4wqoLTpo6jo0f9AAHU1BmMruQWjxO7xsiSMdM+Q7buMd1lukAwC6vcdhtSL/uEhUwYB9mqi4Pn/tNfVIrSibTKtyBcGTsrgjmgyF2HA7lj5NZADoJVf+ddHvNDi39l17T8fV8w==; 5:opRvd8QpsNacrRk+IzluMdBrxyuaFhXcQqkQJY/dUAAEmYkkUC1+SGBs/Cvd22Fi28z+Wdzvgu4cg0KG5oyRXtOBLfztm4vh98+zMljO1d7pLQkcyh9MD8KeNrXj6xxZ35qrSgVSUnmxQjKacPy3GA==; 24:28emgCVtBP/Gy56AF3WqiUYNQ88ZU+8TKnyMJfcvBl5ZQFN++x6H8FEe1bUfwu4FvfHEDBQxtHsquIuBzQBlf5SfLuMUe+eIVn5PVCBvrzM=; 7:eLrsbwiUnOQt7eCgdhLFzozvfb56RMpKkqKwpEO/+khxmbxsv3bM4l1YosRv3BhfUAaZUCBl7Vamk9rHi1yeQPnOlEfxGG0Cb0OVRh9747qjDhNDTEWl7WmEb5W3oNvoEbx+mycXW7sVmFVKL3ar6RsY9Weadyc8idGJRRZBHnSODyCh2zfcFOhPDUIrZ/y2TJFbcalDSwTfAS3RAC8wmCgWC0YjwO5kKFPWQ3ksqwQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2017 12:52:48.0669 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2365 Subject: [dpdk-dev] [PATCH v2] test/crypto: fix dpaa2_sec macros and definitions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fixes: 7a364faef185 ("cryptodev: remove crypto device type enumeration") Cc: stable@dpdk.org Signed-off-by: Akhil Goyal --- changes in v2: incorporated comments from Pablo test/test/test_cryptodev.c | 2 +- test/test/test_cryptodev_blockcipher.c | 4 ++-- test/test/test_cryptodev_perf.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c index a4116c6..132f99c 100644 --- 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 6089af4..baa8512 100644 --- a/test/test/test_cryptodev_blockcipher.c +++ b/test/test/test_cryptodev_blockcipher.c @@ -602,7 +602,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)); @@ -668,7 +668,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 --- 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 "";