From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0086.outbound.protection.outlook.com [104.47.38.86]) by dpdk.org (Postfix) with ESMTP id ADB6E3257 for ; Sun, 14 Jan 2018 14:29:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1rTwe4sxV7v3KrYKSc8P/8cKNLssHf7hp4amH1zbqfA=; b=RaypU8Qp72CTV4kZvDBrrvT5T0b1jz1RTw/IPXiiCOflW2pgvhj9cndOaoNHj/I9RzzApWycIiRabibCVZKGGaxyUn839CnEUHpQck+OJmIxPReqpNrcjoCeBlcaBhA5viJ9VmRk8S5W4w5mvrOhJUaOvRmR5KgylK8AhSUO5tg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from localhost.localdomain (111.93.218.67) by CY4PR07MB3464.namprd07.prod.outlook.com (10.171.252.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Sun, 14 Jan 2018 13:29:17 +0000 From: Pavan Nikhilesh To: jerin.jacob@caviumnetworks.com, santosh.shukla@caviumnetworks.com, bruce.richardson@intel.com, harry.van.haaren@intel.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Sun, 14 Jan 2018 18:58:34 +0530 Message-Id: <20180114132836.9828-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180114132836.9828-1-pbhagavatula@caviumnetworks.com> References: <20171231000203.4510-1-pbhagavatula@caviumnetworks.com> <20180114132836.9828-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: DM5PR19CA0025.namprd19.prod.outlook.com (10.173.167.139) To CY4PR07MB3464.namprd07.prod.outlook.com (10.171.252.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bccdb6b0-69e3-4b47-9de7-08d55b52d159 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:CY4PR07MB3464; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 3:LAAARcOGJHC9ILC/XUrP8H++cfLA6LFKdSyWUHPzAs6H0nBNgOJjPNasmtmA8X+txp3qAlouFXlQfhB/HjCTMD7UrQFt2/rIbfr+IX7aDlRdJIC2K5BE1FxHSBZ/xDhkDdlbLt3C8lEy2XNUEVDzSNBOnCMml30zkEXLCG7ayxvAEQCVyB1794ayF9ysxebxigLOm/JXlYbMBlnpk5augR7HK/h2aPCcp1SeqIdfA+GZIU/GvUqFkq3Ld5Qa72I3; 25:ccSydE+EznVrF6KIsF9g7htbCP7/JmoZVC+1O6OxZ5Ik9Mfd0LE+t4frUYoKU1G7wWms7VdLDDFfEAPT6iQpAwBzvrbOnFSgRDtTmXX2/mIhDw2qZlKKKEQQeu5rw83/IjCJmB5ZqshJ5SRxPpuIGIP7V7ZQ6yI59deZVupMbJYIYDZ/RI6SrjViKof3Yvm69iMA9/c4yoJRH7LNZXGh+yIKXfpoQdV7mAPC0o5O+bT9N2z5+G3/n/y3pGreSprhIYbw87lF/7CZtPEf8dldApvQKl5lrv5jEPk0nCo0jBQgmaP8QFBh+3erGWT0nXJlL/U8VKzP603PdTgWGMZXVQ==; 31:H7wjxyT/9wFCPrqRB4MZLBeBxS44kp81P5wvt7/b9c2n03dc3VM35Xk7HLpOKG5cXhdOLeuy8hnyFWFbCQlqVvs0kzXigKzpzEHNdLXvmMxIxCD3v2SnlzfSWKYUcq0FSYMkXSQ6u91O/MSyktuyHzNq4JVihFEkEz+kxmn/R8kLZxOT6IILocwJmX3HX7jEa+x5RfShZi1e73kZLSyLBKIXUDknBQ15ZRO7H0UE1DM= X-MS-TrafficTypeDiagnostic: CY4PR07MB3464: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 20:GmYVqhq6YWXAj4XBWcAgfnuh453uKu5/VwPBOtcc+Jx0OfuyFdW436LYpdPN8TDp86DtgGGDXIma5RhvEEGmUsAWtEQhQWKJ5m25AoSVljFUz4RRLvwvD8dhNeUOok6r8ZTaxuCt3My6TZ72FiEpgn965TQFybEFIATzdV1LOG+ryU+DPi9VoJOclUUqvamjs7FqEcrVNsfJG0vugdZQ0ZuT1iIhuUYnCDnIVo9fEGBpeZ4OdzLGB58iseGjpC7/y64G7AAZN+25D7fBvjYWbhzds4WGh6rRLeUNe3HKgzTktctGPxajAPWHtLpGqKNFBTh9ZHlXoT8WlBQzzPVEPIw4tIyl5k8K9/M02mfTZpf7bynu0CFQ2M1in5P8uut1tkUNceki66V22ZNPHJAK3OtlKfWTgFfoHL6HPHYZffT2tx8voju3aI8YoK+fUhDLkqqf9Or81Kcm2thOeJE58Mhs/saFbBC5C35gUCEBSpHgsYcI89H49uPcWo+OQGRJYJQArJQY2ca328mZqB729MrzvNMm7ufgyN/XBdYHkPQdAktlFf9Ai/UAolKpEIKnAyuUyDKUHz3USDu2g+y72l7O1IIC+R0mr/o4HCKQRt0=; 4:23icXiiqrVtsOZbdczVLAW1dskdimFLuXzld/0B2R4hzPNmurNkQm+bXYDgKq1fXKJmIOvwmGeF0M+QBL+drDf7EveAP03eSy7m+MWiLOlUvFU1cRO2CYjTycu+AQKzCrEU6GmTAWvLVqSbRvu6LhwloL4A6Aq4pgHxi1eDhAUE6cSXaFgj1x0+tzRg9+U8ww+MaksTTK2ffXPlMjUp3UifTKQszEyaQfK5qyBNTsOhgC9DxV1cCiAAvEQacMtMn/UhfWbQlRxUXiIHC0n6Kqg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231023)(944501161)(93006095)(6041268)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011); SRVR:CY4PR07MB3464; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY4PR07MB3464; X-Forefront-PRVS: 05529C6FDB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39850400004)(396003)(39380400002)(346002)(376002)(366004)(199004)(189003)(5660300001)(2906002)(25786009)(105586002)(5009440100003)(6116002)(81156014)(1076002)(7736002)(48376002)(305945005)(8676002)(316002)(386003)(3846002)(106356001)(6506007)(81166006)(16586007)(4326008)(16526018)(107886003)(53936002)(2950100002)(50466002)(97736004)(76176011)(6666003)(478600001)(6486002)(68736007)(42882006)(72206003)(51416003)(66066001)(36756003)(52116002)(8936002)(50226002)(47776003)(6512007)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3464; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3464; 23:Rb8VmwHn2jj5VNS3wHr7gIZITM6AZe1SFJn7vkqYJ?= =?us-ascii?Q?0enp8aICBjBfa8tGgi56IWj9qi0vpsUBnALUg9aflL1zUn7dtO8mzZjyKOi+?= =?us-ascii?Q?3c0dvZJL2r4pHV38NcI1gyUUMLK21uxTDc6Mnd1G1ir/0hRHe6Q7GQye+TqM?= =?us-ascii?Q?BwH39/Q/RqcFJazKgFPNgpKVjTpZLzsmUvtQnhoJfGCq3j5egCMK3RYatF7r?= =?us-ascii?Q?qDNvmOCvFk+8H4xfcQDqozf9LJc+p8kFoANBf3LSl8pohWXta4UagI1veaIo?= =?us-ascii?Q?PsbP47uWsgj9vD3nLpXfktxkGIsUMms3MHEGhk6dLG6sA8cJI0iwasLciXio?= =?us-ascii?Q?F3Gw8VO8aT4ZZgTCHjTQjspxrkp0w92tgIQb2fSdrgbIgbKEadHgHlZJG58Q?= =?us-ascii?Q?7SfeiPaAL9GhiE5rWykWq0tn7iHDIMKXgR6wsZKN84v2T2Ce7Ea7oyECs7YP?= =?us-ascii?Q?n4WRmp8tWJyZvez/VjyveJ4O3qraYf0u28YiAv0egXPHJULjzumFpXWaUS35?= =?us-ascii?Q?DJGRxA04u15TUzLqjc6jhfi9rtPtYZFzWGBp9hA2SVTAWsGpmn20G4BsFFJW?= =?us-ascii?Q?P+QuMco1T1TUsT26t9gBnoM3lnw9EvcZrqTt36Xakv0WggkNGKteN+3COBMJ?= =?us-ascii?Q?YlyG/rld3JjhW09dNoJV51WmE48M8NpGhpA8MvL1S1j4hJ20YHqM9sSTGIhP?= =?us-ascii?Q?3P90W2ZmOD8k/L46VMPuVlv27/UlJkd2GkA8zo1E6wwjpVaDjL/FNMVvCYRD?= =?us-ascii?Q?D6ccaiX4DzB11jID2c+F5/AkX0q4aPnVGj4hnQpr9Hk6rJ27Rd7GGJxBWX1q?= =?us-ascii?Q?vxRKNV4oAp9ucAq0ngLmabIoc0cQRsSIPhyvdwOLACEzOYuP+lvJN1hGLjN7?= =?us-ascii?Q?HOciaeA02KVJTKlKi9y5elsZ0gmZCv/GiZtguSnSF/v5BhDNvf5grdqFB2nb?= =?us-ascii?Q?+3uru2Bh3Gic/7I3U3YoihDZditCzeX0Kl4Z694sxR/c1FdhJyeXNC+Mhs7+?= =?us-ascii?Q?x9XYblLzBg+WXuRbyLapCUKFQh+zM9F0FhR1hQXPMAgCYmzYxb5yF1h3t/TY?= =?us-ascii?Q?3OUw+t+8FOgqJE8mWKUmkyuNZTLphrCDgndyGsEZ+XcDjL5WzNsKG6ECACEp?= =?us-ascii?Q?wAzo4KUU9wHrgFfPkzHXEaAjjVPZ7RUeirmH5/WgsEqgcy3Ctzh/oEnnpda7?= =?us-ascii?Q?foOEqxVzzSz9EQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 6:JZhRutjjYbrm58hYbSzgUHjl383a4RgDQi5+XKbCuAfe890b41knvqSJbANcNbGSKX7bUlky9apyRlc70f9c50bJs85G38Mw4mbaruAb9tdHN2A0e+hqthnlw/QaeccH9J8ecGG6PRdq/DcOL7mMMzEvDBsZycysBoxcyoazC/kB0ROCCRwQU/OtuCzLDC+1oETkNumfszZZ9uQFQ7/dwYE9Nlh5A4+GPgSHeV1g5ik6un5wAvurUKaPJhoRfIgj4ktb0mjLJiFNgIpxtjZXlqC72EK1EFsKboXD/eJUCSaK0lUVW41rBTGe4YWTSRlJoVOwbOFclP6si6Igg92MzQS0chhzJvA8xhcKjl9tZkw=; 5:fv/Vf+F//JwXZzx2QGjz8uTjy2baDZBVta6vUpyYziBrPE4wHdWqSxgmjCuq7uMknsT7JqFmpDpH1MRIKo/2SQ0ectYA9Z7FccTK7Bxk1pTdHlA+1Y50eKVw1uFpUxo8nMWpKk8QWUcZnHwoAxeShSgx01MnM+kmRPxGlw6N2Ws=; 24:wkMnM0KgQSOua3YvdtSfhx702iBSFO1+zLGX5zpAqG3YhXqbw3Uas3RSWKbiTcY4WT1OmXQuCA9WMKqbcQNb2TNkOcrGp9MRQbVhi3dKV+M=; 7:hSwbb6M9c+WPTh65NSMI/gI5dZ7t39l8IGIV6L8Wvv5FKazEFQZQ7UG44OnBnS+/RjYUMFkTs0enEb8lQuhVXgmhHo/7RQlm2iR0WudfRa32MqZkNm4NgrcjKd5Tkitujo/WP1PnLSarm+5d8B6scEdDlYK5W8SfdyX9WeWrzUcohbm3Z/fIqDscnIrymhUf/g7QMFGzgSuV96nuQe03XfqUl+XSlpL5raqD5w2DAU2jl6t5iyHbJSG/ZxBsQA6t SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2018 13:29:17.7581 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bccdb6b0-69e3-4b47-9de7-08d55b52d159 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3464 Subject: [dpdk-dev] [PATCH v2 2/4] drivers/net: add drivers for Cavium NICs to meson 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: , X-List-Received-Date: Sun, 14 Jan 2018 13:29:22 -0000 Add Cavium octeontx and thunder nicvf to meson build infrastructure. Signed-off-by: Pavan Nikhilesh --- v2 Changes: - Add SPDX license tags. drivers/net/meson.build | 3 ++- drivers/net/octeontx/base/meson.build | 21 +++++++++++++++++++++ drivers/net/octeontx/meson.build | 13 +++++++++++++ drivers/net/thunderx/Makefile | 2 +- drivers/net/thunderx/base/meson.build | 14 ++++++++++++++ drivers/net/thunderx/meson.build | 12 ++++++++++++ ...cvf_version.map => rte_pmd_thunderx_version.map} | 0 7 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 drivers/net/octeontx/base/meson.build create mode 100644 drivers/net/octeontx/meson.build create mode 100644 drivers/net/thunderx/base/meson.build create mode 100644 drivers/net/thunderx/meson.build rename drivers/net/thunderx/{rte_pmd_thunderx_nicvf_version.map => rte_pmd_thunderx_version.map} (100%) diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 72e1d3578..b132d3558 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -3,7 +3,8 @@ drivers = ['af_packet', 'bonding', 'e1000', 'fm10k', 'i40e', 'ixgbe', - 'null', 'pcap', 'ring'] + 'null', 'pcap', 'ring', + 'octeontx', 'thunderx'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build new file mode 100644 index 000000000..82697c4bc --- /dev/null +++ b/drivers/net/octeontx/base/meson.build @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc + +sources = [ + 'octeontx_pkovf.c', + 'octeontx_pkivf.c', + 'octeontx_bgx.c' +] + +depends = ['ethdev', 'mempool_octeontx'] +static_objs = [] +foreach d: depends + static_objs += [get_variable('static_rte_' + d)] +endforeach + +base_lib = static_library('octeontx_base', sources, + c_args: cflags, + dependencies: static_objs, + ) + +base_objs = base_lib.extract_all_objects() diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build new file mode 100644 index 000000000..ef789eaa9 --- /dev/null +++ b/drivers/net/octeontx/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc + +subdir('base') +objs = [base_objs] + +sources = files('octeontx_rxtx.c', + 'octeontx_ethdev.c' + ) + +deps += ['mempool_octeontx', 'eventdev'] + +includes += include_directories('base') diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile index e50e1ad8c..3e4501d34 100644 --- a/drivers/net/thunderx/Makefile +++ b/drivers/net/thunderx/Makefile @@ -44,7 +44,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_pci -EXPORT_MAP := rte_pmd_thunderx_nicvf_version.map +EXPORT_MAP := rte_pmd_thunderx_version.map LIBABIVER := 1 diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build new file mode 100644 index 000000000..e79c7206f --- /dev/null +++ b/drivers/net/thunderx/base/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc + +sources = [ + 'nicvf_hw.c', + 'nicvf_mbox.c', + 'nicvf_bsvf.c' +] + +base_lib = static_library('nicvf_base', sources, + c_args: cflags, + dependencies: static_rte_ethdev) + +base_objs = base_lib.extract_all_objects() diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build new file mode 100644 index 000000000..faf34483e --- /dev/null +++ b/drivers/net/thunderx/meson.build @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc + +subdir('base') +objs = [base_objs] + +sources = files('nicvf_rxtx.c', + 'nicvf_ethdev.c', + 'nicvf_svf.c' + ) + +includes += include_directories('base') diff --git a/drivers/net/thunderx/rte_pmd_thunderx_nicvf_version.map b/drivers/net/thunderx/rte_pmd_thunderx_version.map similarity index 100% rename from drivers/net/thunderx/rte_pmd_thunderx_nicvf_version.map rename to drivers/net/thunderx/rte_pmd_thunderx_version.map -- 2.15.1