[dpdk-stable] patch 'crypto/armv8: use dedicated log type' has been queued to LTS release 18.11.10

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/20. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/16147e7969ad44f020c1ed320869866816c6453a

Thanks.

Kevin.

---
From 16147e7969ad44f020c1ed320869866816c6453a Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang@arm.com>
Date: Tue, 28 Jul 2020 17:24:05 +0800
Subject: [PATCH] crypto/armv8: use dedicated log type

[ upstream commit 28b0514504cf0f71f822f0aed5aacc83eb8ada12 ]

armv8 crypto PMD used CRYPTODEV general log type.
Create a dedicated log type for the PMD to not pollute CRYPTODEV log type.

Typo in crypto dev name macro caused unexpected device name in log.
Fixed the typo to log with correct device name.

Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors")

Suggested-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/armv8/rte_armv8_pmd.c         |  2 ++
 drivers/crypto/armv8/rte_armv8_pmd_private.h | 23 ++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
index efdde399de..440417c65f 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -851,4 +851,6 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
 static struct cryptodev_driver armv8_crypto_drv;
 
+RTE_LOG_REGISTER(crypto_armv8_log_type, pmd.crypto.armv8, ERR);
+
 RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv);
 RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_ARMV8_PMD, cryptodev_armv8_pmd);
diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h
index 04ce1cc0e4..daad14b8da 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h
+++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h
@@ -9,17 +9,22 @@
 /**< ARMv8 Crypto PMD device name */
 
-#define ARMV8_CRYPTO_LOG_ERR(fmt, args...) \
-	RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+extern int crypto_armv8_log_type;
+
+#define ARMV8_CRYPTO_LOG_ERR(fmt, args...)			\
+	rte_log(RTE_LOG_ERR, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
-#define ARMV8_CRYPTO_LOG_INFO(fmt, args...) \
-	RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+#define ARMV8_CRYPTO_LOG_INFO(fmt, args...)			\
+	rte_log(RTE_LOG_INFO, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
-#define ARMV8_CRYPTO_LOG_DBG(fmt, args...) \
-	RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+#define ARMV8_CRYPTO_LOG_DBG(fmt, args...)			\
+	rte_log(RTE_LOG_DEBUG, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.544052543 +0100
+++ 0026-crypto-armv8-use-dedicated-log-type.patch	2020-08-28 11:03:25.951955670 +0100
@@ -1 +1 @@
-From 28b0514504cf0f71f822f0aed5aacc83eb8ada12 Mon Sep 17 00:00:00 2001
+From 16147e7969ad44f020c1ed320869866816c6453a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 28b0514504cf0f71f822f0aed5aacc83eb8ada12 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -19,2 +20,2 @@
- drivers/crypto/armv8/armv8_pmd_private.h | 23 ++++++++++++++---------
- drivers/crypto/armv8/rte_armv8_pmd.c     |  2 ++
+ drivers/crypto/armv8/rte_armv8_pmd.c         |  2 ++
+ drivers/crypto/armv8/rte_armv8_pmd_private.h | 23 ++++++++++++--------
@@ -23,5 +24,16 @@
-diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h
-index 19940809bc..709b3d5360 100644
---- a/drivers/crypto/armv8/armv8_pmd_private.h
-+++ b/drivers/crypto/armv8/armv8_pmd_private.h
-@@ -11,17 +11,22 @@
+diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
+index efdde399de..440417c65f 100644
+--- a/drivers/crypto/armv8/rte_armv8_pmd.c
++++ b/drivers/crypto/armv8/rte_armv8_pmd.c
+@@ -851,4 +851,6 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
+ static struct cryptodev_driver armv8_crypto_drv;
+ 
++RTE_LOG_REGISTER(crypto_armv8_log_type, pmd.crypto.armv8, ERR);
++
+ RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv);
+ RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_ARMV8_PMD, cryptodev_armv8_pmd);
+diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h
+index 04ce1cc0e4..daad14b8da 100644
+--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h
++++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h
+@@ -9,17 +9,22 @@
@@ -59,11 +70,0 @@
-diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
-index 8b212772fa..a2b08d8180 100644
---- a/drivers/crypto/armv8/rte_armv8_pmd.c
-+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
-@@ -862,4 +862,6 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
- static struct cryptodev_driver armv8_crypto_drv;
- 
-+RTE_LOG_REGISTER(crypto_armv8_log_type, pmd.crypto.armv8, ERR);
-+
- RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv);
- RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_ARMV8_PMD, cryptodev_armv8_pmd);