From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <Pavan.Bhagavatula@cavium.com>
Received: from NAM03-BY2-obe.outbound.protection.outlook.com
(mail-by2nam03on0087.outbound.protection.outlook.com [104.47.42.87])
by dpdk.org (Postfix) with ESMTP id F1DF71B297
for <dev@dpdk.org>; Fri, 19 Jan 2018 14:12:27 +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=BO1OSOc7byBv9B0Snk+9LXRBOX6IYhLaSxNa8qu4jsk=;
b=KLqJWG+f7NodTkpAsFsMbhGLETJ4BfZIQLdtD6ZTSBgAcI/7c9W7xTJewe1zafnF3bDKxv0vQHtHOEZ2byj+rBclJdo4X3oWNh+srj+/Zwb+7Y+DOxJCq7K7+zlZ5dFEptuqodusaibHPBG17ctZ06LaxcgYd4q1wEkpHpbyjkY=
Received: from Pavan-LT.caveonetworks.com (111.93.218.67) by
CY4PR07MB3463.namprd07.prod.outlook.com (10.171.252.144) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id
15.20.428.17; Fri, 19 Jan 2018 13:12:24 +0000
From: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
To: jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com,
harry.van.haaren@intel.com
Cc: dev@dpdk.org,
Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Date: Fri, 19 Jan 2018 18:42:02 +0530
Message-Id: <20180119131204.7391-2-pbhagavatula@caviumnetworks.com>
X-Mailer: git-send-email 2.14.1
In-Reply-To: <20180119131204.7391-1-pbhagavatula@caviumnetworks.com>
References: <20171231000203.4510-1-pbhagavatula@caviumnetworks.com>
<20180119131204.7391-1-pbhagavatula@caviumnetworks.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [111.93.218.67]
X-ClientProxiedBy: DM5PR2001CA0021.namprd20.prod.outlook.com (10.172.43.31) To
CY4PR07MB3463.namprd07.prod.outlook.com (10.171.252.144)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: e6239109-b68c-4d7e-efee-08d55f3e494e
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0;
RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020);
SRVR:CY4PR07MB3463;
X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463;
3:wZ5Zp5/VhrLYAlmL9cV3FsFPDy87lLKMpJNNSxrCWVT0GYkW/oMPRacjJ/J76umI6JEyZck9x9KT8HPAgmTReibMjoaMM1+0dHhxIF4oO2hONEpdKk+cyE9cEQ3ABuBhXo++1mKVS5yh9B3GylMj2SzrIuLTBCm96HAnSU6HeBjsHPfiF7I3CbPLwhgWd6dAndR/89J8T3zwXC6NqhhNiq+ZHWWroB1VdJg3qzqfgi0SlWknxBibBlcabWqrTZ8P;
25:hWazW47xADWz13JvaeN8tcI1x4TD4Uh21FqYPnn0ORKIq1eEs5VDluSALa624FdWcN27qaLrsuV2/iEhtJEOd6eP15ycOSm5sE4LK8tu90OXT0WrTzVN8prSKpx0G2rxuOCaut3W9jXVEO/KvSlY0SPjqX73P1yaGBVpiSSGZql/twi7XxzJpChCtsHMjz0wuQOyLFV6iItyia378m4WyjRcdMAq0VxiiGZluUWDiVqXgWx6jRMatDkJPFeZwDNqLnZ7v3f/+DsZUs7WUK+KsroBh6r7lRJhDdqNiRPrj0iFiN9Of5Pbc5oqq7mvm64BhZYW3hb8LqNoMpFtG5a2Jw==;
31:7eqAl4TRnow1rrU7F7BAensGu1frGZ+aSLPaSq0aTtU2IXeXIa6+UMhj0F4c0HSS3z/ZN+NVx0qNSHh8ZrO4ArKwFlw0HE71JVborZpzXwj9VjK+BH5ywS8Jrd8UfFnVb3fzhZzE2G4lX3jm0SInt6jXyq/MvWR3EgnknqNBFdcOjnuGaK58ZsRwrWe61JGn+3doOoX2Ygs/ukq46ao1+IC6qsRcDtXdln/vGGjjyTg=
X-MS-TrafficTypeDiagnostic: CY4PR07MB3463:
X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463;
20:YmlJ/sJTjS3IyeRAu4oxYLzLpgX62LolldHqbQyMh1rf4GsFqVQ4UpT5ESjSO7nVaN8stlrIvM0+x9iP9bBxoO6tdPAd89udvdz18Jee00Kqik4lxEIeWbHtoyvIkO3HmYHl8ABccZTmGCd0/AahlF0WHTczqlUfuQ+zbxOCHOlcGHGUaxRqAlm0v4sqFyxJh73aEYnp4SmC5qXWnVIWCNK30oyvJgZC+wLXv3Dguq3zTqWP16Dha+9H71BE83UwE98K20pjxzj/ekHhDc4yS1VEJuG3YUNwVU1LwVOUgnQyW8i+rTVBRlaxV+mAgE+QfsfK/uORpTks+JMS+DJIVCIv0yqQJQAUqj/oytdActxBJ20LpnONjkNz4S609jTXGmCvzi7vlIAvnUPLytF/j14kq6d7qawiFxH4arQhDHHJk53sS7qfSwnr/zAh+vSWREkjOhoZ17XjHNsdHBnAAmXmpkvRSQUJK0UYV0PlhjvcCwDemCt6nAtvl7Utmat1ecFfZp3iF+a4AdwL30oHaW7IKywg2CI2ijTRo9wwjGTeDFl6zL05tDzGKg9YY9uJuB7foIqEhQwpypEscJZFyLokqgZZoYAbPd4dbJ3kQsY=;
4:b3GSDlC2YnzBJNn4Wti66BczcAG+hv7venzl63D3LnElCPFPVOQ6BHpyHfjZUgY+iAwc9c6g7R+OoftdCrEag4JS7fRc3I0NxFQaf5RU0alvMPJNPPEVwFpu65lVWUQP+1jorx+3mKS0lC7GOQCJM+Ob46y9wdv4D2/NFyr9dSAarBMt3xPGaE3bduzgJD+M5cTrjas7Ec8dJJgvCrLB12Poo6xRc0/9WtUgBvfeEwxchmvt5S45hVQ3+DYrQooWgDJfpfOCtp6LDIC6eyIHmg==
X-Microsoft-Antispam-PRVS: <CY4PR07MB34638ED7E9C1C89F75D2EACB80EF0@CY4PR07MB3463.namprd07.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:;
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(6040495)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(3231023)(2400077)(944501161)(6041282)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011);
SRVR:CY4PR07MB3463; BCL:0; PCL:0; RULEID:(100000803101)(100110400095);
SRVR:CY4PR07MB3463;
X-Forefront-PRVS: 0557CBAD84
X-Forefront-Antispam-Report: SFV:NSPM;
SFS:(10009020)(39860400002)(346002)(39380400002)(396003)(376002)(366004)(189003)(199004)(53416004)(4326008)(16586007)(81156014)(8676002)(6512007)(8936002)(6486002)(36756003)(53936002)(316002)(105586002)(50226002)(68736007)(81166006)(16526018)(25786009)(7736002)(97736004)(107886003)(69596002)(106356001)(48376002)(76176011)(50466002)(305945005)(6346003)(6116002)(3846002)(1076002)(6506007)(5009440100003)(386003)(2906002)(66066001)(47776003)(72206003)(5660300001)(51416003)(26005)(2950100002)(42882006)(478600001)(6666003)(52116002)(42262002);
DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3463; H:Pavan-LT.caveonetworks.com;
FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en;
Received-SPF: None (protection.outlook.com: cavium.com does not designate
permitted sender hosts)
Authentication-Results: spf=none (sender IP is )
smtp.mailfrom=Pavan.Bhagavatula@cavium.com;
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3463;
23:zXR4t2cPTlUY0CVMKTJKFNSdkGhTbNQR86S3s7j3r?=
=?us-ascii?Q?o5CjygqWj0j0EobN9yeLbGW4Rw9hgK38Xi9OlkwyDXXBMg6HAS7MKaWT/uYm?=
=?us-ascii?Q?9HyRXisLY9jVqKai7xk3boIjBLU1cbbfM/kMyDdHIk4E/sslzlTTaZVgifvE?=
=?us-ascii?Q?szXZcN1yM3fcRHZMJEpLtD9n3J7elTh3LyekaA82c0koFNwx4wp91OwIoeLN?=
=?us-ascii?Q?6nSyRiLbNXl6LY5P+1a0dm0DdDlSxKlut2zdUT4vXDsmYY+iov2UwklISC73?=
=?us-ascii?Q?IKKveWIe8j1SDYboQNEYeoWsCJdLsb3SQ3MAxgVnG1+SJrh7E/B4+a/IyQfG?=
=?us-ascii?Q?+zWgpP5lo6suZ2o/hLPkatw6+cpZqMfk6eOtjqyEfZsnKgkOC6Irj33D8LhF?=
=?us-ascii?Q?N6Yd/BtmyMn1olESkQZ8Z1vpM6zrPC6OMWOaYVcCxdkUOrxUgefW+8J0Dqor?=
=?us-ascii?Q?hOkIlqJcDGEkTjCGjE3kTHNFXhX6IGvqj4GSOcMNujNqmNttlQHbKopCx4Q7?=
=?us-ascii?Q?S/h0Cdv8mpuYbaQPEDE4DYwI6buZFQAVTajyz/rhHMwlP6ZrEQLPrAAX6UP9?=
=?us-ascii?Q?GilETnXsZRLP9GGCH+xSkQdP9LuYKxzPXryQMOT+NQo4n1W07nXjHM5ohUfP?=
=?us-ascii?Q?d4BrxD6dk5LfHYb1iN7OfmBKoB34K1vhebXrXe6moQF2e8XW6SfXi6dGnc6K?=
=?us-ascii?Q?EOSuOPr2OH6sMrS1xmijxYoS6KhC4DsRSaiOiEDGjfj5RInRh/d0UWWuFtG+?=
=?us-ascii?Q?vQ8lPsPCUW++m2mI/GaB5pxe/3aE/+5H+obZosuvBcne5yUj3kUnGDMex0JU?=
=?us-ascii?Q?F3FvBNbBYie221uU4DNJDZNALPUoVnS3MhzZrlgJyp+lnEyWQUrZ57QyO5MA?=
=?us-ascii?Q?zHkM5D5ey6O8YY41zccNX5TZS0NCewdHeYFGGY3hHeB/qNcvuDKYXblQAZie?=
=?us-ascii?Q?7+4dfptJJouQjhvY/tdEtxcbJu12nyLb4GWNTTKylc9nzXKGqg24k4soPr0k?=
=?us-ascii?Q?F+EUm7nukCJXz/pztQUq45bVwnCcO907anIGMwzA2+sSBjTrDWwxitdvvHt2?=
=?us-ascii?Q?UJPp4oJK8t0Po/9blTYDYlWV2piG/EjoznKb4TCoZ1BnoDZ7xiKKrlhVYG52?=
=?us-ascii?Q?A+MdR3b8nsZRqCLU6FWdEcBV/bORhisCbndVq2WEL6Jo39sPd02yKkSyKp90?=
=?us-ascii?Q?N5tR2pqBxcT7f3Fo3gwRMENEw8xi2gA5WsFHF2AdD4lau0lzK/fjgbPhYbA2?=
=?us-ascii?Q?wbVBj96Z/JxczTPLS8=3D?=
X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463;
6:f3bcsw3I/gFekS7DQYEQ293BXrFRU4fX+F19aaYk1ebSdW/w/gbLaGKcfqTSNHJNq8K5ja1y1sBllBurh9NzsmrRM/gCcWkJf2MZnVBasKZC0aK2bz1zUAhHOii2bn4d8zA+QEaoo3Sn9oLAMobWwTmkBDJZYdvm45wX9DFdrZbLlUmTS7fcGZBgbz4M1Yu8GyXWyiUShDpVRvGEMjsho8MSZznEQyuWEg2covXdsa6PhRO0WVXtWuOTFQ7ZHiRyxR0ubhwGtPk9bdEOEc71Qu63OfPyiHL3bkNNsguornzFiMASB7938Izg7TsIwKkKWBO2w117I0yhsjBd6gJjzDvWD2z0tvlSWQ+fVdjxx8I=;
5:5I9rGZYmQHO3Dnx3efc9S9hVObtsnG6VYv05hVE3HBtOvxPTiMSABORaemaIdIcbA/qR2RzBpoa/amQCN7QpFxFDhSu33FFHBZ463frwfdT5LLsawkbzsnYu1oyktJT7kUSQ35JpTZtTshVS3aqbiYgLGhKfe28je2FvAQOy7ns=;
24:xcruuis8LJMb0iXE7wv49Qw5umspp/pGy06KhK933NKVgF1ZqFLTUcGC10UJDynGC/yU1mgbsHKAdjFOrRYO3lqHUepkTNEQlZT1OBmEDXk=;
7:mwp3AjjrESM5/jkyZ0qe9dLJR6nY8bgTv7xZdiiD87yQDJ7cBiEhl3hOEdlg0p5GEh16koC3z0vxZ5ZqFpENomdr898IMRVUuIWSwD+fQ5v/o1Eux/lG9mFS0GxREDMUcm8JVw7DY9cc1I6/7Ayte/W5nW+9hO3emlMOS17w0C+EdTi506KwoH85Xj8wldfuk1wbymgvUyQ5mvwDf/S3jqEEYVJPw02h6Y2YikRb5mGKkskgWAbO9i7TfCI1FP7P
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: caviumnetworks.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 13:12:24.6881 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: e6239109-b68c-4d7e-efee-08d55f3e494e
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3463
Subject: [dpdk-dev] [PATCH v3 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 <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jan 2018 13:12:28 -0000
Add Cavium octeontx and thunder nicvf to meson build infrastructure.
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
---
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 | 14 ++++++++++++++
...cvf_version.map => rte_pmd_thunderx_version.map} | 0
7 files changed, 65 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 cc008bd3a..e6bf49752 100644
--- a/drivers/net/thunderx/Makefile
+++ b/drivers/net/thunderx/Makefile
@@ -16,7 +16,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..7333738de
--- /dev/null
+++ b/drivers/net/thunderx/meson.build
@@ -0,0 +1,14 @@
+# 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'
+ )
+
+cflags += '-fno-prefetch-loop-arrays'
+
+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.14.1