[dpdk-stable] patch 'net/bnxt: fix aarch32 build' has been queued to stable release 20.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/14/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/0c550171b000ca79830eb3309705cc125fefc266

Thanks.

Luca Boccassi

---
>From 0c550171b000ca79830eb3309705cc125fefc266 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Wed, 7 Jul 2021 15:25:38 +0200
Subject: [PATCH] net/bnxt: fix aarch32 build

[ upstream commit 746d6f83888cfd1bd3c2a1fc849372424b9aa815 ]

NEON vector path of the PMD needs aarch64 support. But it was
enabled for aarch32 build as well because aarch32 build had
cpu_family set to aarch64. So build for aarch32 will fail due
to unsupported intrinsics.

Fix aarch32 build by updating meson file to exclude NEON vector
implementation for aarch32.

Fixes: 398358341419 ("net/bnxt: support NEON")

Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Lance Richardson <lance.richardson at broadcom.com>
---
 drivers/net/bnxt/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 2896337b5d..a2fd494dac 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -74,6 +74,6 @@ sources = files('bnxt_cpr.c',
 
 if arch_subdir == 'x86'
 	sources += files('bnxt_rxtx_vec_sse.c')
-elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
+elif arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
 	sources += files('bnxt_rxtx_vec_neon.c')
 endif
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:42.459857183 +0100
+++ 0113-net-bnxt-fix-aarch32-build.patch	2021-07-12 13:41:36.926131693 +0100
@@ -1 +1 @@
-From 746d6f83888cfd1bd3c2a1fc849372424b9aa815 Mon Sep 17 00:00:00 2001
+From 0c550171b000ca79830eb3309705cc125fefc266 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 746d6f83888cfd1bd3c2a1fc849372424b9aa815 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 12ecd37d54..81cbe0381f 100644
+index 2896337b5d..a2fd494dac 100644
@@ -27,4 +28,4 @@
-@@ -66,6 +66,6 @@ if arch_subdir == 'x86'
-                             c_args: [cflags, '-mavx2'])
-             objs += bnxt_avx2_lib.extract_objects('bnxt_rxtx_vec_avx2.c')
-      endif
+@@ -74,6 +74,6 @@ sources = files('bnxt_cpr.c',
+ 
+ if arch_subdir == 'x86'
+ 	sources += files('bnxt_rxtx_vec_sse.c')
@@ -33 +34 @@
-     sources += files('bnxt_rxtx_vec_neon.c')
+ 	sources += files('bnxt_rxtx_vec_neon.c')