[dpdk-stable] patch 'crypto/armv8: fix clang build' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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 51ccb28908ac9c69c6ba7d3e696a756ab8253be3 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Thu, 23 Jan 2020 11:45:57 +0800
Subject: [PATCH] crypto/armv8: fix clang build

[ upstream commit 94b686e5026e2612038b8ea5382e22729553738a ]

1. Clang requires braces around initialization of subobject.
2. Clang complains implicit conversion of enumeration type.

Trapped issue with Clang version 8.0 and CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO
was set.
Error messages:
rte_armv8_pmd.c:144:2: error: suggest braces around initialization of
 subobject [-Werror,-Wmissing-braces]
        NULL
        ^~~~
        {   }
/usr/lib/llvm-8/lib/clang/8.0.0/include/stddef.h:105:16: note: expanded
 from macro 'NULL'
               ^~~~~~~~~~
rte_armv8_pmd.c:429:21: error: implicit conversion from enumeration
 type 'enum rte_crypto_cipher_operation' to different enumeration type
      'enum armv8_crypto_cipher_operation' [-Werror,-Wenum-conversion]
        cop = sess->cipher.direction;
            ~ ~~~~~~~~~~~~~^~~~~~~~~

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

Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Reviewed-by: Gavin Hu <gavin.hu at arm.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 drivers/crypto/armv8/rte_armv8_pmd.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
index 7dc83e69e1..fd3093315a 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -84,12 +84,12 @@ crypto_op_ca_encrypt = {
 
 static const crypto_func_tbl_t
 crypto_op_ca_decrypt = {
-	NULL
+	{ {NULL} }
 };
 
 static const crypto_func_tbl_t
 crypto_op_ac_encrypt = {
-	NULL
+	{ {NULL} }
 };
 
 static const crypto_func_tbl_t
@@ -369,7 +369,16 @@ armv8_crypto_set_session_chained_parameters(struct armv8_crypto_session *sess,
 	/* Select cipher key */
 	sess->cipher.key.length = cipher_xform->cipher.key.length;
 	/* Set cipher direction */
-	cop = sess->cipher.direction;
+	switch (sess->cipher.direction) {
+	case RTE_CRYPTO_CIPHER_OP_ENCRYPT:
+		cop = ARMV8_CRYPTO_CIPHER_OP_ENCRYPT;
+		break;
+	case RTE_CRYPTO_CIPHER_OP_DECRYPT:
+		cop = ARMV8_CRYPTO_CIPHER_OP_DECRYPT;
+		break;
+	default:
+		return -ENOTSUP;
+	}
 	/* Set cipher algorithm */
 	calg = cipher_xform->cipher.algo;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:44.859798132 +0000
+++ 0182-crypto-armv8-fix-clang-build.patch	2020-02-11 11:17:38.832009425 +0000
@@ -1,8 +1,10 @@
-From 94b686e5026e2612038b8ea5382e22729553738a Mon Sep 17 00:00:00 2001
+From 51ccb28908ac9c69c6ba7d3e696a756ab8253be3 Mon Sep 17 00:00:00 2001
 From: Ruifeng Wang <ruifeng.wang at arm.com>
 Date: Thu, 23 Jan 2020 11:45:57 +0800
 Subject: [PATCH] crypto/armv8: fix clang build
 
+[ upstream commit 94b686e5026e2612038b8ea5382e22729553738a ]
+
 1. Clang requires braces around initialization of subobject.
 2. Clang complains implicit conversion of enumeration type.
 
@@ -24,7 +26,6 @@
             ~ ~~~~~~~~~~~~~^~~~~~~~~
 
 Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
 Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
@@ -35,10 +36,10 @@
  1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
-index fd81408968..d2b7ab5e03 100644
+index 7dc83e69e1..fd3093315a 100644
 --- a/drivers/crypto/armv8/rte_armv8_pmd.c
 +++ b/drivers/crypto/armv8/rte_armv8_pmd.c
-@@ -86,12 +86,12 @@ crypto_op_ca_encrypt = {
+@@ -84,12 +84,12 @@ crypto_op_ca_encrypt = {
  
  static const crypto_func_tbl_t
  crypto_op_ca_decrypt = {
@@ -53,7 +54,7 @@
  };
  
  static const crypto_func_tbl_t
-@@ -377,7 +377,16 @@ armv8_crypto_set_session_chained_parameters(struct armv8_crypto_session *sess,
+@@ -369,7 +369,16 @@ armv8_crypto_set_session_chained_parameters(struct armv8_crypto_session *sess,
  	/* Select cipher key */
  	sess->cipher.key.length = cipher_xform->cipher.key.length;
  	/* Set cipher direction */