From 5c9222058df7cc10fa98c13d097f85a7fa0341a3 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 18 May 2015 12:05:12 +0100 Subject: [PATCH] i40e: move to drivers/net/ Move i40e PMD to drivers/net directory. As part of the move, rename the "i40e" directory, containing the "base driver" code, from "i40e" to "base". Signed-off-by: Bruce Richardson Acked-by: John McNamara Acked-by: Thomas Monjalon --- MAINTAINERS | 2 +- doc/guides/prog_guide/source_org.rst | 2 +- drivers/net/Makefile | 1 + {lib/librte_pmd_i40e => drivers/net/i40e}/Makefile | 4 ++-- .../i40e => drivers/net/i40e/base}/i40e_adminq.c | 0 .../i40e => drivers/net/i40e/base}/i40e_adminq.h | 0 .../i40e => drivers/net/i40e/base}/i40e_adminq_cmd.h | 0 .../i40e => drivers/net/i40e/base}/i40e_alloc.h | 0 .../i40e => drivers/net/i40e/base}/i40e_common.c | 0 .../i40e => drivers/net/i40e/base}/i40e_dcb.c | 0 .../i40e => drivers/net/i40e/base}/i40e_dcb.h | 0 .../i40e => drivers/net/i40e/base}/i40e_diag.c | 0 .../i40e => drivers/net/i40e/base}/i40e_diag.h | 0 .../i40e => drivers/net/i40e/base}/i40e_hmc.c | 0 .../i40e => drivers/net/i40e/base}/i40e_hmc.h | 0 .../i40e => drivers/net/i40e/base}/i40e_lan_hmc.c | 0 .../i40e => drivers/net/i40e/base}/i40e_lan_hmc.h | 0 .../i40e => drivers/net/i40e/base}/i40e_nvm.c | 0 .../i40e => drivers/net/i40e/base}/i40e_osdep.h | 0 .../i40e => drivers/net/i40e/base}/i40e_prototype.h | 0 .../i40e => drivers/net/i40e/base}/i40e_register.h | 0 .../i40e => drivers/net/i40e/base}/i40e_status.h | 0 .../i40e => drivers/net/i40e/base}/i40e_type.h | 0 .../i40e => drivers/net/i40e/base}/i40e_virtchnl.h | 0 {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_ethdev.c | 6 +++--- {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_ethdev.h | 0 {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_ethdev_vf.c | 6 +++--- {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_fdir.c | 2 +- {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_logs.h | 0 {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_pf.c | 6 +++--- {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_pf.h | 0 {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_rxtx.c | 4 ++-- {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_rxtx.h | 0 .../net/i40e}/rte_pmd_i40e_version.map | 0 lib/Makefile | 1 - 35 files changed, 17 insertions(+), 17 deletions(-) rename {lib/librte_pmd_i40e => drivers/net/i40e}/Makefile (99%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_adminq.c (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_adminq.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_adminq_cmd.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_alloc.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_common.c (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_dcb.c (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_dcb.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_diag.c (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_diag.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_hmc.c (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_hmc.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_lan_hmc.c (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_lan_hmc.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_nvm.c (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_osdep.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_prototype.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_register.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_status.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_type.h (100%) rename {lib/librte_pmd_i40e/i40e => drivers/net/i40e/base}/i40e_virtchnl.h (100%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_ethdev.c (99%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_ethdev.h (100%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_ethdev_vf.c (99%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_fdir.c (99%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_logs.h (100%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_pf.c (99%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_pf.h (100%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_rxtx.c (99%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/i40e_rxtx.h (100%) rename {lib/librte_pmd_i40e => drivers/net/i40e}/rte_pmd_i40e_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index e486328704..3ab5e3af50 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -227,7 +227,7 @@ F: doc/guides/nics/intel_vf.rst Intel i40e M: Helin Zhang -F: lib/librte_pmd_i40e/ +F: drivers/net/i40e/ F: doc/guides/nics/intel_vf.rst Intel fm10k diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 4fb4bb745f..53077b3611 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -80,7 +80,6 @@ The lib directory contains:: +-- librte_meter # QoS metering library +-- librte_net # various IP-related headers +-- librte_pmd_ixgbe # 10GbE poll mode driver - +-- librte_pmd_i40e # 40GbE poll mode driver +-- librte_pmd_mlx4 # Mellanox ConnectX-3 poll mode driver +-- librte_pmd_pcap # PCAP poll mode driver +-- librte_pmd_ring # ring poll mode driver @@ -108,6 +107,7 @@ The drivers directory has a net subdirectory which contains:: +-- e1000 # 1GbE poll mode drivers (igb and em) +-- enic # Cisco VIC Ethernet NIC Poll-mode Driver +-- fm10k # Host interface PMD driver for FM10000 Series + +-- i40e # 40GbE poll mode driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index b440c0e916..7418c1db4c 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -36,6 +36,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k +DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_i40e/Makefile b/drivers/net/i40e/Makefile similarity index 99% rename from lib/librte_pmd_i40e/Makefile rename to drivers/net/i40e/Makefile index f5cfec7c0e..4fe371d286 100644 --- a/lib/librte_pmd_i40e/Makefile +++ b/drivers/net/i40e/Makefile @@ -77,10 +77,10 @@ endif CFLAGS_i40e_lan_hmc.o += -Wno-error endif -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/i40e/*.c))) +OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) $(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) -VPATH += $(SRCDIR)/i40e +VPATH += $(SRCDIR)/base # # all source are stored in SRCS-y diff --git a/lib/librte_pmd_i40e/i40e/i40e_adminq.c b/drivers/net/i40e/base/i40e_adminq.c similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_adminq.c rename to drivers/net/i40e/base/i40e_adminq.c diff --git a/lib/librte_pmd_i40e/i40e/i40e_adminq.h b/drivers/net/i40e/base/i40e_adminq.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_adminq.h rename to drivers/net/i40e/base/i40e_adminq.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_adminq_cmd.h b/drivers/net/i40e/base/i40e_adminq_cmd.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_adminq_cmd.h rename to drivers/net/i40e/base/i40e_adminq_cmd.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_alloc.h b/drivers/net/i40e/base/i40e_alloc.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_alloc.h rename to drivers/net/i40e/base/i40e_alloc.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_common.c b/drivers/net/i40e/base/i40e_common.c similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_common.c rename to drivers/net/i40e/base/i40e_common.c diff --git a/lib/librte_pmd_i40e/i40e/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_dcb.c rename to drivers/net/i40e/base/i40e_dcb.c diff --git a/lib/librte_pmd_i40e/i40e/i40e_dcb.h b/drivers/net/i40e/base/i40e_dcb.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_dcb.h rename to drivers/net/i40e/base/i40e_dcb.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_diag.c b/drivers/net/i40e/base/i40e_diag.c similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_diag.c rename to drivers/net/i40e/base/i40e_diag.c diff --git a/lib/librte_pmd_i40e/i40e/i40e_diag.h b/drivers/net/i40e/base/i40e_diag.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_diag.h rename to drivers/net/i40e/base/i40e_diag.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_hmc.c b/drivers/net/i40e/base/i40e_hmc.c similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_hmc.c rename to drivers/net/i40e/base/i40e_hmc.c diff --git a/lib/librte_pmd_i40e/i40e/i40e_hmc.h b/drivers/net/i40e/base/i40e_hmc.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_hmc.h rename to drivers/net/i40e/base/i40e_hmc.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_lan_hmc.c b/drivers/net/i40e/base/i40e_lan_hmc.c similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_lan_hmc.c rename to drivers/net/i40e/base/i40e_lan_hmc.c diff --git a/lib/librte_pmd_i40e/i40e/i40e_lan_hmc.h b/drivers/net/i40e/base/i40e_lan_hmc.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_lan_hmc.h rename to drivers/net/i40e/base/i40e_lan_hmc.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_nvm.c rename to drivers/net/i40e/base/i40e_nvm.c diff --git a/lib/librte_pmd_i40e/i40e/i40e_osdep.h b/drivers/net/i40e/base/i40e_osdep.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_osdep.h rename to drivers/net/i40e/base/i40e_osdep.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_prototype.h b/drivers/net/i40e/base/i40e_prototype.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_prototype.h rename to drivers/net/i40e/base/i40e_prototype.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_register.h b/drivers/net/i40e/base/i40e_register.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_register.h rename to drivers/net/i40e/base/i40e_register.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_status.h b/drivers/net/i40e/base/i40e_status.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_status.h rename to drivers/net/i40e/base/i40e_status.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_type.h b/drivers/net/i40e/base/i40e_type.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_type.h rename to drivers/net/i40e/base/i40e_type.h diff --git a/lib/librte_pmd_i40e/i40e/i40e_virtchnl.h b/drivers/net/i40e/base/i40e_virtchnl.h similarity index 100% rename from lib/librte_pmd_i40e/i40e/i40e_virtchnl.h rename to drivers/net/i40e/base/i40e_virtchnl.h diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c similarity index 99% rename from lib/librte_pmd_i40e/i40e_ethdev.c rename to drivers/net/i40e/i40e_ethdev.c index ece88d9454..fb64027696 100644 --- a/lib/librte_pmd_i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -52,9 +52,9 @@ #include #include "i40e_logs.h" -#include "i40e/i40e_prototype.h" -#include "i40e/i40e_adminq_cmd.h" -#include "i40e/i40e_type.h" +#include "base/i40e_prototype.h" +#include "base/i40e_adminq_cmd.h" +#include "base/i40e_type.h" #include "i40e_ethdev.h" #include "i40e_rxtx.h" #include "i40e_pf.h" diff --git a/lib/librte_pmd_i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h similarity index 100% rename from lib/librte_pmd_i40e/i40e_ethdev.h rename to drivers/net/i40e/i40e_ethdev.h diff --git a/lib/librte_pmd_i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c similarity index 99% rename from lib/librte_pmd_i40e/i40e_ethdev_vf.c rename to drivers/net/i40e/i40e_ethdev_vf.c index bf2d694a66..9f92a2f2bb 100644 --- a/lib/librte_pmd_i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -60,9 +60,9 @@ #include #include "i40e_logs.h" -#include "i40e/i40e_prototype.h" -#include "i40e/i40e_adminq_cmd.h" -#include "i40e/i40e_type.h" +#include "base/i40e_prototype.h" +#include "base/i40e_adminq_cmd.h" +#include "base/i40e_type.h" #include "i40e_rxtx.h" #include "i40e_ethdev.h" diff --git a/lib/librte_pmd_i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c similarity index 99% rename from lib/librte_pmd_i40e/i40e_fdir.c rename to drivers/net/i40e/i40e_fdir.c index 612377a401..e688b4f51e 100644 --- a/lib/librte_pmd_i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -50,7 +50,7 @@ #include #include "i40e_logs.h" -#include "i40e/i40e_type.h" +#include "base/i40e_type.h" #include "i40e_ethdev.h" #include "i40e_rxtx.h" diff --git a/lib/librte_pmd_i40e/i40e_logs.h b/drivers/net/i40e/i40e_logs.h similarity index 100% rename from lib/librte_pmd_i40e/i40e_logs.h rename to drivers/net/i40e/i40e_logs.h diff --git a/lib/librte_pmd_i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c similarity index 99% rename from lib/librte_pmd_i40e/i40e_pf.c rename to drivers/net/i40e/i40e_pf.c index 51b4729e78..b89a1e2635 100644 --- a/lib/librte_pmd_i40e/i40e_pf.c +++ b/drivers/net/i40e/i40e_pf.c @@ -49,9 +49,9 @@ #include #include "i40e_logs.h" -#include "i40e/i40e_prototype.h" -#include "i40e/i40e_adminq_cmd.h" -#include "i40e/i40e_type.h" +#include "base/i40e_prototype.h" +#include "base/i40e_adminq_cmd.h" +#include "base/i40e_type.h" #include "i40e_ethdev.h" #include "i40e_rxtx.h" #include "i40e_pf.h" diff --git a/lib/librte_pmd_i40e/i40e_pf.h b/drivers/net/i40e/i40e_pf.h similarity index 100% rename from lib/librte_pmd_i40e/i40e_pf.h rename to drivers/net/i40e/i40e_pf.h diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c similarity index 99% rename from lib/librte_pmd_i40e/i40e_rxtx.c rename to drivers/net/i40e/i40e_rxtx.c index 453f98fce7..787f0bdb65 100644 --- a/lib/librte_pmd_i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -52,8 +52,8 @@ #include #include "i40e_logs.h" -#include "i40e/i40e_prototype.h" -#include "i40e/i40e_type.h" +#include "base/i40e_prototype.h" +#include "base/i40e_type.h" #include "i40e_ethdev.h" #include "i40e_rxtx.h" diff --git a/lib/librte_pmd_i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h similarity index 100% rename from lib/librte_pmd_i40e/i40e_rxtx.h rename to drivers/net/i40e/i40e_rxtx.h diff --git a/lib/librte_pmd_i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/rte_pmd_i40e_version.map similarity index 100% rename from lib/librte_pmd_i40e/rte_pmd_i40e_version.map rename to drivers/net/i40e/rte_pmd_i40e_version.map diff --git a/lib/Makefile b/lib/Makefile index 73a0e09d7b..73e0bd125b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -42,7 +42,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += librte_pmd_ixgbe -DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += librte_pmd_i40e DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += librte_pmd_mlx4 DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += librte_pmd_ring DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap -- 2.20.1