From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8CD8AA054C for ; Fri, 14 Feb 2020 18:06:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 85337F72; Fri, 14 Feb 2020 18:06:15 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 80891F72 for ; Fri, 14 Feb 2020 18:06:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uu5FJWhM7js2SsDWhGvBNClIkVdRgPl8zEILNtf9Gbs=; b=T1OQirRzKvzA6dkxS0EUARBCiozZeu7oY3+71OaSH4Z8WdEailubfAWbbN5KzI8hRfwN5D 7YgPUsDOljvjjfOzF9XEpsx1L8AswPQfOnEbGDHUO+thQWQ7Z2OSSIIyd//ZJmmQoBKT7d ODgrhqWWszTrpyvkbW8ClWEiO1q74D4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-434-hFSm3K_dNfuV48WZP2r7yA-1; Fri, 14 Feb 2020 12:06:10 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A649DB21; Fri, 14 Feb 2020 17:06:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B2F989F3C; Fri, 14 Feb 2020 17:06:05 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: Honnappa Nagarahalli , Gavin Hu , Akhil Goyal , dpdk stable Date: Fri, 14 Feb 2020 17:03:30 +0000 Message-Id: <20200214170337.25093-36-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: hFSm3K_dNfuV48WZP2r7yA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'crypto/armv8: fix clang build' has been queued to LTS release 18.11.7 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.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 rebasi= ng (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/8417ae2c5242dbf4c8= d549121df01196d84adebd Thanks. Kevin. --- >From 8417ae2c5242dbf4c8d549121df01196d84adebd Mon Sep 17 00:00:00 2001 From: Ruifeng Wang 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 =3D sess->cipher.direction; ~ ~~~~~~~~~~~~~^~~~~~~~~ Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors"= ) Signed-off-by: Ruifeng Wang Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Acked-by: Akhil Goyal --- 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/rt= e_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 =3D { static const crypto_func_tbl_t crypto_op_ca_decrypt =3D { -=09NULL +=09{ {NULL} } }; =20 static const crypto_func_tbl_t crypto_op_ac_encrypt =3D { -=09NULL +=09{ {NULL} } }; =20 @@ -370,5 +370,14 @@ armv8_crypto_set_session_chained_parameters(struct arm= v8_crypto_session *sess, =09sess->cipher.key.length =3D cipher_xform->cipher.key.length; =09/* Set cipher direction */ -=09cop =3D sess->cipher.direction; +=09switch (sess->cipher.direction) { +=09case RTE_CRYPTO_CIPHER_OP_ENCRYPT: +=09=09cop =3D ARMV8_CRYPTO_CIPHER_OP_ENCRYPT; +=09=09break; +=09case RTE_CRYPTO_CIPHER_OP_DECRYPT: +=09=09cop =3D ARMV8_CRYPTO_CIPHER_OP_DECRYPT; +=09=09break; +=09default: +=09=09return -ENOTSUP; +=09} =09/* Set cipher algorithm */ =09calg =3D cipher_xform->cipher.algo; --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:39.063802199 +0000 +++ 0036-crypto-armv8-fix-clang-build.patch=092020-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@dpdk.org @@ -38 +39 @@ -index fd81408968..d2b7ab5e03 100644 +index 42b4795c7f..efdde399de 100644 @@ -41 +42 @@ -@@ -87,10 +87,10 @@ crypto_op_ca_encrypt =3D { +@@ -85,10 +85,10 @@ crypto_op_ca_encrypt =3D { @@ -54 +55 @@ -@@ -378,5 +378,14 @@ armv8_crypto_set_session_chained_parameters(struct ar= mv8_crypto_session *sess, +@@ -370,5 +370,14 @@ armv8_crypto_set_session_chained_parameters(struct ar= mv8_crypto_session *sess,