* [dpdk-stable] [PATCH v16 1/8] net/sfc: fix aarch32 build
[not found] <1618915517-2473-1-git-send-email-juraj.linkes@pantheon.tech>
@ 2021-04-20 10:45 ` Juraj Linkeš
2021-04-20 10:45 ` [dpdk-stable] [PATCH v16 2/8] net/bnxt: " Juraj Linkeš
2021-04-20 10:45 ` [dpdk-stable] [PATCH v16 3/8] net/virtio: " Juraj Linkeš
2 siblings, 0 replies; 4+ messages in thread
From: Juraj Linkeš @ 2021-04-20 10:45 UTC (permalink / raw)
To: Ruifeng.Wang, Honnappa.Nagarahalli, juraj.linkes
Cc: Ruifeng Wang, arybchenko, stable
From: Ruifeng Wang <ruifeng.wang@arm.com>
The sfc PMD was enabled for aarch32 which is 32-bit mode but has
cpu_family set to aarch64.
As sfc support only 64-bit system, it should be disabled for aarch32.
Updated meson file to disable sfc for aarch32 build.
Fixes: 141d2870675a ("net/sfc: support aarch64 architecture")
Cc: arybchenko@solarflare.com
Cc: stable@dpdk.org
Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
drivers/common/sfc_efx/meson.build | 2 +-
drivers/net/sfc/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build
index 1ca9510733..db5a6a8b42 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -10,7 +10,7 @@ if is_windows
reason = 'not supported on Windows'
endif
-if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+if (arch_subdir != 'x86' or arch_subdir != 'arm') and (not dpdk_conf.get('RTE_ARCH_64'))
build = false
reason = 'only supported on x86_64 and aarch64'
endif
diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index 0c5cfb9058..0a96235e33 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -12,7 +12,7 @@ if is_windows
subdir_done()
endif
-if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+if (arch_subdir != 'x86' or arch_subdir != 'arm') and (not dpdk_conf.get('RTE_ARCH_64'))
build = false
reason = 'only supported on x86_64 and aarch64'
endif
--
2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-stable] [PATCH v16 2/8] net/bnxt: fix aarch32 build
[not found] <1618915517-2473-1-git-send-email-juraj.linkes@pantheon.tech>
2021-04-20 10:45 ` [dpdk-stable] [PATCH v16 1/8] net/sfc: fix aarch32 build Juraj Linkeš
@ 2021-04-20 10:45 ` Juraj Linkeš
2021-04-20 10:45 ` [dpdk-stable] [PATCH v16 3/8] net/virtio: " Juraj Linkeš
2 siblings, 0 replies; 4+ messages in thread
From: Juraj Linkeš @ 2021-04-20 10:45 UTC (permalink / raw)
To: Ruifeng.Wang, Honnappa.Nagarahalli, juraj.linkes
Cc: Ruifeng Wang, lance.richardson, stable
From: Ruifeng Wang <ruifeng.wang@arm.com>
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")
Cc: lance.richardson@broadcom.com
Cc: stable@dpdk.org
Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
Reviewed-by: Lance Richardson <lance.richardson@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 092655697f..710aef6b7b 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -80,6 +80,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.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-stable] [PATCH v16 3/8] net/virtio: fix aarch32 build
[not found] <1618915517-2473-1-git-send-email-juraj.linkes@pantheon.tech>
2021-04-20 10:45 ` [dpdk-stable] [PATCH v16 1/8] net/sfc: fix aarch32 build Juraj Linkeš
2021-04-20 10:45 ` [dpdk-stable] [PATCH v16 2/8] net/bnxt: " Juraj Linkeš
@ 2021-04-20 10:45 ` Juraj Linkeš
2 siblings, 0 replies; 4+ messages in thread
From: Juraj Linkeš @ 2021-04-20 10:45 UTC (permalink / raw)
To: Ruifeng.Wang, Honnappa.Nagarahalli, juraj.linkes; +Cc: bruce.richardson, stable
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")
Cc: bruce.richardson@intel.com
Cc: stable@dpdk.org
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
---
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 d595cfdcab..88e231565e 100644
--- a/drivers/net/virtio/meson.build
+++ b/drivers/net/virtio/meson.build
@@ -39,7 +39,7 @@ if arch_subdir == 'x86'
sources += files('virtio_rxtx_simple_sse.c')
elif arch_subdir == 'ppc'
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_packed.c')
sources += files('virtio_rxtx_simple_neon.c')
endif
--
2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread