From patchwork Fri Jun 8 21:20:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40941 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 E7E1E1D045; Fri, 8 Jun 2018 23:21:01 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 253341D03B for ; Fri, 8 Jun 2018 23:20:59 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:20:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610691" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:20:58 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Shepard Siegel , Ed Czeck , John Miller Date: Fri, 8 Jun 2018 22:20:34 +0100 Message-Id: <20180608212048.67261-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 01/15] net/ark: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Shepard Siegel CC: Ed Czeck CC: John Miller Signed-off-by: Bruce Richardson --- drivers/net/ark/meson.build | 13 +++++++++++++ drivers/net/meson.build | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ark/meson.build diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build new file mode 100644 index 000000000..99151bba1 --- /dev/null +++ b/drivers/net/ark/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('ark_ddm.c', + 'ark_ethdev.c', + 'ark_ethdev_rx.c', + 'ark_ethdev_tx.c', + 'ark_mpu.c', + 'ark_pktchkr.c', + 'ark_pktdir.c', + 'ark_pktgen.c', + 'ark_rqp.c', + 'ark_udm.c') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index b7d00a04c..d0ae7c34b 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -1,7 +1,8 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2', +drivers = ['ark', + 'af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2', 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] From patchwork Fri Jun 8 21:20:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40942 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 2E8A91D049; Fri, 8 Jun 2018 23:21:04 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id A03191D040 for ; Fri, 8 Jun 2018 23:21:01 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610700" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:00 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Fri, 8 Jun 2018 22:20:35 +0100 Message-Id: <20180608212048.67261-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 02/15] net/avp: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Bruce Richardson Acked-by: Allain Legacy --- drivers/net/avp/meson.build | 5 +++++ drivers/net/meson.build | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 drivers/net/avp/meson.build diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build new file mode 100644 index 000000000..6076c31b9 --- /dev/null +++ b/drivers/net/avp/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('avp_ethdev.c') +install_headers('rte_avp_common.h', 'rte_avp_fifo.h') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index d0ae7c34b..76bf48f3e 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -1,8 +1,8 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['ark', - 'af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2', +drivers = ['af_packet', 'ark', 'avp', + 'axgbe', 'bonding', 'dpaa', 'dpaa2', 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] From patchwork Fri Jun 8 21:20:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40943 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 101E91D053; Fri, 8 Jun 2018 23:21:06 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 879991D042 for ; Fri, 8 Jun 2018 23:21:03 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610716" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:02 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Harish Patil , Rasesh Mody Date: Fri, 8 Jun 2018 22:20:36 +0100 Message-Id: <20180608212048.67261-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 03/15] net/bnx2x: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Harish Patil CC: Rasesh Mody Signed-off-by: Bruce Richardson --- drivers/net/bnx2x/meson.build | 14 ++++++++++++++ drivers/net/meson.build | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 drivers/net/bnx2x/meson.build diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build new file mode 100644 index 000000000..e3c688869 --- /dev/null +++ b/drivers/net/bnx2x/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +dep = cc.find_library('z', required: false) +build = dep.found() +ext_deps += dep +cflags += '-DZLIB_CONST' +sources = files('bnx2x.c', + 'bnx2x_ethdev.c', + 'bnx2x_rxtx.c', + 'bnx2x_stats.c', + 'bnx2x_vfpf.c', + 'ecore_sp.c', + 'elink.c') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 76bf48f3e..143355458 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -2,7 +2,8 @@ # Copyright(c) 2017 Intel Corporation drivers = ['af_packet', 'ark', 'avp', - 'axgbe', 'bonding', 'dpaa', 'dpaa2', + 'axgbe', 'bonding', 'bnx2x', + 'dpaa', 'dpaa2', 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] From patchwork Fri Jun 8 21:20:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40944 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 C31BC1D05B; Fri, 8 Jun 2018 23:21:07 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 737F41D04D for ; Fri, 8 Jun 2018 23:21:05 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610728" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:04 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Ajit Khaparde , Somnath Kotur Date: Fri, 8 Jun 2018 22:20:37 +0100 Message-Id: <20180608212048.67261-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 04/15] net/bnxt: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Ajit Khaparde CC: Somnath Kotur Signed-off-by: Bruce Richardson --- app/test-pmd/meson.build | 3 +++ drivers/net/bnxt/meson.build | 18 ++++++++++++++++++ drivers/net/meson.build | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 drivers/net/bnxt/meson.build diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index a51514b03..4c9fbbfda 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -25,6 +25,9 @@ deps = ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci'] if dpdk_conf.has('RTE_LIBRTE_PDUMP') deps += 'pdump' endif +if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD') + deps += 'pmd_bnxt' +endif if dpdk_conf.has('RTE_LIBRTE_I40E_PMD') deps += 'pmd_i40e' endif diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build new file mode 100644 index 000000000..486bf0fd3 --- /dev/null +++ b/drivers/net/bnxt/meson.build @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +install_headers('rte_pmd_bnxt.h') +version = 2 +sources = files('bnxt_cpr.c', + 'bnxt_ethdev.c', + 'bnxt_filter.c', + 'bnxt_hwrm.c', + 'bnxt_irq.c', + 'bnxt_ring.c', + 'bnxt_rxq.c', + 'bnxt_rxr.c', + 'bnxt_stats.c', + 'bnxt_txq.c', + 'bnxt_txr.c', + 'bnxt_vnic.c', + 'rte_pmd_bnxt.c') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 143355458..d012c62fe 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -3,7 +3,7 @@ drivers = ['af_packet', 'ark', 'avp', 'axgbe', 'bonding', 'bnx2x', - 'dpaa', 'dpaa2', + 'bnxt', 'dpaa', 'dpaa2', 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] From patchwork Fri Jun 8 21:20:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40945 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 603651D062; Fri, 8 Jun 2018 23:21:09 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 65D651D055 for ; Fri, 8 Jun 2018 23:21:07 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610738" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:06 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Rahul Lakkireddy Date: Fri, 8 Jun 2018 22:20:38 +0100 Message-Id: <20180608212048.67261-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 05/15] net/cxgbe: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Rahul Lakkireddy Signed-off-by: Bruce Richardson --- drivers/net/cxgbe/meson.build | 11 +++++++++++ drivers/net/meson.build | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 drivers/net/cxgbe/meson.build diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build new file mode 100644 index 000000000..8196e8afb --- /dev/null +++ b/drivers/net/cxgbe/meson.build @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('cxgbe_ethdev.c', + 'cxgbe_main.c', + 'cxgbevf_ethdev.c', + 'cxgbevf_main.c', + 'sge.c', + 'base/t4_hw.c', + 'base/t4vf_hw.c') +includes += include_directories('base') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index d012c62fe..c55ca65a5 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -3,7 +3,7 @@ drivers = ['af_packet', 'ark', 'avp', 'axgbe', 'bonding', 'bnx2x', - 'bnxt', 'dpaa', 'dpaa2', + 'bnxt', 'cxgbe', 'dpaa', 'dpaa2', 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] From patchwork Fri Jun 8 21:20:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40946 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 5AC621D067; Fri, 8 Jun 2018 23:21:12 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 7C6941D064 for ; Fri, 8 Jun 2018 23:21:09 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610749" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:07 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Marcin Wojtas , Michal Krawczyk , Guy Tzalik , Evgeny Schemeilin Date: Fri, 8 Jun 2018 22:20:39 +0100 Message-Id: <20180608212048.67261-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 06/15] net/ena: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Marcin Wojtas CC: Michal Krawczyk CC: Guy Tzalik CC: Evgeny Schemeilin Signed-off-by: Bruce Richardson --- drivers/net/ena/meson.build | 8 ++++++++ drivers/net/meson.build | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ena/meson.build diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build new file mode 100644 index 000000000..542f29567 --- /dev/null +++ b/drivers/net/ena/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +allow_experimental_apis = true +sources = files('ena_ethdev.c', + 'base/ena_com.c', + 'base/ena_eth_com.c') +includes += include_directories('base', 'base/ena_defs') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index c55ca65a5..d4c7d58ab 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -4,7 +4,8 @@ drivers = ['af_packet', 'ark', 'avp', 'axgbe', 'bonding', 'bnx2x', 'bnxt', 'cxgbe', 'dpaa', 'dpaa2', - 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', + 'e1000', 'ena', 'enic', + 'fm10k', 'i40e', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc From patchwork Fri Jun 8 21:20:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40947 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 405AE1D06E; Fri, 8 Jun 2018 23:21:14 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 7DD4A1D055 for ; Fri, 8 Jun 2018 23:21:11 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610755" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:10 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Gaetan Rivet Date: Fri, 8 Jun 2018 22:20:40 +0100 Message-Id: <20180608212048.67261-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 07/15] net/failsafe: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Gaetan Rivet Signed-off-by: Bruce Richardson --- drivers/net/failsafe/meson.build | 23 +++++++++++++++++++++++ drivers/net/meson.build | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 drivers/net/failsafe/meson.build diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build new file mode 100644 index 000000000..a249ff4af --- /dev/null +++ b/drivers/net/failsafe/meson.build @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +cflags += '-std=gnu99' +cflags += '-D_DEFAULT_SOURCE' +cflags += '-D_XOPEN_SOURCE=700' +cflags += '-pedantic' +if host_machine.system() == 'linux' + cflags += '-DLINUX' +else + cflags += '-DBSD' +endif + +allow_experimental_apis = true + +sources = files('failsafe_args.c', + 'failsafe.c', + 'failsafe_eal.c', + 'failsafe_ether.c', + 'failsafe_flow.c', + 'failsafe_intr.c', + 'failsafe_ops.c', + 'failsafe_rxtx.c') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index d4c7d58ab..decb1519a 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -4,7 +4,7 @@ drivers = ['af_packet', 'ark', 'avp', 'axgbe', 'bonding', 'bnx2x', 'bnxt', 'cxgbe', 'dpaa', 'dpaa2', - 'e1000', 'ena', 'enic', + 'e1000', 'ena', 'enic', 'failsafe', 'fm10k', 'i40e', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] From patchwork Fri Jun 8 21:20:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40948 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 12E8F1D051; Fri, 8 Jun 2018 23:21:16 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 464C91D063 for ; Fri, 8 Jun 2018 23:21:13 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610762" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:12 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Xiao Wang Date: Fri, 8 Jun 2018 22:20:41 +0100 Message-Id: <20180608212048.67261-9-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 08/15] net/ifc: rename to ifcvf 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" All files in the directory and the resulting driver have prefix of ifcvf, not just ifc, so rename directory for accuracy. Also rename the map file to standard name for meson build in the process. CC: Xiao Wang Signed-off-by: Bruce Richardson --- MAINTAINERS | 4 ++-- drivers/net/Makefile | 2 +- drivers/net/{ifc => ifcvf}/Makefile | 2 +- drivers/net/{ifc => ifcvf}/base/ifcvf.c | 0 drivers/net/{ifc => ifcvf}/base/ifcvf.h | 0 drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h | 0 drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c | 0 .../rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename drivers/net/{ifc => ifcvf}/Makefile (94%) rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%) rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%) rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%) rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%) rename drivers/net/{ifc/rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 4667fa7fb..4f6055590 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -559,10 +559,10 @@ T: git://dpdk.org/next/dpdk-next-net-intel F: drivers/net/avf/ F: doc/guides/nics/features/avf*.ini -Intel ifc +Intel ifcvf M: Xiao Wang T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/ifc/ +F: drivers/net/ifcvf/ F: doc/guides/nics/ifcvf.rst F: doc/guides/nics/features/ifcvf.ini diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 9f9da6651..9308f9a7b 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -59,7 +59,7 @@ endif # $(CONFIG_RTE_LIBRTE_SCHED) ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifc +DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf endif endif # $(CONFIG_RTE_LIBRTE_VHOST) diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifcvf/Makefile similarity index 94% rename from drivers/net/ifc/Makefile rename to drivers/net/ifcvf/Makefile index 1011995bc..a022faaad 100644 --- a/drivers/net/ifc/Makefile +++ b/drivers/net/ifcvf/Makefile @@ -22,7 +22,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*. VPATH += $(SRCDIR)/base -EXPORT_MAP := rte_ifcvf_version.map +EXPORT_MAP := rte_pmd_ifcvf_version.map LIBABIVER := 1 diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifcvf/base/ifcvf.c similarity index 100% rename from drivers/net/ifc/base/ifcvf.c rename to drivers/net/ifcvf/base/ifcvf.c diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifcvf/base/ifcvf.h similarity index 100% rename from drivers/net/ifc/base/ifcvf.h rename to drivers/net/ifcvf/base/ifcvf.h diff --git a/drivers/net/ifc/base/ifcvf_osdep.h b/drivers/net/ifcvf/base/ifcvf_osdep.h similarity index 100% rename from drivers/net/ifc/base/ifcvf_osdep.h rename to drivers/net/ifcvf/base/ifcvf_osdep.h diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifcvf/ifcvf_vdpa.c similarity index 100% rename from drivers/net/ifc/ifcvf_vdpa.c rename to drivers/net/ifcvf/ifcvf_vdpa.c diff --git a/drivers/net/ifc/rte_ifcvf_version.map b/drivers/net/ifcvf/rte_pmd_ifcvf_version.map similarity index 100% rename from drivers/net/ifc/rte_ifcvf_version.map rename to drivers/net/ifcvf/rte_pmd_ifcvf_version.map From patchwork Fri Jun 8 21:20:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40949 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 23B1A1D082; Fri, 8 Jun 2018 23:21:18 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 31B791D074 for ; Fri, 8 Jun 2018 23:21:15 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610767" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:13 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Xiao Wang Date: Fri, 8 Jun 2018 22:20:42 +0100 Message-Id: <20180608212048.67261-10-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 09/15] net/ifcvf: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Xiao Wang Signed-off-by: Bruce Richardson --- drivers/net/ifcvf/meson.build | 7 +++++++ drivers/net/meson.build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ifcvf/meson.build diff --git a/drivers/net/ifcvf/meson.build b/drivers/net/ifcvf/meson.build new file mode 100644 index 000000000..a30aa09e6 --- /dev/null +++ b/drivers/net/ifcvf/meson.build @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +allow_experimental_apis = true +sources = files('ifcvf_vdpa.c', 'base/ifcvf.c') +includes += include_directories('base') +deps += 'vhost' diff --git a/drivers/net/meson.build b/drivers/net/meson.build index decb1519a..c983f90b1 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -5,7 +5,7 @@ drivers = ['af_packet', 'ark', 'avp', 'axgbe', 'bonding', 'bnx2x', 'bnxt', 'cxgbe', 'dpaa', 'dpaa2', 'e1000', 'ena', 'enic', 'failsafe', - 'fm10k', 'i40e', 'ixgbe', + 'fm10k', 'i40e', 'ifcvf', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc From patchwork Fri Jun 8 21:20:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40950 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 BCF201D087; Fri, 8 Jun 2018 23:21:19 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 085061D079 for ; Fri, 8 Jun 2018 23:21:16 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610774" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:15 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Ferruh Yigit Date: Fri, 8 Jun 2018 22:20:43 +0100 Message-Id: <20180608212048.67261-11-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 10/15] net/kni: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since the kni library is an optional library, we need to add a check here to ensure that the kni wrapper PMD is only built when the main kni lib is being built. CC: Ferruh Yigit Signed-off-by: Bruce Richardson --- drivers/net/kni/meson.build | 8 ++++++++ drivers/net/meson.build | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 drivers/net/kni/meson.build diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build new file mode 100644 index 000000000..77468188b --- /dev/null +++ b/drivers/net/kni/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +# this driver can be built if-and-only-if KNI library is buildable +build = dpdk_conf.has('LIB_LIBRTE_KNI') +allow_experimental_apis = true +sources = files('rte_eth_kni.c') +deps += 'kni' diff --git a/drivers/net/meson.build b/drivers/net/meson.build index c983f90b1..213fe734c 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -6,7 +6,8 @@ drivers = ['af_packet', 'ark', 'avp', 'bnxt', 'cxgbe', 'dpaa', 'dpaa2', 'e1000', 'ena', 'enic', 'failsafe', 'fm10k', 'i40e', 'ifcvf', 'ixgbe', - 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', + 'kni', 'mvpp2', 'null', + 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] 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 From patchwork Fri Jun 8 21:20:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40951 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 323E81D090; Fri, 8 Jun 2018 23:21:21 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 896241D059 for ; Fri, 8 Jun 2018 23:21:18 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610782" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:17 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Fri, 8 Jun 2018 22:20:44 +0100 Message-Id: <20180608212048.67261-12-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 11/15] net/liquidio: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Bruce Richardson Acked-by: Shijith Thotton --- drivers/net/liquidio/Makefile | 2 +- drivers/net/liquidio/meson.build | 8 ++++++++ ...e_pmd_lio_version.map => rte_pmd_liquidio_version.map} | 0 drivers/net/meson.build | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 drivers/net/liquidio/meson.build rename drivers/net/liquidio/{rte_pmd_lio_version.map => rte_pmd_liquidio_version.map} (100%) diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile index fc5f18ad6..f1092851a 100644 --- a/drivers/net/liquidio/Makefile +++ b/drivers/net/liquidio/Makefile @@ -15,7 +15,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_lio_version.map +EXPORT_MAP := rte_pmd_liquidio_version.map LIBABIVER := 1 diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build new file mode 100644 index 000000000..9ae48e213 --- /dev/null +++ b/drivers/net/liquidio/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('base/lio_23xx_vf.c', + 'base/lio_mbox.c', + 'lio_ethdev.c', + 'lio_rxtx.c') +includes += include_directories('base') diff --git a/drivers/net/liquidio/rte_pmd_lio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map similarity index 100% rename from drivers/net/liquidio/rte_pmd_lio_version.map rename to drivers/net/liquidio/rte_pmd_liquidio_version.map diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 213fe734c..9faed7d61 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -6,7 +6,7 @@ drivers = ['af_packet', 'ark', 'avp', 'bnxt', 'cxgbe', 'dpaa', 'dpaa2', 'e1000', 'ena', 'enic', 'failsafe', 'fm10k', 'i40e', 'ifcvf', 'ixgbe', - 'kni', 'mvpp2', 'null', + 'kni', 'liquidio', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc From patchwork Fri Jun 8 21:20:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40952 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 E39B51D094; Fri, 8 Jun 2018 23:21:22 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 980E11D08A for ; Fri, 8 Jun 2018 23:21:20 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610788" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:19 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Alejandro Lucero Date: Fri, 8 Jun 2018 22:20:45 +0100 Message-Id: <20180608212048.67261-13-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 12/15] net/nfp: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Alejandro Lucero Signed-off-by: Bruce Richardson --- drivers/net/meson.build | 2 +- drivers/net/nfp/meson.build | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 drivers/net/nfp/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 9faed7d61..9714491d1 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -6,7 +6,7 @@ drivers = ['af_packet', 'ark', 'avp', 'bnxt', 'cxgbe', 'dpaa', 'dpaa2', 'e1000', 'ena', 'enic', 'failsafe', 'fm10k', 'i40e', 'ifcvf', 'ixgbe', - 'kni', 'liquidio', 'mvpp2', 'null', + 'kni', 'liquidio', 'mvpp2', 'nfp', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build new file mode 100644 index 000000000..3ba37e279 --- /dev/null +++ b/drivers/net/nfp/meson.build @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('nfpcore/nfp_cpp_pcie_ops.c', + 'nfpcore/nfp_nsp.c', + 'nfpcore/nfp_cppcore.c', + 'nfpcore/nfp_resource.c', + 'nfpcore/nfp_mip.c', + 'nfpcore/nfp_nffw.c', + 'nfpcore/nfp_rtsym.c', + 'nfpcore/nfp_nsp_cmds.c', + 'nfpcore/nfp_crc.c', + 'nfpcore/nfp_mutex.c', + 'nfpcore/nfp_nsp_eth.c', + 'nfpcore/nfp_hwinfo.c', + 'nfp_net.c') From patchwork Fri Jun 8 21:20:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40953 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 4A2F21D09C; Fri, 8 Jun 2018 23:21:24 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id D84511D069 for ; Fri, 8 Jun 2018 23:21:21 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610801" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:20 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Jasvinder Singh , Cristian Dumitrescu Date: Fri, 8 Jun 2018 22:20:46 +0100 Message-Id: <20180608212048.67261-14-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 13/15] net/softnic: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Jasvinder Singh CC: Cristian Dumitrescu Signed-off-by: Bruce Richardson --- drivers/net/meson.build | 3 ++- drivers/net/softnic/Makefile | 2 +- drivers/net/softnic/meson.build | 7 +++++++ ...eth_softnic_version.map => rte_pmd_softnic_version.map} | 0 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 drivers/net/softnic/meson.build rename drivers/net/softnic/{rte_pmd_eth_softnic_version.map => rte_pmd_softnic_version.map} (100%) diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 9714491d1..9cec3f884 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -8,7 +8,8 @@ drivers = ['af_packet', 'ark', 'avp', 'fm10k', 'i40e', 'ifcvf', 'ixgbe', 'kni', 'liquidio', 'mvpp2', 'nfp', 'null', 'octeontx', 'pcap', 'ring', - 'sfc', 'thunderx', 'virtio'] + 'sfc', 'softnic', + 'thunderx', 'virtio'] 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/softnic/Makefile b/drivers/net/softnic/Makefile index d56fecd62..97ac88411 100644 --- a/drivers/net/softnic/Makefile +++ b/drivers/net/softnic/Makefile @@ -14,7 +14,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched LDLIBS += -lrte_bus_vdev -EXPORT_MAP := rte_pmd_eth_softnic_version.map +EXPORT_MAP := rte_pmd_softnic_version.map LIBABIVER := 1 diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build new file mode 100644 index 000000000..41059da8b --- /dev/null +++ b/drivers/net/softnic/meson.build @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +install_headers('rte_eth_softnic.h') +sources = files('rte_eth_softnic_tm.c', + 'rte_eth_softnic.c') +deps += 'sched' diff --git a/drivers/net/softnic/rte_pmd_eth_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map similarity index 100% rename from drivers/net/softnic/rte_pmd_eth_softnic_version.map rename to drivers/net/softnic/rte_pmd_softnic_version.map From patchwork Fri Jun 8 21:20:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40954 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 93AFC1D0A6; Fri, 8 Jun 2018 23:21:25 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 86D531D097 for ; Fri, 8 Jun 2018 23:21:23 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610810" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:22 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Matej Vido Date: Fri, 8 Jun 2018 22:20:47 +0100 Message-Id: <20180608212048.67261-15-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 14/15] net/szedata2: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Matej Vido Signed-off-by: Bruce Richardson --- drivers/net/meson.build | 2 +- drivers/net/szedata2/meson.build | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 drivers/net/szedata2/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 9cec3f884..c7e18a696 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -8,7 +8,7 @@ drivers = ['af_packet', 'ark', 'avp', 'fm10k', 'i40e', 'ifcvf', 'ixgbe', 'kni', 'liquidio', 'mvpp2', 'nfp', 'null', 'octeontx', 'pcap', 'ring', - 'sfc', 'softnic', + 'sfc', 'softnic', 'szedata2', 'thunderx', 'virtio'] 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 diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build new file mode 100644 index 000000000..da3733743 --- /dev/null +++ b/drivers/net/szedata2/meson.build @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +dep = cc.find_library('sze2', required: false) +build = dep.found() +ext_deps += dep +sources = files('rte_eth_szedata2.c') From patchwork Fri Jun 8 21:20:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40955 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 38D6F1D0B5; Fri, 8 Jun 2018 23:21:28 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 740A41D0A3 for ; Fri, 8 Jun 2018 23:21:25 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610815" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:24 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Tetsuya Mukawa , Maxime Coquelin Date: Fri, 8 Jun 2018 22:20:48 +0100 Message-Id: <20180608212048.67261-16-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 15/15] net/vhost: add 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CC: Tetsuya Mukawa CC: Maxime Coquelin Signed-off-by: Bruce Richardson --- drivers/net/meson.build | 2 +- drivers/net/vhost/meson.build | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 drivers/net/vhost/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index c7e18a696..aef5ef6c0 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -9,7 +9,7 @@ drivers = ['af_packet', 'ark', 'avp', 'kni', 'liquidio', 'mvpp2', 'nfp', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'softnic', 'szedata2', - 'thunderx', 'virtio'] + 'thunderx', 'vhost', 'virtio'] 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/vhost/meson.build b/drivers/net/vhost/meson.build new file mode 100644 index 000000000..a8f77e1ab --- /dev/null +++ b/drivers/net/vhost/meson.build @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +version = 2 +sources = files('rte_eth_vhost.c') +install_headers('rte_eth_vhost.h') +deps += 'vhost'