[dpdk-stable] patch 'crypto/armv8: fix clang build' has been queued to LTS release 18.11.7
Kevin Traynor
ktraynor at redhat.com
Fri Feb 14 18:03:30 CET 2020
Hi,
FYI, your patch has been queued to LTS release 18.11.7
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/20/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/8417ae2c5242dbf4c8d549121df01196d84adebd
Thanks.
Kevin.
---
>From 8417ae2c5242dbf4c8d549121df01196d84adebd 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 42b4795c7f..efdde399de 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -85,10 +85,10 @@ 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} }
};
@@ -370,5 +370,14 @@ armv8_crypto_set_session_chained_parameters(struct armv8_crypto_session *sess,
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.21.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-14 17:02:39.063802199 +0000
+++ 0036-crypto-armv8-fix-clang-build.patch 2020-02-14 17:02:37.050405873 +0000
@@ -1 +1 @@
-From 94b686e5026e2612038b8ea5382e22729553738a Mon Sep 17 00:00:00 2001
+From 8417ae2c5242dbf4c8d549121df01196d84adebd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 94b686e5026e2612038b8ea5382e22729553738a ]
+
@@ -27 +28,0 @@
-Cc: stable at dpdk.org
@@ -38 +39 @@
-index fd81408968..d2b7ab5e03 100644
+index 42b4795c7f..efdde399de 100644
@@ -41 +42 @@
-@@ -87,10 +87,10 @@ crypto_op_ca_encrypt = {
+@@ -85,10 +85,10 @@ crypto_op_ca_encrypt = {
@@ -54 +55 @@
-@@ -378,5 +378,14 @@ armv8_crypto_set_session_chained_parameters(struct armv8_crypto_session *sess,
+@@ -370,5 +370,14 @@ armv8_crypto_set_session_chained_parameters(struct armv8_crypto_session *sess,
More information about the stable
mailing list