From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 07AF9A00E6 for ; Tue, 16 Apr 2019 16:37:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F19621B4D3; Tue, 16 Apr 2019 16:37:43 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 560871B4DF for ; Tue, 16 Apr 2019 16:37:42 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B79022D7F9; Tue, 16 Apr 2019 14:37:41 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F71E1001E92; Tue, 16 Apr 2019 14:37:40 +0000 (UTC) From: Kevin Traynor To: Hemant Agrawal Cc: Anoob Joseph , Akhil Goyal , dpdk stable Date: Tue, 16 Apr 2019 15:36:23 +0100 Message-Id: <20190416143719.21601-5-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 16 Apr 2019 14:37:41 +0000 (UTC) Subject: [dpdk-stable] patch 'test/crypto: fix duplicate id used by CCP device' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable 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 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 Signed-off-by: Hemant Agrawal Acked-by: Akhil Goyal --- 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 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@dpdk.org Reported-by: Anoob Joseph Signed-off-by: Hemant Agrawal Acked-by: Akhil Goyal --- - 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 */