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

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.10

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/0336eaa63ab370157d76073c6bc32948c8c4b47a

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 0336eaa63ab370157d76073c6bc32948c8c4b47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes at pantheon.tech>
Date: Wed, 7 Jul 2021 15:25:39 +0200
Subject: [PATCH] net/virtio: fix aarch32 build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 143b6270b05cf6693f47f692bf890f7f16f9bfd1 ]

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: 749799482a72 ("net/virtio: add to meson build")

Signed-off-by: Juraj Linkeš <juraj.linkes at pantheon.tech>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build
index 04c7fdf25d..a99365807f 100644
--- a/drivers/net/virtio/meson.build
+++ b/drivers/net/virtio/meson.build
@@ -13,7 +13,7 @@ if arch_subdir == 'x86'
 	sources += files('virtio_rxtx_simple_sse.c')
 elif arch_subdir == 'ppc_64'
 	sources += files('virtio_rxtx_simple_altivec.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('virtio_rxtx_simple_neon.c')
 endif
 
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:15.402374417 +0200
+++ 0061-net-virtio-fix-aarch32-build.patch	2021-08-10 15:11:13.058638389 +0200
@@ -1 +1 @@
-From 143b6270b05cf6693f47f692bf890f7f16f9bfd1 Mon Sep 17 00:00:00 2001
+From 0336eaa63ab370157d76073c6bc32948c8c4b47a Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 143b6270b05cf6693f47f692bf890f7f16f9bfd1 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 81b0a61baf..01a333ada2 100644
+index 04c7fdf25d..a99365807f 100644
@@ -30,4 +31,4 @@
-@@ -41,7 +41,7 @@ if arch_subdir == 'x86'
-     sources += files('virtio_rxtx_simple_sse.c')
- elif arch_subdir == 'ppc'
-     sources += files('virtio_rxtx_simple_altivec.c')
+@@ -13,7 +13,7 @@ if arch_subdir == 'x86'
+ 	sources += files('virtio_rxtx_simple_sse.c')
+ elif arch_subdir == 'ppc_64'
+ 	sources += files('virtio_rxtx_simple_altivec.c')
@@ -36,2 +37 @@
-     sources += files('virtio_rxtx_packed.c')
-     sources += files('virtio_rxtx_simple_neon.c')
+ 	sources += files('virtio_rxtx_simple_neon.c')
@@ -38,0 +39 @@
+