From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8162CA0352; Tue, 5 Nov 2019 10:17:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5B3832C02; Tue, 5 Nov 2019 10:17:56 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id B45882BF9 for ; Tue, 5 Nov 2019 10:17:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572945474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d3uHloJCvxN+libfaHhiyM0nOD5FOS1Q6lsaxPdRNM8=; b=ToaKJu64TtglYu2wHSa9IOFGtT0HRzdAfsa7waMNBICV9R+tQU26NYLkYsciT5QeJ8lgXg uwexr8NQXFCMw6ew1hhpJnSslRunrZZEdueBBlv67VrjTT92lmWP+07+kKjH9shTwnn0jQ kQBQneH4Yv6qvPAPCPK6MB95gkeqOIM= Received: from mail-vk1-f198.google.com (mail-vk1-f198.google.com [209.85.221.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-s_2yiqagODul9Z8p4ibiIQ-1; Tue, 05 Nov 2019 04:17:52 -0500 Received: by mail-vk1-f198.google.com with SMTP id l4so7529126vkn.6 for ; Tue, 05 Nov 2019 01:17:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hbatmxs0PlV1MroYn+mTgAJSpk8Gk5ZWJEnSh+/HHGw=; b=D/xbtURNxEs41hVG6PIdAGHtny4Ol05krDoIp1svSXlGc+XbhYEfgcRAooW6EfL5et TH5r8GpkSUTnWxeZgJ8iluh7jNpGs6ne1aA+s53UOIv2R1+H3+DwgfhaiEKpJFeLQpaS JC1cmhktCtuz2Xi8+9B0pZVgUm8G27vOwRcNVdvRvyRQM+GwW6Mc3pys8X4cy+OMgJ5k gx25s9U8e5uG0rQ6IVZgdjukiqiqrhFddrS+HOuKebhUk2BWPp+4/wCCUIfbXJjZVcNW fUslkzftXEnMEyxRom2txCDzvwMpiF1cIOtVf0UjysxaKwqZSmIyZ17mHKN3/W0r54eh wKDA== X-Gm-Message-State: APjAAAW0VIt1tWDbQeijuqLi5pJZEftxIOcBLwDtoUIT/t92HTcjd3zh ilyNmstf+tVftjSvD5vP267fcs//v6RS6hCAUXZn3RFxq/062XYJx7aWuvT5CMPuZHLQ3nWzx4D hMe0b/z1kiPX6lgQj/Ko= X-Received: by 2002:ab0:628f:: with SMTP id z15mr13859078uao.126.1572945471554; Tue, 05 Nov 2019 01:17:51 -0800 (PST) X-Google-Smtp-Source: APXvYqyh6VGUbesPCH4IxdpenRR4n+xXkrsjNOcSvDucr+daE6WESdDAwpsAvqxnlVmq6nb9cLu0SXlwLiL6z+0vVks= X-Received: by 2002:ab0:628f:: with SMTP id z15mr13859062uao.126.1572945470887; Tue, 05 Nov 2019 01:17:50 -0800 (PST) MIME-Version: 1.0 References: <20191104112112.10211-1-hemant.agrawal@nxp.com> <20191105075907.22804-1-hemant.agrawal@nxp.com> In-Reply-To: <20191105075907.22804-1-hemant.agrawal@nxp.com> From: David Marchand Date: Tue, 5 Nov 2019 10:17:39 +0100 Message-ID: To: Hemant Agrawal Cc: dev , Sachin Saxena X-MC-Unique: s_2yiqagODul9Z8p4ibiIQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-dev] [PATCH v2 1/2] config: remove redundant dpaa2 build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, Nov 5, 2019 at 9:05 AM Hemant Agrawal wrot= e: > > 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 > --- > 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_li= nux_gcc > deleted file mode 100644 > index 0df8c8f7d..000000000 > --- a/config/arm/arm64_dpaa2_linux_gcc > +++ /dev/null > @@ -1,16 +0,0 @@ > -[binaries] > -c =3D 'aarch64-linux-gnu-gcc' > -cpp =3D 'aarch64-linux-gnu-cpp' > -ar =3D 'aarch64-linux-gnu-ar' > -as =3D 'aarch64-linux-gnu-as' > -strip =3D 'aarch64-linux-gnu-strip' > -pcap-config =3D '' > - > -[host_machine] > -system =3D 'linux' > -cpu_family =3D 'aarch64' > -cpu =3D 'armv8-a' > -endian =3D 'little' > - > -[properties] > -implementor_id =3D 'dpaa2' > diff --git a/config/arm/meson.build b/config/arm/meson.build > index d9f9811f7..46dff3a69 100644 > --- a/config/arm/meson.build > +++ b/config/arm/meson.build > @@ -48,12 +48,6 @@ flags_dpaa =3D [ > ['RTE_USE_C11_MEM_MODEL', true], > ['RTE_CACHE_LINE_SIZE', 64], > ['RTE_MAX_NUMA_NODES', 1], > - ['RTE_MAX_LCORE', 16]] > -flags_dpaa2 =3D [ > - ['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 =3D [ > @@ -115,7 +109,6 @@ impl_0x53 =3D ['Samsung', flags_generic, machine_args= _generic] > impl_0x56 =3D ['Marvell ARMADA', flags_armada, machine_args_generic] > impl_0x69 =3D ['Intel', flags_generic, machine_args_generic] > impl_dpaa =3D ['NXP DPAA', flags_dpaa, machine_args_generic] > -impl_dpaa2 =3D ['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 19614fb01..4ae4cd850 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=3D"dpaa" > CONFIG_RTE_ARCH_ARM_TUNE=3D"cortex-a72" > -CONFIG_RTE_LIBRTE_VHOST_NUMA=3Dn > -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=3Dn > > # > # Compile Environment Abstraction Layer > @@ -18,6 +19,13 @@ CONFIG_RTE_MAX_NUMA_NODES=3D1 > CONFIG_RTE_CACHE_LINE_SIZE=3D64 > CONFIG_RTE_PKTMBUF_HEADROOM=3D128 > > +# Doesn't support NUMA > +CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=3Dn > +CONFIG_RTE_LIBRTE_VHOST_NUMA=3Dn > + > +# Enable PHY mode when using VM-VFIO target > +CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=3Dn > + > # NXP DPAA Bus > CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER=3Dn > CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=3Dn > diff --git a/config/defconfig_arm64-dpaa2-linux-gcc b/config/defconfig_ar= m64-dpaa2-linux-gcc > deleted file mode 120000 > index 9a6c6c4cb..000000000 > --- 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 8b545f5f7..000000000 > --- 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=3D"dpaa2" > -CONFIG_RTE_ARCH_ARM_TUNE=3D"cortex-a72" > - > -CONFIG_RTE_MAX_LCORE=3D16 > -CONFIG_RTE_MAX_NUMA_NODES=3D1 > -CONFIG_RTE_CACHE_LINE_SIZE=3D64 > - > -CONFIG_RTE_PKTMBUF_HEADROOM=3D128 > - > -# Doesn't support NUMA > -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=3Dn > -CONFIG_RTE_LIBRTE_VHOST_NUMA=3Dn > - > -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=3Dn > diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/= dpaa2_sec.rst > index 9e21d3169..55f0d6856 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 performanc= e. > > * ``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=3Darm64-dpaa2-linux-gcc install > + make config T=3Darm64-dpaa-linux-gcc install > > Enabling logs > ------------- > diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.= rst > index a24a43c15..dd8ebbcd0 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=3Darm64-dpaa2-linux-gcc install > + make config T=3Darm64-dpaa-linux-gcc install > > Initialization > -------------- > diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/gu= ides/linux_gsg/cross_build_dpdk_for_arm64.rst > index 28a8e0920..e799b0ba4 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 compile= r's directories: > > Configure and cross compile DPDK Build > -------------------------------------- > -To configure a build, choose one of the target configurations, like arm6= 4-dpaa2-linux-gcc and arm64-thunderx-linux-gcc. > +To configure a build, choose one of the target configurations, like arm6= 4-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_a= nd_test.rst > index aae5c111d..f99e019ff 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 f85920012..17839a920 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 performanc= e. > > -- ``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 affe= ct system performance. > Enables debugging of the Queue and Buffer Manager layer which interact= s > 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 need= s to > - enabled. > > Environment Variables > ~~~~~~~~~~~~~~~~~~~~~ > diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst > index 99e4c8d72..b6d9e2129 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 performanc= e. > > -- ``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 acceler= ators. > > diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa= 2_cmdif.rst > index ac5f0f137..bcd603c81 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=3Darm64-dpaa2-linux-gcc install > + make config T=3Darm64-dpaa-linux-gcc install > > Initialization > -------------- > diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2= _qdma.rst > index 1550ca5ba..a5085c2c0 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=3Darm64-dpaa2-linux-gcc install > + make config T=3Darm64-dpaa-linux-gcc install > > Initialization > -------------- > diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_note= s/release_19_11.rst > index ae8e7b2f0..c9a135655 100644 > --- a/doc/guides/rel_notes/release_19_11.rst > +++ b/doc/guides/rel_notes/release_19_11.rst > @@ -267,6 +267,9 @@ Removed Items > * Quota and Watermark > * vhost-scsi > > +* Removed arm64-dpaa2-* build config. arm64-dpaa-* can now build for bot= h > + 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 aaa03c424..000000000 > --- 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 =3D > -# CROSS =3D > -# MACHINE_CFLAGS =3D > -# MACHINE_LDFLAGS =3D > -# MACHINE_ASFLAGS =3D > -# CPU_CFLAGS =3D > -# CPU_LDFLAGS =3D > -# CPU_ASFLAGS =3D > -MACHINE_CFLAGS +=3D -march=3Darmv8-a+crc > - > -ifdef CONFIG_RTE_ARCH_ARM_TUNE > -MACHINE_CFLAGS +=3D -mtune=3D$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=3D%) > -endif > - > -# To avoid TLS corruption issue. > -MACHINE_CFLAGS +=3D -mtls-dialect=3Dtrad > -- > 2.17.1 > Reviewed-by: David Marchand -- David Marchand