From 8a1927626100649389a69d480d99731c2fe47e5a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 3 Jul 2018 11:31:16 +0100 Subject: [PATCH] bus/dpaa2: fix default IOVA setting for meson builds By default, the DPAA2_USE_PHYS_IOVA setting with the make build-system is "y", which is overridden to "n" in the config file specifically for the arm64-dpaa2-linuxapp-gcc builds. The lack of this setting in meson builds causes issues for 32-bit build, as the alternative code paths have compiler warnings e.g. for i686 builds. Therefore we should align the meson and make settings, setting the value to "true" by default and overriding it to "false" for dpaa2-specific builds. Fixes: 6ec78c2463ac ("build: add meson support for dpaaX platforms") Signed-off-by: Bruce Richardson Acked-by: Hemant Agrawal --- config/arm/meson.build | 2 +- config/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 5ad926eda0..40dbc87f75 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -64,7 +64,7 @@ flags_dpaa2 = [ ['RTE_CACHE_LINE_SIZE', 64], ['RTE_MAX_NUMA_NODES', 1], ['RTE_MAX_LCORE', 16], - ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', 'n']] + ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false]] ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321) impl_generic = ['Generic armv8', flags_generic, machine_args_generic] diff --git a/config/meson.build b/config/meson.build index 451cc52f8f..4d755323f4 100644 --- a/config/meson.build +++ b/config/meson.build @@ -77,6 +77,7 @@ dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id # values which have defaults which may be overridden dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64) +dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true) compile_time_cpuflags = [] if host_machine.cpu_family().startswith('x86') -- 2.20.1