From 72f3de308fce9d6b537440f5f1a414c069d2c79d Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:50 +0100 Subject: [PATCH] enic: move to drivers/net/ move enic PMD to drivers/net directory Signed-off-by: Bruce Richardson Acked-by: John McNamara [Thomas: move vnic/ to base/] Acked-by: Thomas Monjalon --- MAINTAINERS | 2 +- doc/guides/prog_guide/source_org.rst | 1 + drivers/net/Makefile | 1 + {lib/librte_pmd_enic => drivers/net/enic}/LICENSE | 0 {lib/librte_pmd_enic => drivers/net/enic}/Makefile | 14 +++++++------- .../vnic => drivers/net/enic/base}/cq_desc.h | 0 .../vnic => drivers/net/enic/base}/cq_enet_desc.h | 0 .../vnic => drivers/net/enic/base}/rq_enet_desc.h | 0 .../vnic => drivers/net/enic/base}/vnic_cq.c | 0 .../vnic => drivers/net/enic/base}/vnic_cq.h | 0 .../vnic => drivers/net/enic/base}/vnic_dev.c | 0 .../vnic => drivers/net/enic/base}/vnic_dev.h | 0 .../vnic => drivers/net/enic/base}/vnic_devcmd.h | 0 .../vnic => drivers/net/enic/base}/vnic_enet.h | 0 .../vnic => drivers/net/enic/base}/vnic_intr.c | 0 .../vnic => drivers/net/enic/base}/vnic_intr.h | 0 .../vnic => drivers/net/enic/base}/vnic_nic.h | 0 .../vnic => drivers/net/enic/base}/vnic_resource.h | 0 .../vnic => drivers/net/enic/base}/vnic_rq.c | 0 .../vnic => drivers/net/enic/base}/vnic_rq.h | 0 .../vnic => drivers/net/enic/base}/vnic_rss.c | 0 .../vnic => drivers/net/enic/base}/vnic_rss.h | 0 .../vnic => drivers/net/enic/base}/vnic_stats.h | 0 .../vnic => drivers/net/enic/base}/vnic_wq.c | 0 .../vnic => drivers/net/enic/base}/vnic_wq.h | 0 .../vnic => drivers/net/enic/base}/wq_enet_desc.h | 0 {lib/librte_pmd_enic => drivers/net/enic}/enic.h | 0 .../net/enic}/enic_clsf.c | 0 .../net/enic}/enic_compat.h | 0 .../net/enic}/enic_ethdev.c | 0 .../net/enic}/enic_main.c | 0 .../net/enic}/enic_res.c | 0 .../net/enic}/enic_res.h | 0 .../net/enic}/rte_pmd_enic_version.map | 0 lib/Makefile | 1 - 35 files changed, 10 insertions(+), 9 deletions(-) rename {lib/librte_pmd_enic => drivers/net/enic}/LICENSE (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/Makefile (86%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/cq_desc.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/cq_enet_desc.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/rq_enet_desc.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_cq.c (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_cq.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_dev.c (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_dev.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_devcmd.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_enet.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_intr.c (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_intr.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_nic.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_resource.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_rq.c (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_rq.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_rss.c (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_rss.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_stats.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_wq.c (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/vnic_wq.h (100%) rename {lib/librte_pmd_enic/vnic => drivers/net/enic/base}/wq_enet_desc.h (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/enic.h (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/enic_clsf.c (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/enic_compat.h (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/enic_ethdev.c (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/enic_main.c (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/enic_res.c (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/enic_res.h (100%) rename {lib/librte_pmd_enic => drivers/net/enic}/rte_pmd_enic_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 47f73f6618..0d96a5eacb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -211,7 +211,7 @@ M: John W. Linville F: drivers/net/af_packet/ Cisco enic -F: lib/librte_pmd_enic/ +F: drivers/net/enic/ Intel e1000 F: drivers/net/e1000/ diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 41ff7470cb..3c3a15a4d4 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -107,6 +107,7 @@ The drivers directory has a net subdirectory which contains:: +-- af_packet # poll mode driver based on linux af_packet +-- bonding # bonding poll mode driver +-- e1000 # 1GbE poll mode drivers (igb and em) + +-- enic # Cisco VIC Ethernet NIC Poll-mode Driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 39e577c7cc..faf0706926 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -34,6 +34,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 +DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_enic/LICENSE b/drivers/net/enic/LICENSE similarity index 100% rename from lib/librte_pmd_enic/LICENSE rename to drivers/net/enic/LICENSE diff --git a/lib/librte_pmd_enic/Makefile b/drivers/net/enic/Makefile similarity index 86% rename from lib/librte_pmd_enic/Makefile rename to drivers/net/enic/Makefile index bfc0994e7c..52334c93b0 100644 --- a/lib/librte_pmd_enic/Makefile +++ b/drivers/net/enic/Makefile @@ -41,7 +41,7 @@ EXPORT_MAP := rte_pmd_enic_version.map LIBABIVER := 1 -CFLAGS += -I$(SRCDIR)/vnic/ +CFLAGS += -I$(SRCDIR)/base/ CFLAGS += -I$(SRCDIR) CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -Wno-strict-aliasing @@ -55,12 +55,12 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_ethdev.c SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_main.c SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_clsf.c SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_res.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic/vnic_cq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic/vnic_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic/vnic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic/vnic_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic/vnic_rq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic/vnic_rss.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_cq.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_wq.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_dev.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_intr.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rq.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rss.c # this lib depends upon: DEPDIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += lib/librte_eal lib/librte_ether diff --git a/lib/librte_pmd_enic/vnic/cq_desc.h b/drivers/net/enic/base/cq_desc.h similarity index 100% rename from lib/librte_pmd_enic/vnic/cq_desc.h rename to drivers/net/enic/base/cq_desc.h diff --git a/lib/librte_pmd_enic/vnic/cq_enet_desc.h b/drivers/net/enic/base/cq_enet_desc.h similarity index 100% rename from lib/librte_pmd_enic/vnic/cq_enet_desc.h rename to drivers/net/enic/base/cq_enet_desc.h diff --git a/lib/librte_pmd_enic/vnic/rq_enet_desc.h b/drivers/net/enic/base/rq_enet_desc.h similarity index 100% rename from lib/librte_pmd_enic/vnic/rq_enet_desc.h rename to drivers/net/enic/base/rq_enet_desc.h diff --git a/lib/librte_pmd_enic/vnic/vnic_cq.c b/drivers/net/enic/base/vnic_cq.c similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_cq.c rename to drivers/net/enic/base/vnic_cq.c diff --git a/lib/librte_pmd_enic/vnic/vnic_cq.h b/drivers/net/enic/base/vnic_cq.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_cq.h rename to drivers/net/enic/base/vnic_cq.h diff --git a/lib/librte_pmd_enic/vnic/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_dev.c rename to drivers/net/enic/base/vnic_dev.c diff --git a/lib/librte_pmd_enic/vnic/vnic_dev.h b/drivers/net/enic/base/vnic_dev.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_dev.h rename to drivers/net/enic/base/vnic_dev.h diff --git a/lib/librte_pmd_enic/vnic/vnic_devcmd.h b/drivers/net/enic/base/vnic_devcmd.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_devcmd.h rename to drivers/net/enic/base/vnic_devcmd.h diff --git a/lib/librte_pmd_enic/vnic/vnic_enet.h b/drivers/net/enic/base/vnic_enet.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_enet.h rename to drivers/net/enic/base/vnic_enet.h diff --git a/lib/librte_pmd_enic/vnic/vnic_intr.c b/drivers/net/enic/base/vnic_intr.c similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_intr.c rename to drivers/net/enic/base/vnic_intr.c diff --git a/lib/librte_pmd_enic/vnic/vnic_intr.h b/drivers/net/enic/base/vnic_intr.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_intr.h rename to drivers/net/enic/base/vnic_intr.h diff --git a/lib/librte_pmd_enic/vnic/vnic_nic.h b/drivers/net/enic/base/vnic_nic.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_nic.h rename to drivers/net/enic/base/vnic_nic.h diff --git a/lib/librte_pmd_enic/vnic/vnic_resource.h b/drivers/net/enic/base/vnic_resource.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_resource.h rename to drivers/net/enic/base/vnic_resource.h diff --git a/lib/librte_pmd_enic/vnic/vnic_rq.c b/drivers/net/enic/base/vnic_rq.c similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_rq.c rename to drivers/net/enic/base/vnic_rq.c diff --git a/lib/librte_pmd_enic/vnic/vnic_rq.h b/drivers/net/enic/base/vnic_rq.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_rq.h rename to drivers/net/enic/base/vnic_rq.h diff --git a/lib/librte_pmd_enic/vnic/vnic_rss.c b/drivers/net/enic/base/vnic_rss.c similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_rss.c rename to drivers/net/enic/base/vnic_rss.c diff --git a/lib/librte_pmd_enic/vnic/vnic_rss.h b/drivers/net/enic/base/vnic_rss.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_rss.h rename to drivers/net/enic/base/vnic_rss.h diff --git a/lib/librte_pmd_enic/vnic/vnic_stats.h b/drivers/net/enic/base/vnic_stats.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_stats.h rename to drivers/net/enic/base/vnic_stats.h diff --git a/lib/librte_pmd_enic/vnic/vnic_wq.c b/drivers/net/enic/base/vnic_wq.c similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_wq.c rename to drivers/net/enic/base/vnic_wq.c diff --git a/lib/librte_pmd_enic/vnic/vnic_wq.h b/drivers/net/enic/base/vnic_wq.h similarity index 100% rename from lib/librte_pmd_enic/vnic/vnic_wq.h rename to drivers/net/enic/base/vnic_wq.h diff --git a/lib/librte_pmd_enic/vnic/wq_enet_desc.h b/drivers/net/enic/base/wq_enet_desc.h similarity index 100% rename from lib/librte_pmd_enic/vnic/wq_enet_desc.h rename to drivers/net/enic/base/wq_enet_desc.h diff --git a/lib/librte_pmd_enic/enic.h b/drivers/net/enic/enic.h similarity index 100% rename from lib/librte_pmd_enic/enic.h rename to drivers/net/enic/enic.h diff --git a/lib/librte_pmd_enic/enic_clsf.c b/drivers/net/enic/enic_clsf.c similarity index 100% rename from lib/librte_pmd_enic/enic_clsf.c rename to drivers/net/enic/enic_clsf.c diff --git a/lib/librte_pmd_enic/enic_compat.h b/drivers/net/enic/enic_compat.h similarity index 100% rename from lib/librte_pmd_enic/enic_compat.h rename to drivers/net/enic/enic_compat.h diff --git a/lib/librte_pmd_enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c similarity index 100% rename from lib/librte_pmd_enic/enic_ethdev.c rename to drivers/net/enic/enic_ethdev.c diff --git a/lib/librte_pmd_enic/enic_main.c b/drivers/net/enic/enic_main.c similarity index 100% rename from lib/librte_pmd_enic/enic_main.c rename to drivers/net/enic/enic_main.c diff --git a/lib/librte_pmd_enic/enic_res.c b/drivers/net/enic/enic_res.c similarity index 100% rename from lib/librte_pmd_enic/enic_res.c rename to drivers/net/enic/enic_res.c diff --git a/lib/librte_pmd_enic/enic_res.h b/drivers/net/enic/enic_res.h similarity index 100% rename from lib/librte_pmd_enic/enic_res.h rename to drivers/net/enic/enic_res.h diff --git a/lib/librte_pmd_enic/rte_pmd_enic_version.map b/drivers/net/enic/rte_pmd_enic_version.map similarity index 100% rename from lib/librte_pmd_enic/rte_pmd_enic_version.map rename to drivers/net/enic/rte_pmd_enic_version.map diff --git a/lib/Makefile b/lib/Makefile index 3350e999bf..ca4238d177 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -45,7 +45,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += librte_pmd_ixgbe DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += librte_pmd_i40e DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += librte_pmd_fm10k DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += librte_pmd_mlx4 -DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += librte_pmd_enic DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += librte_pmd_ring DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio -- 2.20.1