From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerin Jacob Kollanukkaran Subject: [PATCH v6 4/4] config: add octeontx2 machine config Date: Mon, 18 Mar 2019 16:50:24 +0000 Message-ID: <20190318164949.2357-4-jerinj@marvell.com> References: <20190224181041.27127-1-jerinj@marvell.com> <20190318164949.2357-1-jerinj@marvell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: "dev@dpdk.org" , "gavin.hu@arm.com" , Jerin Jacob Kollanukkaran , Pavan Nikhilesh Bhagavatula To: Thomas Monjalon Return-path: Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 9223B2C30 for ; Mon, 18 Mar 2019 17:50:50 +0100 (CET) In-Reply-To: <20190318164949.2357-1-jerinj@marvell.com> Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Jerin Jacob Optimized configuration for Marvell octeontx2 SoC. Updated meson build to support Marvell octeontx2 SoC. Added meson cross build target for octeontx2. Signed-off-by: Jerin Jacob Signed-off-by: Pavan Nikhilesh --- config/arm/arm64_octeontx2_linux_gcc | 15 ++++++++ config/arm/meson.build | 9 ++++- config/defconfig_arm64-octeontx2-linux-gcc | 1 + config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 ++++++++++ mk/machine/octeontx2/rte.vars.mk | 34 +++++++++++++++++++ 5 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 config/arm/arm64_octeontx2_linux_gcc create mode 120000 config/defconfig_arm64-octeontx2-linux-gcc create mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc create mode 100644 mk/machine/octeontx2/rte.vars.mk diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_octeon= tx2_linux_gcc new file mode 100644 index 000000000..7a6429b1b --- /dev/null +++ b/config/arm/arm64_octeontx2_linux_gcc @@ -0,0 +1,15 @@ +[binaries] +c =3D 'aarch64-linux-gnu-gcc' +cpp =3D 'aarch64-linux-gnu-cpp' +ar =3D 'aarch64-linux-gnu-gcc-ar' +strip =3D 'aarch64-linux-gnu-strip' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'aarch64' +cpu =3D 'armv8-a' +endian =3D 'little' + +[properties] +implementor_id =3D '0x43' +implementor_pn =3D '0xb2' diff --git a/config/arm/meson.build b/config/arm/meson.build index 5c391ed3c..87ae40c24 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -79,6 +79,12 @@ flags_thunderx2_extra =3D [ ['RTE_MAX_NUMA_NODES', 2], ['RTE_MAX_LCORE', 256], ['RTE_USE_C11_MEM_MODEL', true]] +flags_octeontx2_extra =3D [ + ['RTE_MACHINE', '"octeontx2"'], + ['RTE_MAX_NUMA_NODES', 1], + ['RTE_MAX_LCORE', 24], + ['RTE_EAL_IGB_UIO', false], + ['RTE_USE_C11_MEM_MODEL', true]] =20 machine_args_generic =3D [ ['default', ['-march=3Darmv8-a+crc+crypto']], @@ -96,7 +102,8 @@ machine_args_cavium =3D [ ['0xa1', ['-mcpu=3Dthunderxt88'], flags_thunderx_extra], ['0xa2', ['-mcpu=3Dthunderxt81'], flags_thunderx_extra], ['0xa3', ['-mcpu=3Dthunderxt83'], flags_thunderx_extra], - ['0xaf', ['-mcpu=3Dthunderx2t99'], flags_thunderx2_extra]] + ['0xaf', ['-mcpu=3Dthunderx2t99'], flags_thunderx2_extra], + ['0xb2', ['-mcpu=3Docteontx2'], flags_octeontx2_extra]] =20 ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321) impl_generic =3D ['Generic armv8', flags_generic, machine_args_generic] diff --git a/config/defconfig_arm64-octeontx2-linux-gcc b/config/defconfig_= arm64-octeontx2-linux-gcc new file mode 120000 index 000000000..e25150531 --- /dev/null +++ b/config/defconfig_arm64-octeontx2-linux-gcc @@ -0,0 +1 @@ +defconfig_arm64-octeontx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconf= ig_arm64-octeontx2-linuxapp-gcc new file mode 100644 index 000000000..9eae84538 --- /dev/null +++ b/config/defconfig_arm64-octeontx2-linuxapp-gcc @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Marvell International Ltd +# + +#include "defconfig_arm64-armv8a-linux-gcc" + +CONFIG_RTE_MACHINE=3D"octeontx2" + +CONFIG_RTE_CACHE_LINE_SIZE=3D128 +CONFIG_RTE_MAX_NUMA_NODES=3D1 +CONFIG_RTE_MAX_LCORE=3D24 + +# Doesn't support NUMA +CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=3Dn +CONFIG_RTE_LIBRTE_VHOST_NUMA=3Dn + +# Recommend to use VFIO as co-processors needs SMMU/IOMMU +CONFIG_RTE_EAL_IGB_UIO=3Dn diff --git a/mk/machine/octeontx2/rte.vars.mk b/mk/machine/octeontx2/rte.va= rs.mk new file mode 100644 index 000000000..cbec7f14d --- /dev/null +++ b/mk/machine/octeontx2/rte.vars.mk @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Marvell International Ltd +# + +# +# 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 + +include $(RTE_SDK)/mk/rte.helper.mk + +MACHINE_CFLAGS +=3D $(call rte_cc_has_argument, -march=3D-mcpu=3Darmv8.2-a= +crc+crypto+lse) +MACHINE_CFLAGS +=3D $(call rte_cc_has_argument, -mcpu=3Docteontx2) --=20 2.21.0