From patchwork Wed Jun 13 11:32:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Wang X-Patchwork-Id: 41030 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 C25A71EDE6; Wed, 13 Jun 2018 13:36:29 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 24E221ED9C for ; Wed, 13 Jun 2018 13:36:24 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jun 2018 04:36:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,218,1526367600"; d="scan'208";a="46778740" Received: from dpdk-xiao-1.sh.intel.com ([10.67.111.93]) by fmsmga007.fm.intel.com with ESMTP; 13 Jun 2018 04:36:23 -0700 From: Xiao Wang To: ferruh.yigit@intel.com Cc: dev@dpdk.org, bruce.richardson@intel.com, Xiao Wang Date: Wed, 13 Jun 2018 19:32:45 +0800 Message-Id: <20180613113246.13576-2-xiao.w.wang@intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180613113246.13576-1-xiao.w.wang@intel.com> References: <20180613113246.13576-1-xiao.w.wang@intel.com> Subject: [dpdk-dev] [PATCH 1/2] net/ifc: make driver name consistent 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" Make the compiler switch name and document name consistent as ``ifc`` to avoid confusion. Also rename the map file to standard name for meson build in the process. Signed-off-by: Xiao Wang Signed-off-by: Bruce Richardson --- MAINTAINERS | 4 ++-- config/common_base | 4 ++-- config/common_linuxapp | 2 +- doc/guides/nics/{ifcvf.rst => ifc.rst} | 0 doc/guides/nics/index.rst | 2 +- drivers/net/Makefile | 2 +- drivers/net/ifc/Makefile | 8 ++++---- .../net/ifc/{rte_ifcvf_version.map => rte_pmd_ifc_version.map} | 0 mk/rte.app.mk | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename doc/guides/nics/{ifcvf.rst => ifc.rst} (100%) rename drivers/net/ifc/{rte_ifcvf_version.map => rte_pmd_ifc_version.map} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 4667fa7fb..d251c3f98 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -563,8 +563,8 @@ Intel ifc M: Xiao Wang T: git://dpdk.org/next/dpdk-next-net-intel F: drivers/net/ifc/ -F: doc/guides/nics/ifcvf.rst -F: doc/guides/nics/features/ifcvf.ini +F: doc/guides/nics/ifc.rst +F: doc/guides/nics/features/ifc*.ini Marvell mvpp2 M: Tomasz Duszynski diff --git a/config/common_base b/config/common_base index 6b0d1cbbb..fcf3a1f6f 100644 --- a/config/common_base +++ b/config/common_base @@ -861,11 +861,11 @@ CONFIG_RTE_LIBRTE_VHOST_DEBUG=n CONFIG_RTE_LIBRTE_PMD_VHOST=n # -# Compile IFCVF driver +# Compile IFC driver # To compile, CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_EAL_VFIO # should be enabled. # -CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD=n +CONFIG_RTE_LIBRTE_IFC_PMD=n # # Compile librte_bpf diff --git a/config/common_linuxapp b/config/common_linuxapp index 5c68cc0ff..daa49d4ef 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -15,7 +15,7 @@ CONFIG_RTE_LIBRTE_PMD_KNI=y CONFIG_RTE_LIBRTE_VHOST=y CONFIG_RTE_LIBRTE_VHOST_NUMA=y CONFIG_RTE_LIBRTE_PMD_VHOST=y -CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD=y +CONFIG_RTE_LIBRTE_IFC_PMD=y CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y CONFIG_RTE_LIBRTE_PMD_TAP=y CONFIG_RTE_LIBRTE_AVP_PMD=y diff --git a/doc/guides/nics/ifcvf.rst b/doc/guides/nics/ifc.rst similarity index 100% rename from doc/guides/nics/ifcvf.rst rename to doc/guides/nics/ifc.rst diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst index ddb9eb7a9..d68c5ed5e 100644 --- a/doc/guides/nics/index.rst +++ b/doc/guides/nics/index.rst @@ -24,7 +24,7 @@ Network Interface Controller Drivers enic fm10k i40e - ifcvf + ifc igb ixgbe intel_vf diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 9f9da6651..1ae0eaffb 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_IFC_PMD) += ifc endif endif # $(CONFIG_RTE_LIBRTE_VHOST) diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifc/Makefile index 1011995bc..39b36ae5d 100644 --- a/drivers/net/ifc/Makefile +++ b/drivers/net/ifc/Makefile @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_ifcvf_vdpa.a +LIB = librte_pmd_ifc.a LDLIBS += -lpthread LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci @@ -22,14 +22,14 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*. VPATH += $(SRCDIR)/base -EXPORT_MAP := rte_ifcvf_version.map +EXPORT_MAP := rte_pmd_ifc_version.map LIBABIVER := 1 # # all source are stored in SRCS-y # -SRCS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf.c +SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf_vdpa.c +SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf.c include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ifc/rte_ifcvf_version.map b/drivers/net/ifc/rte_pmd_ifc_version.map similarity index 100% rename from drivers/net/ifc/rte_ifcvf_version.map rename to drivers/net/ifc/rte_pmd_ifc_version.map diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 1e32c83e7..87a0c80ff 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -165,7 +165,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += -lrte_pmd_virtio ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += -lrte_pmd_vhost ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += -lrte_ifcvf_vdpa +_LDLIBS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += -lrte_pmd_ifc endif # $(CONFIG_RTE_EAL_VFIO) endif # $(CONFIG_RTE_LIBRTE_VHOST) _LDLIBS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += -lrte_pmd_vmxnet3_uio From patchwork Wed Jun 13 11:32:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Wang X-Patchwork-Id: 41029 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 435A01EDA8; Wed, 13 Jun 2018 13:36:28 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 4D1B41EDA0 for ; Wed, 13 Jun 2018 13:36:26 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jun 2018 04:36:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,218,1526367600"; d="scan'208";a="46778757" Received: from dpdk-xiao-1.sh.intel.com ([10.67.111.93]) by fmsmga007.fm.intel.com with ESMTP; 13 Jun 2018 04:36:25 -0700 From: Xiao Wang To: ferruh.yigit@intel.com Cc: dev@dpdk.org, bruce.richardson@intel.com, Xiao Wang Date: Wed, 13 Jun 2018 19:32:46 +0800 Message-Id: <20180613113246.13576-3-xiao.w.wang@intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180613113246.13576-1-xiao.w.wang@intel.com> References: <20180613113246.13576-1-xiao.w.wang@intel.com> Subject: [dpdk-dev] [PATCH 2/2] net/ifc: 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 Signed-off-by: Xiao Wang --- drivers/net/ifc/meson.build | 7 +++++++ drivers/net/meson.build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ifc/meson.build diff --git a/drivers/net/ifc/meson.build b/drivers/net/ifc/meson.build new file mode 100644 index 000000000..a30aa09e6 --- /dev/null +++ b/drivers/net/ifc/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 b7d00a04c..2042859c1 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation drivers = ['af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2', - 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', + 'e1000', 'enic', 'fm10k', 'i40e', 'ifc', 'ixgbe', 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc