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-by2nam03on0077.outbound.protection.outlook.com [104.47.42.77])
by dpdk.org (Postfix) with ESMTP id 91B111B323
for <dev@dpdk.org>; Fri, 19 Jan 2018 19:15:56 +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=Et/8hC5L4RaW9hu8eLQIid85z8ILDbPuK94WnUuTIkw=;
b=XDC5GLhxQkCd9s0BsYKdWsJPZigKeqAmCAyTEVBNs8g+kChDHLrSfV71dhd5616V/tsVzK9U4v632Fcx0a9wn9/mB+hYvPc+CH5bi+BbNYrhzuURmBTiQ78WW6VjerwVPM656tq6L+U9B3BO0RFeaiHgpwvyqjNmjuAlEA2oH2k=
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.428.17; Fri, 19 Jan 2018 18:15:52 +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 23:45:19 +0530
Message-Id: <20180119181521.21534-2-pbhagavatula@caviumnetworks.com>
X-Mailer: git-send-email 2.14.1
In-Reply-To: <20180119181521.21534-1-pbhagavatula@caviumnetworks.com>
References: <20171231000203.4510-1-pbhagavatula@caviumnetworks.com>
<20180119181521.21534-1-pbhagavatula@caviumnetworks.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [111.93.218.67]
X-ClientProxiedBy: SG2PR06CA0101.apcprd06.prod.outlook.com (10.170.138.27) To
CY4PR07MB3464.namprd07.prod.outlook.com (10.171.252.145)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 3f0806b6-6e50-4d22-e1f5-08d55f68ae51
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:2h260s8mTrklyLuptCDIbzFSSM4M5tI3usLcJuoreT/wx67ALynpIJAZvsvjF7Hx2LqpDWSwu5bAHsP3A+Qu61vDm9P2MUBKAEhNXigkEwhgHD3lu9unWl+wImtjCUz/Mrbb5cVU3IIJjwPo/fWDqdWJiIlNWJe8hFuVoA0PISHDNxvVlAJntIW/UxM8ZImYsw7t7Spmh+pl/uzS/GPPYWL2584Sfc7LxM5JfpgErCrzVrILLxrgCWd1THuLCMC+;
25:AMzCMOGP9cddBGopEe4GGvjHyvUa7DP8ZgG+2hSPvlu2l9nyf6P4Y6O6aWtSBW5xETPICEsGy3w4+pFdbPqovH0Fdipq78Tq97/jNDwVFeUob4irnyhRQlIYLDmbIEhzfGNL/17GZFPYR27BBbANZ3BP+PBTaql280CwF8o7uYWnPo8QjU2IJ9CcS073kVT3O1I9JrmtKjuIHBgXhRpk8B9IxbX6sF94xcFELcAXsNxrs8hkd1WiEU22CBGJYCxYzvSrgaJ6yPdR2Pu4S2ilZC3KdisccKlFgAUaG4B79WCl5Ke84f9a/x2DtcGMmWiPx2fbwA79CdmmL2Xu4+OJlQ==;
31:cLGR5IIglP2ildyyy7Z5WXCpCenVsV2mlBAmLSFeq/QiCGWJQrxMjnc6JInyn+Mv+nRht+3bcNRNxSrnR7MOMuCqqZOLuXzb1juzmiri1TTVO4otwPlUNjLDjMS1PkLH9Y5i2USfm84U8nb0ldZWTNOUMmn3IexcKaAiFp0yigVD6wcQS5uebbJQxp/kNImEe3bt8kSWCLFml1McgKsD8TYDykCzqq1/cPcVQNODBVw=
X-MS-TrafficTypeDiagnostic: CY4PR07MB3464:
X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464;
20:qzoNnWq8dvhOlpL5Q8BG8Z+e/lodIxu4z1EvCCeD85Y4NqWHDZ952x5yNiePDxkSE5uSZF6QVIq9veibgJpwsPx0ahH/2e9RXVTawrMTMWIDptU/hsl1y2q9UxRGjFhpMu3ftSYTPRXT+MXrGeYtamgidy3V5yyABrMPuvXcgmh7BhV8o4TYri6sZufine8Zw4UdXt8hG8poq0b9DGMe7NkjRD8AA37Bindolp/GKBjkPFekjXSuNWlLp/dpQAk6jX8Ag3v7DdtAb5HAl73tMKsEIxjauVGTxiTdYU4rwocOVJyDXShlvkbjZDKtNKFSTBCu8jVlOFbhltNxR+VwP9ortit/MXMFJ/iOXRbXIShvl9gPqUkWO3qP+8be9i+3tiPyZDxNDEkyDV8km4UbAgnk2yVOhsFEHA+GrT66RWP2Mh7T+PNATnRvaS6rV5MDdrk6FDpQlGTx5nVJBjf6DOuvCUpzKXu5vJtZNaqnPkRZIlWk0MI3yxBdI2Nj8DeINBhi6qkFrdz5E+csz444Q328IZDcvKvQdcDlpQX7t8SD6jCIBUITAi+bqOGm56whWIrGc7unJjgtOosnyA6suKSKTL5BUNRyjPiAw6HWJ30=;
4:aLTDmHwrNdGozxZ/TeIOSqktjWXfIDPouIfiz6x40KZA+PJQMnwy2OcRyFatOlEKmhP0MPaiD9vojA1qhAD/q7iZqDJvS/S0wbMsZ6UIDwtpBqw69GFD+wmhyTTshyJ3JD9xZeT/9wEcz5lGaO+zDF6tqh72pJp17Xow+JYeRlU4+w9ooLv/n+5LugatShuCHQhv7K1uZqKwQkd7cuUS/xne1J5kUb2S1931X8YMm/mVhUyuuVxxal7UcfIcQotvp3TRHazPwyLkXm3f77nBJw==
X-Microsoft-Antispam-PRVS: <CY4PR07MB3464C3C1B21EB5A011F5C9D880EF0@CY4PR07MB3464.namprd07.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:;
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(6040470)(2401047)(5005006)(8121501046)(10201501046)(3231023)(2400081)(944501161)(3002001)(93006095)(6041268)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011);
SRVR:CY4PR07MB3464; BCL:0; PCL:0; RULEID:(100000803101)(100110400095);
SRVR:CY4PR07MB3464;
X-Forefront-PRVS: 0557CBAD84
X-Forefront-Antispam-Report: SFV:NSPM;
SFS:(10009020)(6069001)(346002)(366004)(396003)(376002)(39860400002)(39380400002)(189003)(199004)(47776003)(478600001)(316002)(386003)(16526018)(6506007)(52116002)(6486002)(53936002)(51416003)(6666003)(6512007)(106356001)(105586002)(36756003)(16586007)(3846002)(7736002)(1076002)(6116002)(305945005)(5660300001)(76176011)(97736004)(48376002)(4326008)(25786009)(66066001)(2906002)(107886003)(5009440100003)(81166006)(8936002)(50226002)(50466002)(68736007)(42882006)(81156014)(8676002)(2950100002)(26005)(72206003)(42262002);
DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3464; H:localhost.localdomain; 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)
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3464;
23:Rd7ORO6Ae2fnOo9XG39zOW4TvNqoGrhEIk5Q1pVlg?=
=?us-ascii?Q?hJhulcus2diLOMgPqtgV1begG7QSC89ckkNi21JfQLGtLqmq5655aXkz2I+1?=
=?us-ascii?Q?n/1QOrxu+HJUpAcjsvLT1WFcOBB7nHUJizQVKQyP0XlkqHccuVG/5ZhVrNpL?=
=?us-ascii?Q?iFYxW8R9h5/VF3YP8NLEcVnLykegb19mwrB3HcKljPD1aHIYpmgRj1YzXRED?=
=?us-ascii?Q?lspLLHEg10ZGbXA7S+2QpcaKZANPB4J1ZDRuV+pUo077rmH22jejzjeERw5o?=
=?us-ascii?Q?DU4NDEjAr0TfGGswLUeOtntZ2DVhvUdnufiht2Eymm5QKrzOJpG5HR7lojyx?=
=?us-ascii?Q?POSrA9kCqAtfgBfH+ZhaoR8halTeRyE0glvXhnCz2zhl09xmKDs/Fo7QqZKp?=
=?us-ascii?Q?m4eGREinISTn1pLuKsrP2VwtKL3qPX/Jx//giXsys6ctQWDetzKuu2r1P5lA?=
=?us-ascii?Q?cvaWtRfY8RdN+k29jOTJZntQJdXUxpFaU4/eS6+L+gTMaps6Xquztdjsxyqt?=
=?us-ascii?Q?pDhTnkiA8pX3MolnLaCLOtJObuFyKlxqguDDBggn8pE/VdfmaZvK7ItrbXdT?=
=?us-ascii?Q?hguSCjOsWxC+pewwBOzlrmLqT57F9JfkSgIZ5FDQKJgxj7wdjEEX7ZsR9fZW?=
=?us-ascii?Q?NZGO8aJZIfNYUuZ3j7rVD+NBscL2/kUCuHGSHBki617V/F8FTLRUBIWw7dMV?=
=?us-ascii?Q?dhsFYFKmyPWpQp7SsoxGd785fd34Sl1pGjbXvPtufM4xU54GzeqtEIGBI5PG?=
=?us-ascii?Q?f0oNml/uhW4JI3cLObYZtKs6FVif7oWvBwm50FE51UGedeQ5nv4My2V/AS+2?=
=?us-ascii?Q?XK+UEazsSu2mGxL2s2a+NHDgK53Evkj4mJRT2EGMoav+U0gGfRN5ryL4jkll?=
=?us-ascii?Q?fKdbPXICwwQ6nC+jpHHERsu2ei9eU2LA4EZWI+kfWEoXri9pT+9Kfv5YitZQ?=
=?us-ascii?Q?zJDhTcGzQBV+2QOlB8s1ybRoc9ByXPQjWFKFZiQNmH/3o3ThPAt+eYr6gfKE?=
=?us-ascii?Q?4VMq2B+fUF9OneOkllu+hg77w+O67SR+LpFhQbw8eN2K6BChjR8vXUuqtca1?=
=?us-ascii?Q?jyoGgC6pECihwHkLDb/NRag1lc+v9RFogm+GPFlRZG6lPpv+Vrz8TI+4A9Gc?=
=?us-ascii?Q?PW8jiq4wQ79Pxcc/a04zVtUuEMa3jn9glyTt/3h0EU721qCKP7Rs6/zb2nmN?=
=?us-ascii?Q?Ok6LcYsu2/ehEVcBnUpWvRK1EUXvla5ZALg?=
X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464;
6:1Mk/4GoGZu2tzAWhjjhFWK6o0FsISH5G+vV9zFg92mnhx6GOvM5CTErDuZ7E2LviJ/njRKEtZlBnTv3Qq2anB4m0szL1J+uTRASuvRdWEVVGWTIRpXzojN2OGRb0du03RYRdpaxiT3BN48cKtcrIm4+glTW1e50S14vFaLoI2T6MVA8/60TSgDiBg+iDOd3Ty1/O6gg1W4voU/qfUgOjIx2aKBSlvN2fWuZz7OFIZMIaX90tX9o6ifFWLKCYzImM9U/+bqIcXPOa8fwB5RRiv5M1gaeB+10JWS5m9s91e/sWN24tb+L4IO7C8g/Nw4RqcLmXo2vid8m/mLJ99c9bOhPWKF94c3XImAZrav4GF90=;
5:D3mZBWan+D35GXKMt/4cF6rzSY/24BL3ihh4ElBxcBM6baes6XHQjKtb6+6sx+r8mboI24Mc4Vb3pI9hvO6NENk2Lztps27VJx+7xaU9MGqnuwz9+TntIjAUuxiQJxV/vik8J9of7hCZtOV/eV9lSmwMdrR613a+evsIDnKJSAk=;
24:9x5d/Z+PNl0uJuNwS6O1YjGEnnGk8HG/eK3A9LANzEQgARYPUSaYH9h2bQJCEI/RMLG8GkWiLgdHGlHbTesjvDzHCPAo6TMK6wuz/LAlfko=;
7:WzDDhQAjqccvHvCh05soG4KgxFq8PqJD5oJuVC1U+WGkpRr55I+8NzMDVMKvE7bZ7wEohMxoB9LqjlfUjeF0i6HsRgEo1uEkS0euowIMgLhDZxP+zbelHNsSUd360GkHz33HAsQi9KvrcKDEgzdfc984f8uVz1VvgYS8AqptBhkHKb6epHoKKR7YVFXEQS9fLqFAUIro7smq9WuK3MxYRuBkXBXnoLS+ECodSkatCM+lH5oO+akWxQjGrG/Treb8
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: caviumnetworks.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 18:15:52.9726 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 3f0806b6-6e50-4d22-e1f5-08d55f68ae51
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 v4 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 18:15:57 -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 | 15 +++++++++++++++
drivers/net/thunderx/meson.build | 20 ++++++++++++++++++++
...cvf_version.map => rte_pmd_thunderx_version.map} | 0
7 files changed, 72 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..09f657abb
--- /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..c9d5a8f4e
--- /dev/null
+++ b/drivers/net/thunderx/base/meson.build
@@ -0,0 +1,15 @@
+# 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..69819a97f
--- /dev/null
+++ b/drivers/net/thunderx/meson.build
@@ -0,0 +1,20 @@
+# 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'
+)
+
+if cc.has_argument('-fno-prefetch-loop-arrays')
+ cflags += '-fno-prefetch-loop-arrays'
+endif
+
+if cc.has_argument('-Wno-maybe-uninitialized')
+ cflags += '-Wno-maybe-uninitialized'
+endif
+
+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