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 2DDD5A04DD; Wed, 28 Oct 2020 16:08:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B2032CB93; Wed, 28 Oct 2020 16:08:23 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 137AECB2E for ; Wed, 28 Oct 2020 16:08:21 +0100 (CET) IronPort-SDR: ILg1yb6JuqFOr7xIyr2g+WexVsqOP5PXeXLb/hB/MQ8FbEDksAN+9PXgtVIYRe2yClBkIs4owG 6xB+yHpRBjXg== X-IronPort-AV: E=McAfee;i="6000,8403,9788"; a="147558288" X-IronPort-AV: E=Sophos;i="5.77,426,1596524400"; d="scan'208";a="147558288" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Oct 2020 08:08:20 -0700 IronPort-SDR: +E7TqYLfY0Fb8v3psu1sjpPhVvdYKNX3mp5bdvnEgkm2TMx8o6R32Z4SncBdMU4AXLPmC1wb9f bkOn7IKfI2TA== X-IronPort-AV: E=Sophos;i="5.77,426,1596524400"; d="scan'208";a="536261176" Received: from bricha3-mobl.ger.corp.intel.com ([10.255.205.158]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 28 Oct 2020 08:08:15 -0700 Date: Wed, 28 Oct 2020 15:08:10 +0000 From: Bruce Richardson To: Juraj =?utf-8?Q?Linke=C5=A1?= Cc: Ruifeng.Wang@arm.com, Honnappa.Nagarahalli@arm.com, Phil.Yang@arm.com, vcchunga@amazon.com, Dharmik.Thakkar@arm.com, jerinjacobk@gmail.com, hemant.agrawal@nxp.com, dev@dpdk.org Message-ID: <20201028150810.GC1634@bricha3-MOBL.ger.corp.intel.com> References: <1603464488-25493-1-git-send-email-juraj.linkes@pantheon.tech> <1603893845-5736-1-git-send-email-juraj.linkes@pantheon.tech> <1603893845-5736-12-git-send-email-juraj.linkes@pantheon.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1603893845-5736-12-git-send-email-juraj.linkes@pantheon.tech> Subject: Re: [dpdk-dev] [PATCH v5 11/11] build: update Arm builds with makefile flags 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 Wed, Oct 28, 2020 at 03:04:05PM +0100, Juraj Linkeš wrote: > Not all flags were moved properly from the old Makefile build system. > Disable corresponding drivers and libnuma in cross files and remove > deprecated config. > > Signed-off-by: Juraj Linkeš > --- > config/arm/arm64_armada_linux_gcc | 2 ++ > config/arm/arm64_armv8_linux_gcc | 8 ++++++-- > config/arm/arm64_bluefield_linux_gcc | 1 + > config/arm/arm64_dpaa_linux_gcc | 1 + > config/arm/arm64_n1sdp_linux_gcc | 1 + > config/arm/arm64_octeontx2_linux_gcc | 1 + > config/arm/arm64_stingray_linux_gcc | 1 + > config/arm/meson.build | 5 ++++- > drivers/meson.build | 4 ++++ > 9 files changed, 21 insertions(+), 3 deletions(-) > > diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc > index 36100c594..e33f1e742 100644 > --- a/config/arm/arm64_armada_linux_gcc > +++ b/config/arm/arm64_armada_linux_gcc > @@ -17,3 +17,5 @@ endian = 'little' > implementer_id = '0x56' > max_numa_nodes = 1 > max_lcores = 16 > +has_libnuma = 0 > +disabled_drivers = ['bus/dpaa', 'bus/fslmc', 'common/dpaax'] Changes to disabled drivers should be merged in the previous patch. > diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc > index 779333199..c6010e303 100644 > --- a/config/arm/arm64_armv8_linux_gcc > +++ b/config/arm/arm64_armv8_linux_gcc > @@ -28,7 +28,11 @@ implementer_id = 'generic' > part_number = 'generic' > > # Supported extra configuration > -# max_numa_nodes = n # will set RTE_MAX_NUMA_NODES > -# max_lcores = n # will set RTE_MAX_LCORE > +# max_numa_nodes = n # will set RTE_MAX_NUMA_NODES > +# max_lcores = n # will set RTE_MAX_LCORE > max_lcores = 256 > max_numa_nodes = 4 > + > +# has_libnuma = 0 # set to 0 if the SoC is not a NUMA system > +# disabled_drivers += ['bus/dpaa', 'crypto'] > + # add to the set of disabled libraries > diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc > index 7ff6fd309..e154ac4fd 100644 > --- a/config/arm/arm64_bluefield_linux_gcc > +++ b/config/arm/arm64_bluefield_linux_gcc > @@ -17,3 +17,4 @@ implementer_id = '0x41' > part_number = '0xd08' > max_numa_nodes = 1 > max_lcores = 16 > +has_libnuma = 0 > diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc > index adae86f57..78883a2ec 100644 > --- a/config/arm/arm64_dpaa_linux_gcc > +++ b/config/arm/arm64_dpaa_linux_gcc > @@ -17,3 +17,4 @@ endian = 'little' > implementer_id = 'dpaa' > max_numa_nodes = 1 > max_lcores = 16 > +has_libnuma = 0 > diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc > index 3a8b46812..4493227f3 100644 > --- a/config/arm/arm64_n1sdp_linux_gcc > +++ b/config/arm/arm64_n1sdp_linux_gcc > @@ -17,3 +17,4 @@ implementer_id = '0x41' > part_number = '0xd0c' > max_numa_nodes = 1 > max_lcores = 4 > +has_libnuma = 0 > diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_octeontx2_linux_gcc > index 2baf95a2a..ff9e5c403 100644 > --- a/config/arm/arm64_octeontx2_linux_gcc > +++ b/config/arm/arm64_octeontx2_linux_gcc > @@ -17,3 +17,4 @@ implementer_id = '0x43' > part_number = '0xb2' > max_numa_nodes = 1 > max_lcores = 36 > +has_libnuma = 0 > diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc > index 7ff6fd309..e154ac4fd 100644 > --- a/config/arm/arm64_stingray_linux_gcc > +++ b/config/arm/arm64_stingray_linux_gcc > @@ -17,3 +17,4 @@ implementer_id = '0x41' > part_number = '0xd08' > max_numa_nodes = 1 > max_lcores = 16 > +has_libnuma = 0 > diff --git a/config/arm/meson.build b/config/arm/meson.build > index 21deb2dd9..a023abb17 100644 > --- a/config/arm/meson.build > +++ b/config/arm/meson.build > @@ -101,7 +101,6 @@ flags_octeontx2_extra = [ > ['RTE_MACHINE', '"octeontx2"'], > ['RTE_ARM_FEATURE_ATOMICS', true], > ['RTE_USE_C11_MEM_MODEL', true], > - ['RTE_EAL_IGB_UIO', false], > ['RTE_MAX_LCORE', 36], > ['RTE_MAX_NUMA_NODES', 1] > ] > @@ -236,6 +235,10 @@ else > ['RTE_MAX_LCORE', cross_max_lcores] > ] > endif > + cross_has_libnuma = meson.get_cross_property('has_libnuma', '') > + if cross_has_libnuma != '' > + has_libnuma = cross_has_libnuma > + endif > endif > > # apply supported machine args > diff --git a/drivers/meson.build b/drivers/meson.build > index 4c4866866..a997387ad 100644 > --- a/drivers/meson.build > +++ b/drivers/meson.build > @@ -21,6 +21,10 @@ subdirs = [ > disabled_drivers += run_command(list_dir_globs, get_option('disable_drivers'), > ).stdout().split() > > +if meson.is_cross_build() > + disabled_drivers += meson.get_cross_property('disabled_drivers', []) > +endif > + This change also belongs in the previous patch. However, because of the way it's done here, I think the change to the disabled_drivers assignment in the previous patch can be dropped, since assigning using "=" rather than "+=" is fine when the cross-file addition is done later. > default_cflags = machine_args > default_cflags += ['-DALLOW_EXPERIMENTAL_API'] > default_cflags += ['-DALLOW_INTERNAL_API'] > -- > 2.20.1 >