From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A050A0524 for ; Fri, 5 Feb 2021 12:30:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F22D518892B; Fri, 5 Feb 2021 12:30:02 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id B44EE4067B for ; Fri, 5 Feb 2021 12:30:01 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id q7so7238472wre.13 for ; Fri, 05 Feb 2021 03:30:01 -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=hBbhFwgtxsmN+xWUmP0lBgbND4Sfsw7SasBMz89Kvo4=; b=V4/PbU/2VUn28MxVKEPraBAMHmFny2a6RH3mUg7oGo6vH1Os8IgwiBU95Ri5B/lYpu syHthh/ZqnjRMNWzECQyZ5Yy09ygIbyOICzVHIFMU5BUyppqWHXygh/6v8mTBpWbAnd2 PbMovUFANM3K0ZrWqrBy91eVKxPa0VsZMnoZrMBvxPmuS18WekP4E8qWZRNmBWbpkigW UUIkhFULcgWETaGHqsRwt20lWlzMDcjG196Ur/RVTz1uPSVnd1awhQHg8icGftDKtGPE vWgbIS6vc1VeuHmar8Ya6f2ImsYA4cFLgbPXBKMqRJripyk8S1nlJ3P8XA0XGEn3GEHr LITQ== 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=hBbhFwgtxsmN+xWUmP0lBgbND4Sfsw7SasBMz89Kvo4=; b=Avg4SuGKgQEZ1KqA+k9gNYXrFUnHMF96o9neeg0mvyo0DFW9xDY7+5jh8qZ0kTZv4l zBnaDb0r/lHBWnwYnu0WQ9+w7D3IZ5Z1hktQEkDvIebZogL11s8uzQNY7EmUcgviW74p bX3iFmjj3XqHpBi8bTzNDxWo+6VSTmf2jb7MWG/fINMz2QBEZ+Jmel6wNElkaAtNkHGh KOiFpaPD8/4abz0K/IwxCysXF/69LaZjHPzQaslWkUDFDHSoPwYFTXUxGYp0ugVoVusi 5pZmAoF0m36r2MXN8x7smS8X6LMTXYVBJHcx7/xcvf1M1XgtB3YOoj+vsQr7XObidRM/ hU5g== X-Gm-Message-State: AOAM530XG1fzHkFdMg/FZ+kud9o3xvcqa1JeQm0RzGw8y/W+hibqeE6Q pFVaRfyWbaWaUIzGVTGUF7+9QcCj+sC0532i X-Google-Smtp-Source: ABdhPJyYBMPHyRNwiIeMzhrbA0euKBlmjNDBewqHEzI2arOzvVXjBaCsly4wtvWdHaD32SylXFHPKQ== X-Received: by 2002:a5d:5611:: with SMTP id l17mr4713493wrv.2.1612524601475; Fri, 05 Feb 2021 03:30:01 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m22sm13134855wrh.66.2021.02.05.03.30.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:30:00 -0800 (PST) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: Honnappa Nagarahalli , dpdk stable Date: Fri, 5 Feb 2021 11:16:21 +0000 Message-Id: <20210205111920.1272063-95-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix build with SVE' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.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/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ee5c26341a3fcadd55c47436ccac9962cc6317a0 Thanks. Luca Boccassi --- >From ee5c26341a3fcadd55c47436ccac9962cc6317a0 Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Tue, 12 Jan 2021 02:57:05 +0000 Subject: [PATCH] net/hns3: fix build with SVE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 21c4f1c7b2f8e637ecff9b9180e21f6b4505715f ] Building with SVE extension enabled stopped with error: error: ACLE function ‘svwhilelt_b64_s32’ requires ISA extension ‘sve’ 18 | #define PG64_256BIT svwhilelt_b64(0, 4) This is caused by unintentional cflags reset. Fixed the issue by not touching cflags, and using flags defined by compiler. Fixes: 952ebacce4f2 ("net/hns3: support SVE Rx") Signed-off-by: Ruifeng Wang Reviewed-by: Honnappa Nagarahalli --- drivers/net/hns3/hns3_rxtx.c | 4 ++-- drivers/net/hns3/meson.build | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 88d3baba4a..5ac36b314d 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -10,7 +10,7 @@ #include #include #include -#if defined(RTE_ARCH_ARM64) && defined(CC_SVE_SUPPORT) +#if defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_SVE) #include #endif @@ -2467,7 +2467,7 @@ hns3_rx_burst_mode_get(struct rte_eth_dev *dev, __rte_unused uint16_t queue_id, static bool hns3_check_sve_support(void) { -#if defined(RTE_ARCH_ARM64) && defined(CC_SVE_SUPPORT) +#if defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_SVE) if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_SVE)) return true; #endif diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build index 45cee34d9d..5674d986ba 100644 --- a/drivers/net/hns3/meson.build +++ b/drivers/net/hns3/meson.build @@ -32,7 +32,6 @@ deps += ['hash'] if arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64') sources += files('hns3_rxtx_vec.c') if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != '' - cflags = ['-DCC_SVE_SUPPORT'] sources += files('hns3_rxtx_vec_sve.c') endif endif -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:33.535949489 +0000 +++ 0095-net-hns3-fix-build-with-SVE.patch 2021-02-05 11:18:28.946693778 +0000 @@ -1 +1 @@ -From 21c4f1c7b2f8e637ecff9b9180e21f6b4505715f Mon Sep 17 00:00:00 2001 +From ee5c26341a3fcadd55c47436ccac9962cc6317a0 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 21c4f1c7b2f8e637ecff9b9180e21f6b4505715f ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org