[dpdk-stable] patch 'crypto/armv8: remove debug option' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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

Thanks.

Luca Boccassi

---
>From 6255874ccec385cdf7f258b9a05623dcb7fc6f5a Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Tue, 28 Jul 2020 17:24:04 +0800
Subject: [PATCH] crypto/armv8: remove debug option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit cc9035ffbb8a050780e202047500b1580abed0c9 ]

Typo in debug log switch macro caused debug log cannot be enabled.
Since no log used in data path, remove the debug option entirely
and have logs always enabled.

Resolved compilation error when debug log is enabled:
rte_armv8_pmd.c: In function ‘process_armv8_chained_op’:
rte_armv8_pmd.c:633:22: error: expected ‘)’ before ‘crypto_func’
  ARMV8_CRYPTO_ASSERT(crypto_func != NULL);
                      ^

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

Reported-by: David Marchand <david.marchand at redhat.com>
Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 config/common_base                       |  1 -
 drivers/crypto/armv8/armv8_pmd_private.h | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/config/common_base b/config/common_base
index 861f7d1a0..340614637 100644
--- a/config/common_base
+++ b/config/common_base
@@ -572,7 +572,6 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64
 # Compile PMD for ARMv8 Crypto device
 #
 CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n
-CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO_DEBUG=n
 
 #
 # Compile NXP CAAM JR crypto Driver
diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h
index 24040dda2..30be0f594 100644
--- a/drivers/crypto/armv8/armv8_pmd_private.h
+++ b/drivers/crypto/armv8/armv8_pmd_private.h
@@ -13,7 +13,6 @@
 			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
 			__func__, __LINE__, ## args)
 
-#ifdef RTE_LIBRTE_ARMV8_CRYPTO_DEBUG
 #define ARMV8_CRYPTO_LOG_INFO(fmt, args...) \
 	RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
 			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
@@ -27,17 +26,11 @@
 #define ARMV8_CRYPTO_ASSERT(con)				\
 do {								\
 	if (!(con)) {						\
-		rte_panic("%s(): "				\
-		    con "condition failed, line %u", __func__);	\
+		rte_panic("condition failed, line %u",		\
+			__LINE__);				\
 	}							\
 } while (0)
 
-#else
-#define ARMV8_CRYPTO_LOG_INFO(fmt, args...)
-#define ARMV8_CRYPTO_LOG_DBG(fmt, args...)
-#define ARMV8_CRYPTO_ASSERT(con)
-#endif
-
 #define NBBY		8		/* Number of bits in a byte */
 #define BYTE_LENGTH(x)	((x) / NBBY)	/* Number of bytes in x (round down) */
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:16.102677978 +0100
+++ 0008-crypto-armv8-remove-debug-option.patch	2020-08-06 10:53:15.708595580 +0100
@@ -1,4 +1,4 @@
-From cc9035ffbb8a050780e202047500b1580abed0c9 Mon Sep 17 00:00:00 2001
+From 6255874ccec385cdf7f258b9a05623dcb7fc6f5a Mon Sep 17 00:00:00 2001
 From: Ruifeng Wang <ruifeng.wang at arm.com>
 Date: Tue, 28 Jul 2020 17:24:04 +0800
 Subject: [PATCH] crypto/armv8: remove debug option
@@ -6,6 +6,8 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit cc9035ffbb8a050780e202047500b1580abed0c9 ]
+
 Typo in debug log switch macro caused debug log cannot be enabled.
 Since no log used in data path, remove the debug option entirely
 and have logs always enabled.
@@ -17,7 +19,6 @@
                       ^
 
 Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors")
-Cc: stable at dpdk.org
 
 Reported-by: David Marchand <david.marchand at redhat.com>
 Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
@@ -28,10 +29,10 @@
  2 files changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/config/common_base b/config/common_base
-index f76585f16..c70b8f68b 100644
+index 861f7d1a0..340614637 100644
 --- a/config/common_base
 +++ b/config/common_base
-@@ -605,7 +605,6 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64
+@@ -572,7 +572,6 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64
  # Compile PMD for ARMv8 Crypto device
  #
  CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n
@@ -40,10 +41,10 @@
  #
  # Compile NXP CAAM JR crypto Driver
 diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h
-index e08d0df78..19940809b 100644
+index 24040dda2..30be0f594 100644
 --- a/drivers/crypto/armv8/armv8_pmd_private.h
 +++ b/drivers/crypto/armv8/armv8_pmd_private.h
-@@ -15,7 +15,6 @@
+@@ -13,7 +13,6 @@
  			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
  			__func__, __LINE__, ## args)
  
@@ -51,7 +52,7 @@
  #define ARMV8_CRYPTO_LOG_INFO(fmt, args...) \
  	RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
  			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
-@@ -29,17 +28,11 @@
+@@ -27,17 +26,11 @@
  #define ARMV8_CRYPTO_ASSERT(con)				\
  do {								\
  	if (!(con)) {						\