From patchwork Mon Mar 18 16:50:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob Kollanukkaran X-Patchwork-Id: 51291 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 94323324D; Mon, 18 Mar 2019 17:50:52 +0100 (CET) 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) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2IGjWG6028272; Mon, 18 Mar 2019 09:50:45 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0818; bh=tnc+wK7rIdaATD96YVt4obJ90MBjL79/znlWcJDSYtk=; b=M7kyZon3JCnUROYhyX2ZzjXaIhkr3ZgmMJjTO+auQO01sTTi08wJGL8ho4ArOE5VHDot t3oxPNZlSarlhmH6JbOpCeNSSGjhv5giLlJ827SyZ/txvRA9fb518r+M/4V/I5owuCGy wOhKVCZmeJtkX3/srDtoQu1a7JS+U3cXVx3fSdlAUfN2B9MSvEE2Uqu597AaZsuMzraN E53598rIeZQvKVgAJKyL8A+/CgfdH8Ud9y/VYWpcmQ3RXpPdq/eHGIBCp9emw+oDCA7n w/FXgxozq/gJuBmWTwJlAqQdwn1TnCWFMw4f2jeAZcr51jJcDOCIA2S89eP80zw+Dxwk ig== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 2raapr8vd0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 18 Mar 2019 09:50:44 -0700 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 18 Mar 2019 09:50:38 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (104.47.32.53) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Mon, 18 Mar 2019 09:50:38 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tnc+wK7rIdaATD96YVt4obJ90MBjL79/znlWcJDSYtk=; b=DqeI4yZXA7iaDwMUqCfhLxHDuZpQ9XRAqkv5SXr/jfMhEauFcHvDfc5mb1fZYsxMUV6FeNV5N17wasJhfow1eYwnlkSP0GjzUeDm00VIHTEtR7z9gsxW7m8Gcz+kFm8JB3Yb0x7P5VY047Wh0Ug1dyptMrVCAcqBKR0HUj6gbCk= Received: from BYAPR18MB2424.namprd18.prod.outlook.com (20.179.91.149) by BYAPR18MB2806.namprd18.prod.outlook.com (20.179.57.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Mon, 18 Mar 2019 16:50:25 +0000 Received: from BYAPR18MB2424.namprd18.prod.outlook.com ([fe80::2cce:b981:61da:f92b]) by BYAPR18MB2424.namprd18.prod.outlook.com ([fe80::2cce:b981:61da:f92b%2]) with mapi id 15.20.1709.015; Mon, 18 Mar 2019 16:50:25 +0000 From: Jerin Jacob Kollanukkaran To: Thomas Monjalon CC: "dev@dpdk.org" , "gavin.hu@arm.com" , Jerin Jacob Kollanukkaran , Pavan Nikhilesh Bhagavatula Thread-Topic: [dpdk-dev] [PATCH v6 4/4] config: add octeontx2 machine config Thread-Index: AQHU3aquXRI6of6n00Oul8m4KPeKqQ== 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> In-Reply-To: <20190318164949.2357-1-jerinj@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BM1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:40::36) To BYAPR18MB2424.namprd18.prod.outlook.com (2603:10b6:a03:130::21) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.21.0 x-originating-ip: [111.93.218.67] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6f9b831c-3b73-4544-5e27-08d6abc1d12d x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:BYAPR18MB2806; x-ms-traffictypediagnostic: BYAPR18MB2806: x-microsoft-antispam-prvs: x-forefront-prvs: 098076C36C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(39860400002)(136003)(396003)(189003)(199004)(6512007)(105586002)(102836004)(99286004)(5660300002)(66066001)(8676002)(476003)(2906002)(486006)(68736007)(81166006)(81156014)(78486014)(2616005)(6916009)(1076003)(50226002)(478600001)(107886003)(54906003)(6506007)(386003)(26005)(14444005)(256004)(316002)(3846002)(6436002)(36756003)(6116002)(14454004)(71190400001)(71200400001)(25786009)(97736004)(76176011)(7736002)(305945005)(11346002)(8936002)(186003)(6486002)(53936002)(446003)(4326008)(106356001)(52116002)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR18MB2806; H:BYAPR18MB2424.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: marvell.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: LpNtjdYHf6paxPGF4ktwUfb59dA19UOsVSUDkl+Pm8GYRPYcS/RTO/S0H+AG4EH8abedbWSZka3ZF3LxsobQJg7DxRsORv5Q+rt28lyHJgUQYi79l5iUdt3cORVdEl+Rbzx6lZ8iZEnisZjJks4RGD5X0xsYq4xh5ETv6vrAFvhh8F7LlMdPCOljR3iw1fz8FUeo9jPHfxAm6MmuFdiZ9xP3MM4YGSZ0MaW+EzWSkCQ/vlLLbzxohLm8IyXd0eKt1sc/+A6Ff0l4EAiuFxPhj1Kpc7ky0zo1b9td9lH0y7orG93An4yuOXIyIhVpxZFwuiuTwX/92DB81bYKjCnJqXOgu1Q6Nm7wJXH8/4I54Yzz3WAuVLVOwqhSzr7tziPxZHuwnecDPM4blEiI/AfUqf7DhSNCoR69UPbDyxckl7U= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 6f9b831c-3b73-4544-5e27-08d6abc1d12d X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Mar 2019 16:50:24.8755 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR18MB2806 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-03-18_11:, , signatures=0 Subject: [dpdk-dev] [PATCH v6 4/4] config: add octeontx2 machine config 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" 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 Reviewed-by: Gavin Hu --- 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_octeontx2_linux_gcc new file mode 100644 index 000000000..7a6429b1b --- /dev/null +++ b/config/arm/arm64_octeontx2_linux_gcc @@ -0,0 +1,15 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-cpp' +ar = 'aarch64-linux-gnu-gcc-ar' +strip = 'aarch64-linux-gnu-strip' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementor_id = '0x43' +implementor_pn = '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 = [ ['RTE_MAX_NUMA_NODES', 2], ['RTE_MAX_LCORE', 256], ['RTE_USE_C11_MEM_MODEL', true]] +flags_octeontx2_extra = [ + ['RTE_MACHINE', '"octeontx2"'], + ['RTE_MAX_NUMA_NODES', 1], + ['RTE_MAX_LCORE', 24], + ['RTE_EAL_IGB_UIO', false], + ['RTE_USE_C11_MEM_MODEL', true]] machine_args_generic = [ ['default', ['-march=armv8-a+crc+crypto']], @@ -96,7 +102,8 @@ machine_args_cavium = [ ['0xa1', ['-mcpu=thunderxt88'], flags_thunderx_extra], ['0xa2', ['-mcpu=thunderxt81'], flags_thunderx_extra], ['0xa3', ['-mcpu=thunderxt83'], flags_thunderx_extra], - ['0xaf', ['-mcpu=thunderx2t99'], flags_thunderx2_extra]] + ['0xaf', ['-mcpu=thunderx2t99'], flags_thunderx2_extra], + ['0xb2', ['-mcpu=octeontx2'], flags_octeontx2_extra]] ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321) impl_generic = ['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/defconfig_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="octeontx2" + +CONFIG_RTE_CACHE_LINE_SIZE=128 +CONFIG_RTE_MAX_NUMA_NODES=1 +CONFIG_RTE_MAX_LCORE=24 + +# Doesn't support NUMA +CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n +CONFIG_RTE_LIBRTE_VHOST_NUMA=n + +# Recommend to use VFIO as co-processors needs SMMU/IOMMU +CONFIG_RTE_EAL_IGB_UIO=n diff --git a/mk/machine/octeontx2/rte.vars.mk b/mk/machine/octeontx2/rte.vars.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 = +# CROSS = +# MACHINE_CFLAGS = +# MACHINE_LDFLAGS = +# MACHINE_ASFLAGS = +# CPU_CFLAGS = +# CPU_LDFLAGS = +# CPU_ASFLAGS = + +include $(RTE_SDK)/mk/rte.helper.mk + +MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=-mcpu=armv8.2-a+crc+crypto+lse) +MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=octeontx2)