From 487eec3401b7a1664982f39da139980a4f5b3adc Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Tue, 5 Nov 2019 13:29:06 +0530 Subject: [PATCH] config: remove redundant DPAA2 build dpaa and dpaa2 config have evolved to be same. The same binary can now work across the platforms. So, there is no need to maintain two different build configs. The dpaa config shall work for both generation of dpaa platforms. Signed-off-by: Hemant Agrawal Reviewed-by: David Marchand --- config/arm/arm64_dpaa2_linux_gcc | 16 -------- config/arm/meson.build | 7 ---- config/defconfig_arm64-dpaa-linuxapp-gcc | 16 ++++++-- config/defconfig_arm64-dpaa2-linux-gcc | 1 - config/defconfig_arm64-dpaa2-linuxapp-gcc | 22 ----------- doc/guides/cryptodevs/dpaa2_sec.rst | 4 +- doc/guides/eventdevs/dpaa2.rst | 2 +- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 2 +- doc/guides/nics/build_and_test.rst | 2 +- doc/guides/nics/dpaa.rst | 12 +----- doc/guides/nics/dpaa2.rst | 8 ++-- doc/guides/rawdevs/dpaa2_cmdif.rst | 2 +- doc/guides/rawdevs/dpaa2_qdma.rst | 2 +- doc/guides/rel_notes/release_19_11.rst | 3 ++ mk/machine/dpaa2/rte.vars.mk | 37 ------------------- 15 files changed, 27 insertions(+), 109 deletions(-) delete mode 100644 config/arm/arm64_dpaa2_linux_gcc delete mode 120000 config/defconfig_arm64-dpaa2-linux-gcc delete mode 100644 config/defconfig_arm64-dpaa2-linuxapp-gcc delete mode 100644 mk/machine/dpaa2/rte.vars.mk diff --git a/config/arm/arm64_dpaa2_linux_gcc b/config/arm/arm64_dpaa2_linux_gcc deleted file mode 100644 index 0df8c8f7d0..0000000000 --- a/config/arm/arm64_dpaa2_linux_gcc +++ /dev/null @@ -1,16 +0,0 @@ -[binaries] -c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' -ar = 'aarch64-linux-gnu-ar' -as = 'aarch64-linux-gnu-as' -strip = 'aarch64-linux-gnu-strip' -pcap-config = '' - -[host_machine] -system = 'linux' -cpu_family = 'aarch64' -cpu = 'armv8-a' -endian = 'little' - -[properties] -implementor_id = 'dpaa2' diff --git a/config/arm/meson.build b/config/arm/meson.build index d9f9811f7e..46dff3a69b 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -48,12 +48,6 @@ flags_dpaa = [ ['RTE_USE_C11_MEM_MODEL', true], ['RTE_CACHE_LINE_SIZE', 64], ['RTE_MAX_NUMA_NODES', 1], - ['RTE_MAX_LCORE', 16]] -flags_dpaa2 = [ - ['RTE_MACHINE', '"dpaa2"'], - ['RTE_USE_C11_MEM_MODEL', true], - ['RTE_CACHE_LINE_SIZE', 64], - ['RTE_MAX_NUMA_NODES', 1], ['RTE_MAX_LCORE', 16], ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false]] flags_armada = [ @@ -115,7 +109,6 @@ impl_0x53 = ['Samsung', flags_generic, machine_args_generic] impl_0x56 = ['Marvell ARMADA', flags_armada, machine_args_generic] impl_0x69 = ['Intel', flags_generic, machine_args_generic] impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic] -impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic] dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) diff --git a/config/defconfig_arm64-dpaa-linuxapp-gcc b/config/defconfig_arm64-dpaa-linuxapp-gcc index 19614fb015..4ae4cd8502 100644 --- a/config/defconfig_arm64-dpaa-linuxapp-gcc +++ b/config/defconfig_arm64-dpaa-linuxapp-gcc @@ -1,14 +1,15 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2016 Freescale Semiconductor, Inc. -# Copyright 2017 NXP +# Copyright 2017-2019 NXP #include "defconfig_arm64-armv8a-linux-gcc" -# NXP (Freescale) - Soc Architecture with FMAN, QMAN & BMAN support +# NXP (Freescale) - Soc Architecture for DPAA or DPAA2 support +# DPAA - FMAN, QMAN & BMAN support (e.g. LS1043, LS1046) +# DPAA2 - WRIOP and QBMAN (e.g. LS1088, LS2088, LX2160 etc) +# CONFIG_RTE_MACHINE="dpaa" CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" -CONFIG_RTE_LIBRTE_VHOST_NUMA=n -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n # # Compile Environment Abstraction Layer @@ -18,6 +19,13 @@ CONFIG_RTE_MAX_NUMA_NODES=1 CONFIG_RTE_CACHE_LINE_SIZE=64 CONFIG_RTE_PKTMBUF_HEADROOM=128 +# Doesn't support NUMA +CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n +CONFIG_RTE_LIBRTE_VHOST_NUMA=n + +# Enable PHY mode when using VM-VFIO target +CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n + # NXP DPAA Bus CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n diff --git a/config/defconfig_arm64-dpaa2-linux-gcc b/config/defconfig_arm64-dpaa2-linux-gcc deleted file mode 120000 index 9a6c6c4cb8..0000000000 --- a/config/defconfig_arm64-dpaa2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-dpaa2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc b/config/defconfig_arm64-dpaa2-linuxapp-gcc deleted file mode 100644 index 8b545f5f7f..0000000000 --- a/config/defconfig_arm64-dpaa2-linuxapp-gcc +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016 NXP -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# NXP (Freescale) - Soc Architecture with WRIOP and QBMAN support -CONFIG_RTE_MACHINE="dpaa2" -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 9e21d3169c..55f0d68562 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -180,7 +180,7 @@ to enable DPAA2_SEC PMD. Please note that enabling debugging options may affect system performance. * ``CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa2-* config. + By default it is only enabled in defconfig_arm64-dpaa-* config. Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. Installations @@ -191,7 +191,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa2-linux-gcc install + make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index a24a43c158..dd8ebbcd03 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -71,7 +71,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa2-linux-gcc install + make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index 28a8e0920d..e799b0ba41 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -79,7 +79,7 @@ Copy the NUMA header files and lib to the cross compiler's directories: Configure and cross compile DPDK Build -------------------------------------- -To configure a build, choose one of the target configurations, like arm64-dpaa2-linux-gcc and arm64-thunderx-linux-gcc. +To configure a build, choose one of the target configurations, like arm64-dpaa-linux-gcc and arm64-thunderx-linux-gcc. .. code-block:: console diff --git a/doc/guides/nics/build_and_test.rst b/doc/guides/nics/build_and_test.rst index aae5c111dd..f99e019ff3 100644 --- a/doc/guides/nics/build_and_test.rst +++ b/doc/guides/nics/build_and_test.rst @@ -35,7 +35,7 @@ Example output: arm-armv7a-linux-gcc arm64-armv8a-linux-gcc - arm64-dpaa2-linux-gcc + arm64-dpaa-linux-gcc arm64-thunderx-linux-gcc arm64-xgene1-linux-gcc i686-native-linux-gcc diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index f85920012b..17839a920e 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -201,14 +201,12 @@ Config File Options The following options can be modified in the ``config`` file. Please note that enabling debugging options may affect system performance. -- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``n``) +- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``y``) - By default it is enabled only for defconfig_arm64-dpaa-* config. Toggle compilation of the ``librte_bus_dpaa`` driver. -- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``n``) +- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``y``) - By default it is enabled only for defconfig_arm64-dpaa-* config. Toggle compilation of the ``librte_pmd_dpaa`` driver. - ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) @@ -222,12 +220,6 @@ Please note that enabling debugging options may affect system performance. Enables debugging of the Queue and Buffer Manager layer which interacts with the DPAA hardware. -- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` (default ``dpaa``) - - This is not a DPAA specific configuration - it is a generic RTE config. - For optimal performance and hardware utilization, it is expected that DPAA - Mempool driver is used for mempools. For that, this configuration needs to - enabled. Environment Variables ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index 99e4c8d72e..b6d9e21290 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -441,21 +441,19 @@ Config File Options The following options can be modified in the ``config`` file. Please note that enabling debugging options may affect system performance. -- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``n``) +- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``y``) - By default it is enabled only for defconfig_arm64-dpaa2-* config. Toggle compilation of the ``librte_bus_fslmc`` driver. -- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``n``) +- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``y``) - By default it is enabled only for defconfig_arm64-dpaa2-* config. Toggle compilation of the ``librte_pmd_dpaa2`` driver. - ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) Toggle display of debugging messages/logic -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``y``) +- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) Toggle to use physical address vs virtual address for hardware accelerators. diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index ac5f0f1370..bcd603c812 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -77,7 +77,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa2-linux-gcc install + make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 1550ca5ba2..a5085c2c06 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -81,7 +81,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa2-linux-gcc install + make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst index 810548f1de..67ae6f2a77 100644 --- a/doc/guides/rel_notes/release_19_11.rst +++ b/doc/guides/rel_notes/release_19_11.rst @@ -278,6 +278,9 @@ Removed Items * Quota and Watermark * vhost-scsi +* Removed arm64-dpaa2-* build config. arm64-dpaa-* can now build for both + dpaa and dpaa2 platforms. + API Changes ----------- diff --git a/mk/machine/dpaa2/rte.vars.mk b/mk/machine/dpaa2/rte.vars.mk deleted file mode 100644 index aaa03c424d..0000000000 --- a/mk/machine/dpaa2/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016 NXP - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -# To avoid TLS corruption issue. -MACHINE_CFLAGS += -mtls-dialect=trad -- 2.20.1