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 53287A051C for ; Tue, 11 Feb 2020 12:42:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8C5DD1C025; Tue, 11 Feb 2020 12:42:36 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id C936A1C0AD for ; Tue, 11 Feb 2020 12:42:34 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id m16so11916213wrx.11 for ; Tue, 11 Feb 2020 03:42:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CcFJc64EbaRo/levn5AWI98sel4BAbUvenjS2Bhq5uM=; b=mY897i97MLad7y2EpE7zQ1VTxGZDMYJtVWpUmINzcGbOSoE37WIryExnTwSXkmlpsS jK6ZBqqSQ4uRJ2mrDNUuKdzGbSEIDHsZoNqH4hnQSWc1kgMqfObyDSEoRZZ5fVM28Sk7 Vs3iDfOyiBz1JFdDw7S0H0LmmcHd/UcNXHWIIraIdxAd6ddEJVWDTYs3Yj/aB/4UhoQC Chk0QVmm7YLnS21KnPbdp3xM1oN9CowCOah39boDpUG2EQMHgeK48pKtbj3vLlfhqZMQ xaMKfDJprMRJV5ixDnjnetaujpX7HKG8cYmmu3bZRMJ7iDNjePqLDtUMrTnXafLMkrPc Bziw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CcFJc64EbaRo/levn5AWI98sel4BAbUvenjS2Bhq5uM=; b=OyXNZU/u0yplDtP5G/HQ1ZAxO8LTwIu5VKHRqUfmxQWZcM2DYQgKVNBNo6U86DJU9b sWsiw1VKM6ylfjz0Nm1009O+6szkEl+RIJ3xGeJHnWh4YkxsnAE5s1rRxr9CXQOHEdvZ e+iXqiGRj0KzEJKbg36UCieeLP7cwX5wn5HoOTTLhJEqIaOjqbLGg1ohtPQLl3ufAyvJ eMEzwyHswmUXGxxJRH8F27hkGBDvvhMtqAowmIpnUEKtV7qE1oLtB+Y+6GshSXrsE5Ad 7ha7fevMjVnScU8bBbUBslASyPttw0jOZ77FArcLF/DsZdW0xOv6aIoYKOkvORadbPd+ 4ZWw== X-Gm-Message-State: APjAAAW8J2AWy9h+B/cNFyFoaLFuKeUrXMjMK+MxRaHdtSCrX91mZI+z bUMT+NKP9o+v3HfgGGSna+I= X-Google-Smtp-Source: APXvYqzVee5lJRjUrLFfelPW6rvUw0uys7QDiTS1aKU69FEAcwqUKq/HPOoyv/NC15DdAwvCddm2yw== X-Received: by 2002:a5d:4204:: with SMTP id n4mr8065884wrq.123.1581421354534; Tue, 11 Feb 2020 03:42:34 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l17sm4734982wro.77.2020.02.11.03.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:42:33 -0800 (PST) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: Honnappa Nagarahalli , Gavin Hu , Akhil Goyal , dpdk stable Date: Tue, 11 Feb 2020 11:22:08 +0000 Message-Id: <20200211112216.3929-182-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/armv8: fix clang build' has been queued to stable release 19.11.1 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 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 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 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/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 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@dpdk.org Signed-off-by: Ruifeng Wang Reviewed-by: Honnappa Nagarahalli @@ -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 */