d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: remove redundant DPAA2 build

Browse Source 
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 <hemant.agrawal@nxp.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
This commit is contained in:
Hemant Agrawal 2019-11-05 13:29:06 +05:30 committed by David Marchand
parent a3d1111a77
commit 487eec3401
15 changed files with 27 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/arm/arm64_dpaa2_linux_gcc
View File

@ -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'

7
config/arm/meson.build
View File

@ -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)

16
config/defconfig_arm64-dpaa-linuxapp-gcc
View File

@ -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

1
config/defconfig_arm64-dpaa2-linux-gcc
View File

@ -1 +0,0 @@
defconfig_arm64-dpaa2-linuxapp-gcc

22
config/defconfig_arm64-dpaa2-linuxapp-gcc
View File

@ -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

4
doc/guides/cryptodevs/dpaa2_sec.rst
View File

@ -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 <DPDK-source-directory>
make config T=arm64-dpaa2-linux-gcc install
make config T=arm64-dpaa-linux-gcc install
Enabling logs
-------------

2
doc/guides/eventdevs/dpaa2.rst
View File

@ -71,7 +71,7 @@ following ``make`` command:
.. code-block:: console
cd <DPDK-source-directory>
make config T=arm64-dpaa2-linux-gcc install
make config T=arm64-dpaa-linux-gcc install
Initialization
--------------

2
doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
View File

@ -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

2
doc/guides/nics/build_and_test.rst
View File

@ -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

12
doc/guides/nics/dpaa.rst
View File

@ -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
~~~~~~~~~~~~~~~~~~~~~

8
doc/guides/nics/dpaa2.rst
View File

@ -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.

2
doc/guides/rawdevs/dpaa2_cmdif.rst
View File

@ -77,7 +77,7 @@ following ``make`` command:
.. code-block:: console
cd <DPDK-source-directory>
make config T=arm64-dpaa2-linux-gcc install
make config T=arm64-dpaa-linux-gcc install
Initialization
--------------

2
doc/guides/rawdevs/dpaa2_qdma.rst
View File

@ -81,7 +81,7 @@ following ``make`` command:
.. code-block:: console
cd <DPDK-source-directory>
make config T=arm64-dpaa2-linux-gcc install
make config T=arm64-dpaa-linux-gcc install
Initialization
--------------

3
doc/guides/rel_notes/release_19_11.rst
View File

@ -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
-----------

37
mk/machine/dpaa2/rte.vars.mk
View File

@ -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