From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0080.outbound.protection.outlook.com [104.47.34.80]) by dpdk.org (Postfix) with ESMTP id 07E641D7 for ; Sun, 31 Dec 2017 01:02:38 +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=0EfM9DyD8XBqT3JDS//e27AhneqfAXY8qesArrk6yuA=; b=Lox2LJ4CC40h+wmfnO+MFpIcUxNAZluMDD2ecJWVNLwN/TBBE88j6lcEeS11R5BUULPWwnDFC5kmGR3lrYJ7RqzdzS85Dcrs3Ojqpn67sbLOI9xQVtzsduVSZa9lBII6ZPx//sbdbff1d3Qy+8xtaFu9EGS7WWW41FpV26iGM28= Received: from localhost.localdomain (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.366.8; Sun, 31 Dec 2017 00:02:35 +0000 From: Pavan Nikhilesh To: bruce.richardson@intel.com, bluca@debian.org, harry.van.haaren@intel.com, jerin.jacob@caviumnetworks.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Sun, 31 Dec 2017 05:32:01 +0530 Message-Id: <20171231000203.4510-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171231000203.4510-1-pbhagavatula@caviumnetworks.com> References: <20171231000203.4510-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: SG2PR0601CA0017.apcprd06.prod.outlook.com (10.170.128.27) To CY4PR07MB3463.namprd07.prod.outlook.com (10.171.252.144) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44275dec-e5ae-47b1-58b0-08d54fe1cd6c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060); SRVR:CY4PR07MB3463; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 3:cqquPJUQwiwx3bQMzXQFfw0exyHUZWJ7473CzhQTho8UYdJDN31t4mVjFQ+bN03NJl/r4kvZFCulcFbjZNeWwZNUs2pAUy6dzMEpFyrK2/P4wqMDybNjfcmfJ1ff2vGSHWcQZnvVO0fksoqj3gvQ7XjtqIA0KepkvI1sMWQi1TXAfNcQJlOyIofWF7zwOYNArPO2vZIDyCuIGgAitG4gvSHV/DAuE6Zc81IPDXvR0rfQ3jlmKK8arXqKi5+CaWYx; 25:eiqKeevhq0nug+SZrAaKra23DKcTgFhtwELxgX+82ROxtsQMtpO/JrtXKttyNIZwyog/NkBBsutnTKxll2e583x+gmt/kVN03sXQVL1c7Jd06OCNOTRlYwKA6gV3GRkzVobSk2FK/LJblRdtr3lGsgx9djzVZakGioq+QV0FvH6SFRBmgXiIddVDesvdEA3yiK0x5fOmHhCWkjU3CLLxdpBUyUOPYP4AXzyCy2Q7kG2RXmU50AFNFesJKJSoJt1WJ9nOnkv3dqguF/yLLBhYXz+Ezft9xGYpVicKZYZL/roFlnBdrt/9Ka8czf1iTH7HFB+soa5dbbsCq5X+JjsoZlfUtdoAZoxPgbzoxDWEo2Q=; 31:VeLlbCkXY3mvXILqDfC1Gl6v/JtEhBRY7vtaorxtAorz5udesGdpSZiSHlY5e9UWNlyZFlms1H0JI+FGdmcv6B46/kDAHPdY2cJyjBubGCvzqGmnXnn3IzuxpyYB52KrP7PPByXx3i5mxAXrl9OahPV5IJAjM65E5IXWkz95xpN1AJqTaiVa7r1DMxa8i8HHLMoHdU4FBKGm8h5O6j5BSvWY6fSUQabcsvjNyXI3GKM= X-MS-TrafficTypeDiagnostic: CY4PR07MB3463: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 20:PSnzjQGKUVbe/DAt7c04mFoWmXbIepzw1X0RglCoTI+GvltSuhbFwSJhPzmrQgxRgQXCCpha4DtJKqiLnbcY/TWlQ/GyOqE+XIAZh0uEnDLtFJJamEYWqMrMaPFPkkKFoYAZeeTlIGf+Wum/L+tz2hUTuBlrx9ePO9rcwy5VRt4QB98sfFmLaP0G2xlcY6E04tix3w8u3byU2RYXdsJkHd9ORcgpe+n+0ruseo6qabPLps+MMPyE3zyqdrRRzkxLc2U/k5eg1hpOy/Ky+syCP6gs+rpJdsspZoJ7iAc0Wg3v3GQnJyZafTonr0807KaIBOhkueEeg4d1AG3eOW8QwO3V1NnZpgi1wlWWsTvRi38RkOjTHifZgfxKoTncSRV3FUPfkYQvAXY91bgYexoqbBfg9SprEI179arc0phTP8GFxm/uk2HdPIGDEiKiIDqqsj8pPK2qfEVNMgrR1sa2AQKrrWqfmTL6xVBN7BfgMLHwW0k1Kb0s0iPrkfeoKtQMr+vCxOfUm555fVt+wcvaDne/jxtLV7y+XwCo24wIwLSrt3zzvTMVxeclYLOrvs15RPgg0sDDPUK7BAtDVULXKaVVT8OLd1utnaqqMzA6FEc=; 4:jsWhn6cvDyB7BqjZr6QVoem1lTCnK5PgdCNYSJo4qlNEVxKRzpuYS1fgHk3OMzCWPZnAXpDEo6HiDH9tX9hdDobow3zExd3l6JxVIeb0K9NQncR1dPkniJlYppL9+5cjddqbZ5vqTpv8e81IbkFiEj2XN+LlaMmY0wfejmXwsXFIXcjtJXLar2mQRvTxv3kGKCKH7aR7swj1gGrNw/gYSHm+Y6gdyKZQJOGDKJDCJbN5MgiOHAaRziAj+Ut3+dDA5+WrmtOXeexSsJCt9Y+s3w== 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)(3231023)(944501075)(93006095)(10201501046)(3002001)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:CY4PR07MB3463; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY4PR07MB3463; X-Forefront-PRVS: 0538A71254 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(6069001)(396003)(366004)(39850400004)(376002)(346002)(39380400002)(199004)(189003)(50226002)(6506007)(42882006)(81166006)(2906002)(386003)(16526018)(68736007)(72206003)(81156014)(6512007)(4326008)(6666003)(5660300001)(8676002)(6116002)(2950100002)(8936002)(36756003)(53936002)(16586007)(3846002)(316002)(6486002)(1076002)(478600001)(50466002)(76176011)(6636002)(106356001)(51416003)(47776003)(48376002)(5009440100003)(66066001)(52116002)(97736004)(7736002)(107886003)(305945005)(105586002)(25786009)(42262002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3463; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3463; 23:rFEd0HDBvy78pTOkkMY3jh2J/WKvo57LMEnxRwq6F?= =?us-ascii?Q?q+Wsg1ECCTCCP6zlagYMvxwnTsVu71FEUXU9u56+aTGlbsdmK9AN+8wHPE3p?= =?us-ascii?Q?j7886rJFTQXq8A2RObwCmQIoNPEMFitU7dt4105E6gaRlb3ykYGndsd1rj6i?= =?us-ascii?Q?8m3zH0fcVdQMX4fUzajVCKw4v7KsSsnr9o9ruqNbpqqgcZA0+JYO6TLeri/l?= =?us-ascii?Q?D+YTCZ1QdGjy4ExG3JOKyDUGdljOS5n7oiP3SNlC8hqWZxoUtAKXYFBec8h8?= =?us-ascii?Q?0CbZZIit6Ghegu69CaLcgaHjEZ6K/+e+0ml4I7FS7/dAJk/brxXbaMIihuvs?= =?us-ascii?Q?tn5Vgvd1uq8I2MSwNiYHQ1NOv+3hmTaPMxgoQJ2VzTzsvs9XNXALOOIE/RXQ?= =?us-ascii?Q?jRts5c+1v0GcVQc3aCKdo/4dnXOppxOpE2j/C9fRDrLNmntLz0oQv55QllQw?= =?us-ascii?Q?e/dLhAqmPphr8RRwiQ0+V+N0qDyQNToShea1YCfx+fyeMrQTStcYaZNn0aAH?= =?us-ascii?Q?6zOus6frELZSyGtC9E2jqMxOksLn51qfwQvXWbuRm1ppaYV4XysTci572Rnd?= =?us-ascii?Q?O2mU1DIQ2nxRmjUW+ncHuyl03s1COax5Kk+bba8g9RQ07SwKoKo8WSYwTlKm?= =?us-ascii?Q?lFGNlSDk870hz7SgxFTdO/nRDTxhteqwn7KVwuFFGSe90Rc0hAqEkh2QxWju?= =?us-ascii?Q?KvlOL6+uwRcDNy/kwog3uMs6WtZEgCM4stD8VCyyyNZTqr1fy7o7dzJpc/Ta?= =?us-ascii?Q?zrni2pXrIrr2HdnkyhxyQP8mSfg2MepRjI/Ah66omnEFeljlEmlXKX0kbDDG?= =?us-ascii?Q?lUbWwJWLxaj6yMs6N+cGHkWCbA/lnoFHR0v08x7w7mrEmtkxNexAiX9pVYY5?= =?us-ascii?Q?D0tVQKwQ/5izVKF+oZyAbK8PNRlW8I3tAq1cPGNimfakfNvc1MOuR1gdORP0?= =?us-ascii?Q?52oxmdz8e6nKWwnUTdffMDR8Hj+AAmyFQDNatWcu54bOWvcF5w0o0A0FNDQ2?= =?us-ascii?Q?DJIiqOU/gfRCdq96Jca8Ddf897rvNtHu9QJJ89qWeHJTnkVLPf4pk3v/ogEA?= =?us-ascii?Q?Vwt+vuT41sOeWR9Qsuw+0mPcbs0KToYUqSvJlCjpUlgEVob+JsAnUoMMAD+X?= =?us-ascii?Q?NUYbMLXLjslynDoGJCN64titr4mleNsPVvdwzr5WYEaGTinSEiSSPw8cBBJp?= =?us-ascii?Q?rVT1wE4vhBZ3ZO7VAoWftwIAs0BT/r4Jqiz73kjt8x/wc1GGQmuQHrw++dMC?= =?us-ascii?Q?Qy5J0t/HSZl0Opii0zPE4mBYwWh1e2SCeV4O+rSBzKsZNPOhoYbdWPm7/7n6?= =?us-ascii?B?Zz09?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 6:D4JJcoLlrK0P/fUhsZ0LCOb3gIBdKoGxnebCAQt1/LdxYJrbiYtMCymsjQlsmr2hoQq791wVitqcG1sy4p2nziYfV+3l+h8aG0THUegMgM6qJe+7qM2jx7h4pnQ4oFTrBtrUetFqgw6yJq0DZLyUj9nUWqLeuBWpE4qyAetX5RnTaY8cifgnZATYJ7PRYf0kHH1Dmonjbby5wEyE3u4rCtYIJ8dnXSENIYVfTNN+l4W9dKPrtYKQ1YMFO2EBqag21BZsPwb123/5V7QuZuWdhz1N3eXMIkm1AXVNs8fH88V6VXYjxYMHQ8kj5nDn+WDVCjdE76DylnmHsTkkY2Yzg60tw0vgZETTlx2/3ZIOxhM=; 5:unhEiZnbMQxTxjoKwFIvB+q/CYrptPz8Uczm52uIxjgJ4weDCHDe3wWHDp0a8p7fCYmQrM9QMvlPUCj9/4Xlk/rU43OGuryeqGT8F/ekMlI3iS5Rz6dgiWJhrrj6mFj+dJJp+mQW8GqHSnG8cvR6blEn5Eb9kVEh71IRKnNughw=; 24:AD9IyfgrjUrcR3OaZuIw2aVrof6qwxqR1WYDwXAc6k75U4vwKkU35Yk5a8wUi2oH8bXsCPlwqOvZHp4QYInNyTSu2u3kUvn3Xsvuwz3BhIU=; 7:EWAKZIBX/AQMlINIAR+xv/wQz2w2P6eLirAQkKrl6ycjr/Ll9D4JOxEv3nWcmTTmqyZD46pDE9O9vUUcf41TCp7EkYgaxTAEdc2fPmHYJSU7qbVRg1vHVaPiYEdKJVW4zd+USkDJJAC/w4JI+irV7H8KatY6POl3bj+/GjFt0cnK54nIUfBvI/ZKLKfbUZoKJKkGWV2DNBW/o0iOxzGfGg+if+0MWIWjerwj1PyqMhyAXwcJkzCo1feiofR721a0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2017 00:02:35.4833 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44275dec-e5ae-47b1-58b0-08d54fe1cd6c 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 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, 31 Dec 2017 00:02:39 -0000 Add Cavium octeontx and thunder nicvf to meson build infrastructure. Signed-off-by: Pavan Nikhilesh --- drivers/net/meson.build | 3 ++- drivers/net/octeontx/base/meson.build | 12 ++++++++++++ drivers/net/octeontx/meson.build | 10 ++++++++++ drivers/net/thunderx/Makefile | 2 +- drivers/net/thunderx/base/meson.build | 17 +++++++++++++++++ drivers/net/thunderx/meson.build | 9 +++++++++ ...x_nicvf_version.map => rte_pmd_thunderx_version.map} | 0 7 files changed, 51 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..637483d68 --- /dev/null +++ b/drivers/net/octeontx/base/meson.build @@ -0,0 +1,12 @@ +sources = [ + 'octeontx_bgx.c', + 'octeontx_pkivf.c', + 'octeontx_pkovf.c' +] + +base_lib = static_library('octeontx_base', sources, + c_args: cflags, + dependencies: static_rte_bus_pci, + include_directories: mempool_octeontx_dir) + +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..f263a4b51 --- /dev/null +++ b/drivers/net/octeontx/meson.build @@ -0,0 +1,10 @@ +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..867a6d661 --- /dev/null +++ b/drivers/net/thunderx/base/meson.build @@ -0,0 +1,17 @@ +sources = [ + 'nicvf_bsvf.c', + 'nicvf_hw.c', + 'nicvf_mbox.c' +] + +depends = ['ethdev'] +static_obj = [] +foreach d: depends + static_obj += [get_variable('static_rte_' + d)] +endforeach + +base_lib = static_library('nicvf_base', sources, + c_args: cflags, + dependencies: static_obj) + +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..17852f732 --- /dev/null +++ b/drivers/net/thunderx/meson.build @@ -0,0 +1,9 @@ +subdir('base') +objs = [base_objs] + +sources = files('nicvf_ethdev.c', + 'nicvf_svf.c', + 'nicvf_rxtx.c') +cflags += '-Ofast' + +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