[dpdk-stable] [EXT] patch 'test/crypto: fix duplicate id used by CCP device' has been queued to LTS release 18.11.2

[Hemant Agrawal]

Looks ok

-----Original Message-----
From: Kevin Traynor <ktraynor at redhat.com> 
Sent: Tuesday, April 16, 2019 8:06 PM
To: Hemant Agrawal <hemant.agrawal at nxp.com>
Cc: Anoob Joseph <anoobj at marvell.com>; Akhil Goyal <akhil.goyal at nxp.com>; dpdk stable <stable at dpdk.org>
Subject: [EXT] patch 'test/crypto: fix duplicate id used by CCP device' has been queued to LTS release 18.11.2

WARNING: This email was created outside of NXP. DO NOT CLICK links or attachments unless you recognize the sender and know the content is safe.



Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpdk.org%2Fbrowse%2Fdpdk-stable&data=02%7C01%7Chemant.agrawal%40nxp.com%7C9459b6db3d8c4198449b08d6c27915e9%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636910222674367885&sdata=w0hKR7ThFqkriJRObB8muF88LnvtE%2B6nCHwlcINhLqo%3D&reserved=0 yet.
It will be pushed if I get no objections before 04/24/19. So please shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was correctly done.

Thanks.

Kevin Traynor

---
>From 28632b66553b11af1ff3d9e151957a7dd4f47dc5 Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal at nxp.com>
Date: Wed, 6 Mar 2019 22:10:34 +0530
Subject: [PATCH] test/crypto: fix duplicate id used by CCP device

[ upstream commit 610e235a11e49a1e5d55c2804a5bc628e87417f1 ]

These duplicate device id is causing incorrect mapping for DPAA_SEC for test case execution on the basis of capabilities.

Fixes: e155ca055e84 ("test/crypto: add tests for AMD CCP")

Reported-by: Anoob Joseph <anoobj at marvell.com>
Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 test/test/test_cryptodev_blockcipher.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test/test_cryptodev_blockcipher.h b/test/test/test_cryptodev_blockcipher.h
index f8bd85838..52c377649 100644
--- a/test/test/test_cryptodev_blockcipher.h
+++ b/test/test/test_cryptodev_blockcipher.h
@@ -28,8 +28,8 @@
 #define BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC   0x0040 /* DPAA_SEC flag */
 #define BLOCKCIPHER_TEST_TARGET_PMD_MVSAM      0x0080 /* Marvell flag */
-#define BLOCKCIPHER_TEST_TARGET_PMD_CCP                0x0040 /* CCP flag */
-#define BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO     0x0200 /* VIRTIO flag */
 #define BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX   0x0100 /* OCTEON TX flag */
+#define BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO     0x0200 /* VIRTIO flag */
 #define BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR    0x0400 /* CAAM_JR flag */
+#define BLOCKCIPHER_TEST_TARGET_PMD_CCP                0x0800 /* CCP flag */

 #define BLOCKCIPHER_TEST_OP_CIPHER     (BLOCKCIPHER_TEST_OP_ENCRYPT | \
--
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -   2019-04-16 15:34:25.437350407 +0100
+++ 0005-test-crypto-fix-duplicate-id-used-by-CCP-device.patch  
+++ 2019-04-16 15:34:25.108181547 +0100
@@ -1,26 +1,27 @@
-From 610e235a11e49a1e5d55c2804a5bc628e87417f1 Mon Sep 17 00:00:00 2001
+From 28632b66553b11af1ff3d9e151957a7dd4f47dc5 Mon Sep 17 00:00:00 2001
 From: Hemant Agrawal <hemant.agrawal at nxp.com>
 Date: Wed, 6 Mar 2019 22:10:34 +0530
 Subject: [PATCH] test/crypto: fix duplicate id used by CCP device

+[ upstream commit 610e235a11e49a1e5d55c2804a5bc628e87417f1 ]
+
 These duplicate device id is causing incorrect mapping  for DPAA_SEC for test case execution on the basis of  capabilities.

 Fixes: e155ca055e84 ("test/crypto: add tests for AMD CCP")
-Cc: stable at dpdk.org

 Reported-by: Anoob Joseph <anoobj at marvell.com>
 Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
 Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
 ---
- app/test/test_cryptodev_blockcipher.h | 4 ++--
+ test/test/test_cryptodev_blockcipher.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

-diff --git a/app/test/test_cryptodev_blockcipher.h b/app/test/test_cryptodev_blockcipher.h
-index 5c22d5da6..6925a6c0d 100644
---- a/app/test/test_cryptodev_blockcipher.h
-+++ b/app/test/test_cryptodev_blockcipher.h
+diff --git a/test/test/test_cryptodev_blockcipher.h 
+b/test/test/test_cryptodev_blockcipher.h
+index f8bd85838..52c377649 100644
+--- a/test/test/test_cryptodev_blockcipher.h
++++ b/test/test/test_cryptodev_blockcipher.h
 @@ -28,8 +28,8 @@
  #define BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC  0x0040 /* DPAA_SEC flag */
  #define BLOCKCIPHER_TEST_TARGET_PMD_MVSAM     0x0080 /* Marvell flag */