From 5c060bf17816a1bf802044346476a7754d8d9eeb Mon Sep 17 00:00:00 2001 From: Matan Azrad Date: Thu, 9 Jan 2020 11:00:17 +0000 Subject: [PATCH] drivers: move ifc to vDPA directory A new vDPA class was recently introduced. IFC driver implements the vDPA operations, hence it should be moved to the vDPA class. Move it. Signed-off-by: Matan Azrad Reviewed-by: Maxime Coquelin --- MAINTAINERS | 13 ++++++------- doc/guides/nics/index.rst | 1 - doc/guides/{nics => vdpadevs}/features/ifcvf.ini | 0 doc/guides/{nics => vdpadevs}/ifc.rst | 0 doc/guides/vdpadevs/index.rst | 1 + drivers/net/Makefile | 3 --- drivers/net/meson.build | 1 - drivers/vdpa/Makefile | 4 +++- drivers/{net => vdpa}/ifc/Makefile | 0 drivers/{net => vdpa}/ifc/base/ifcvf.c | 0 drivers/{net => vdpa}/ifc/base/ifcvf.h | 0 drivers/{net => vdpa}/ifc/base/ifcvf_osdep.h | 0 drivers/{net => vdpa}/ifc/ifcvf_vdpa.c | 0 drivers/{net => vdpa}/ifc/meson.build | 0 drivers/{net => vdpa}/ifc/rte_pmd_ifc_version.map | 0 drivers/vdpa/meson.build | 2 +- 16 files changed, 11 insertions(+), 14 deletions(-) rename doc/guides/{nics => vdpadevs}/features/ifcvf.ini (100%) rename doc/guides/{nics => vdpadevs}/ifc.rst (100%) rename drivers/{net => vdpa}/ifc/Makefile (100%) rename drivers/{net => vdpa}/ifc/base/ifcvf.c (100%) rename drivers/{net => vdpa}/ifc/base/ifcvf.h (100%) rename drivers/{net => vdpa}/ifc/base/ifcvf_osdep.h (100%) rename drivers/{net => vdpa}/ifc/ifcvf_vdpa.c (100%) rename drivers/{net => vdpa}/ifc/meson.build (100%) rename drivers/{net => vdpa}/ifc/rte_pmd_ifc_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index d52f71e09e..b7c4572d4c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -679,13 +679,6 @@ T: git://dpdk.org/next/dpdk-next-net-intel F: drivers/net/iavf/ F: doc/guides/nics/features/iavf*.ini -Intel ifc -M: Xiao Wang -T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/ifc/ -F: doc/guides/nics/ifc.rst -F: doc/guides/nics/features/ifc*.ini - Intel ice M: Qiming Yang M: Wenzhuo Lu @@ -1093,6 +1086,12 @@ vDPA Drivers ------------ T: git://dpdk.org/next/dpdk-next-virtio +Intel ifc +M: Xiao Wang +F: drivers/vdpa/ifc/ +F: doc/guides/vdpadevs/ifc.rst +F: doc/guides/vdpadevs/features/ifcvf.ini + Eventdev Drivers ---------------- diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst index d61c27fdfa..8c540c0bbe 100644 --- a/doc/guides/nics/index.rst +++ b/doc/guides/nics/index.rst @@ -31,7 +31,6 @@ Network Interface Controller Drivers hns3 i40e ice - ifc igb ipn3ke ixgbe diff --git a/doc/guides/nics/features/ifcvf.ini b/doc/guides/vdpadevs/features/ifcvf.ini similarity index 100% rename from doc/guides/nics/features/ifcvf.ini rename to doc/guides/vdpadevs/features/ifcvf.ini diff --git a/doc/guides/nics/ifc.rst b/doc/guides/vdpadevs/ifc.rst similarity index 100% rename from doc/guides/nics/ifc.rst rename to doc/guides/vdpadevs/ifc.rst diff --git a/doc/guides/vdpadevs/index.rst b/doc/guides/vdpadevs/index.rst index fd07af6942..9657108f98 100644 --- a/doc/guides/vdpadevs/index.rst +++ b/doc/guides/vdpadevs/index.rst @@ -12,3 +12,4 @@ which can be used from an application through vhost API. :numbered: features_overview + ifc diff --git a/drivers/net/Makefile b/drivers/net/Makefile index cee30367a1..cca3c4474e 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -71,9 +71,6 @@ 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_IFC_PMD) += ifc -endif endif # $(CONFIG_RTE_LIBRTE_VHOST) ifeq ($(CONFIG_RTE_LIBRTE_MVPP2_PMD),y) diff --git a/drivers/net/meson.build b/drivers/net/meson.build index c300afb911..b0ea8fedec 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -21,7 +21,6 @@ drivers = ['af_packet', 'hns3', 'iavf', 'ice', - 'ifc', 'ipn3ke', 'ixgbe', 'kni', diff --git a/drivers/vdpa/Makefile b/drivers/vdpa/Makefile index aee51abbec..b5a7a11c60 100644 --- a/drivers/vdpa/Makefile +++ b/drivers/vdpa/Makefile @@ -3,6 +3,8 @@ include $(RTE_SDK)/mk/rte.vars.mk -# DIRS-$() += +ifeq ($(CONFIG_RTE_EAL_VFIO),y) +DIRS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifc +endif include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/net/ifc/Makefile b/drivers/vdpa/ifc/Makefile similarity index 100% rename from drivers/net/ifc/Makefile rename to drivers/vdpa/ifc/Makefile diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c similarity index 100% rename from drivers/net/ifc/base/ifcvf.c rename to drivers/vdpa/ifc/base/ifcvf.c diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h similarity index 100% rename from drivers/net/ifc/base/ifcvf.h rename to drivers/vdpa/ifc/base/ifcvf.h diff --git a/drivers/net/ifc/base/ifcvf_osdep.h b/drivers/vdpa/ifc/base/ifcvf_osdep.h similarity index 100% rename from drivers/net/ifc/base/ifcvf_osdep.h rename to drivers/vdpa/ifc/base/ifcvf_osdep.h diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c similarity index 100% rename from drivers/net/ifc/ifcvf_vdpa.c rename to drivers/vdpa/ifc/ifcvf_vdpa.c diff --git a/drivers/net/ifc/meson.build b/drivers/vdpa/ifc/meson.build similarity index 100% rename from drivers/net/ifc/meson.build rename to drivers/vdpa/ifc/meson.build diff --git a/drivers/net/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/rte_pmd_ifc_version.map similarity index 100% rename from drivers/net/ifc/rte_pmd_ifc_version.map rename to drivers/vdpa/ifc/rte_pmd_ifc_version.map diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build index e5065aa622..2f047b5fa5 100644 --- a/drivers/vdpa/meson.build +++ b/drivers/vdpa/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2019 Mellanox Technologies, Ltd -drivers = [] +drivers = ['ifc'] std_deps = ['bus_pci', 'kvargs'] std_deps += ['vhost'] config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' -- 2.20.1