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 <bruce.richardson@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 5ad926eda0460448631a3843327689180d47ebfc..40dbc87f75ba45c038893ef1c5d15300673ba544 100644 (file)
--- 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 451cc52f8feca861767292e22a84785b4a0df265..4d755323f4b517a5e08c4e8d490f7edaaa4dcdea 100644 (file)
--- 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')