ixgbe: move to drivers/net/

move ixgbe PMD to drivers/net directory.
As part of the move, we rename the ixgbe directory, containing the
ixgbe "base driver" code, from "ixgbe" to "base".

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>

MAINTAINERS

@@ -221,7 +221,7 @@ F: doc/guides/nics/intel_vf.rst
 Intel ixgbe
 M: Helin Zhang <helin.zhang@intel.com>
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_pmd_ixgbe/
+F: drivers/net/ixgbe/
 F: doc/guides/nics/ixgbe.rst
 F: doc/guides/nics/intel_vf.rst
 

doc/guides/prog_guide/source_org.rst

@@ -79,7 +79,6 @@ The lib directory contains::
     +-- librte_mempool      # memory pool manager (fixedsized objects)
     +-- librte_meter        # QoS metering library
     +-- librte_net          # various IP-related headers
-    +-- librte_pmd_ixgbe    # 10GbE 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::
     +-- enic               # Cisco VIC Ethernet NIC Poll-mode Driver
     +-- fm10k              # Host interface PMD driver for FM10000 Series
     +-- i40e               # 40GbE poll mode driver
+    +-- ixgbe              # 10GbE poll mode driver
 
 Applications
 ------------

drivers/net/Makefile

@@ -37,6 +37,7 @@ 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
+DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe
 
 include $(RTE_SDK)/mk/rte.sharelib.mk
 include $(RTE_SDK)/mk/rte.subdir.mk

drivers/net/ixgbe/Makefile

@@ -1,6 +1,6 @@
 #   BSD LICENSE
 #
-#   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+#   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
 #   All rights reserved.
 #
 #   Redistribution and use in source and binary forms, with or without
@@ -82,10 +82,10 @@ endif
 # Add extra flags for base driver files (also known as shared code)
 # to disable warnings in them
 #
-BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/ixgbe/*.c)))
+BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))
 $(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
 
-VPATH += $(SRCDIR)/ixgbe
+VPATH += $(SRCDIR)/base
 
 #
 # all source are stored in SRCS-y

drivers/net/ixgbe/ixgbe_82599_bypass.c

@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -31,11 +31,11 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ixgbe/ixgbe_type.h"
-#include "ixgbe/ixgbe_82599.h"
-#include "ixgbe/ixgbe_api.h"
-#include "ixgbe/ixgbe_common.h"
-#include "ixgbe/ixgbe_phy.h"
+#include "base/ixgbe_type.h"
+#include "base/ixgbe_82599.h"
+#include "base/ixgbe_api.h"
+#include "base/ixgbe_common.h"
+#include "base/ixgbe_phy.h"
 #include "ixgbe_bypass_defines.h"
 #include "ixgbe_bypass.h"
 

drivers/net/ixgbe/ixgbe_ethdev.c

@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -62,9 +62,9 @@
 #include <rte_dev.h>
 
 #include "ixgbe_logs.h"
-#include "ixgbe/ixgbe_api.h"
-#include "ixgbe/ixgbe_vf.h"
-#include "ixgbe/ixgbe_common.h"
+#include "base/ixgbe_api.h"
+#include "base/ixgbe_vf.h"
+#include "base/ixgbe_common.h"
 #include "ixgbe_ethdev.h"
 #include "ixgbe_bypass.h"
 #include "ixgbe_rxtx.h"
@@ -461,7 +461,7 @@ rte_ixgbe_dev_atomic_write_link_status(struct rte_eth_dev *dev,
 }
 
 /*
- * This function is the same as ixgbe_is_sfp() in ixgbe/ixgbe.h.
+ * This function is the same as ixgbe_is_sfp() in base/ixgbe.h.
  */
 static inline int
 ixgbe_is_sfp(struct ixgbe_hw *hw)
@@ -509,7 +509,7 @@ ixgbe_enable_intr(struct rte_eth_dev *dev)
 }
 
 /*
- * This function is based on ixgbe_disable_intr() in ixgbe/ixgbe.h.
+ * This function is based on ixgbe_disable_intr() in base/ixgbe.h.
  */
 static void
 ixgbe_disable_intr(struct ixgbe_hw *hw)
@@ -710,7 +710,7 @@ ixgbe_swfw_lock_reset(struct ixgbe_hw *hw)
 }
 
 /*
- * This function is based on code in ixgbe_attach() in ixgbe/ixgbe.c.
+ * This function is based on code in ixgbe_attach() in base/ixgbe.c.
  * It returns 0 on success.
  */
 static int
@@ -1740,7 +1740,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev)
 }
 
 /*
- * This function is based on ixgbe_update_stats_counters() in ixgbe/ixgbe.c
+ * This function is based on ixgbe_update_stats_counters() in base/ixgbe.c
  */
 static void
 ixgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)

drivers/net/ixgbe/ixgbe_ethdev.h

@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,9 @@
 
 #ifndef _IXGBE_ETHDEV_H_
 #define _IXGBE_ETHDEV_H_
-#include "ixgbe/ixgbe_dcb.h"
-#include "ixgbe/ixgbe_dcb_82599.h"
-#include "ixgbe/ixgbe_dcb_82598.h"
+#include "base/ixgbe_dcb.h"
+#include "base/ixgbe_dcb_82599.h"
+#include "base/ixgbe_dcb_82598.h"
 #include "ixgbe_bypass.h"
 
 /* need update link, bit flag */

drivers/net/ixgbe/ixgbe_fdir.c

@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -45,8 +45,8 @@
 #include <rte_ethdev.h>
 
 #include "ixgbe_logs.h"
-#include "ixgbe/ixgbe_api.h"
-#include "ixgbe/ixgbe_common.h"
+#include "base/ixgbe_api.h"
+#include "base/ixgbe_common.h"
 #include "ixgbe_ethdev.h"
 
 /* To get PBALLOC (Packet Buffer Allocation) bits from FDIRCTRL value */
@@ -137,7 +137,7 @@ static void ixgbe_fdir_stats_get(struct rte_eth_dev *dev,
 			struct rte_eth_fdir_stats *fdir_stats);
 
 /**
- * This function is based on ixgbe_fdir_enable_82599() in ixgbe/ixgbe_82599.c.
+ * This function is based on ixgbe_fdir_enable_82599() in base/ixgbe_82599.c.
  * It adds extra configuration of fdirctrl that is common for all filter types.
  *
  *  Initialize Flow Director control registers
@@ -281,7 +281,7 @@ reverse_fdir_bitmasks(uint16_t hi_dword, uint16_t lo_dword)
 }
 
 /*
- * This is based on ixgbe_fdir_set_input_mask_82599() in ixgbe/ixgbe_82599.c,
+ * This is based on ixgbe_fdir_set_input_mask_82599() in base/ixgbe_82599.c,
  * but makes use of the rte_fdir_masks structure to see which bits to set.
  */
 static int
@@ -743,7 +743,7 @@ atr_compute_sig_hash_82599(union ixgbe_atr_input *input,
 
 /*
  * This is based on ixgbe_fdir_write_perfect_filter_82599() in
- * ixgbe/ixgbe_82599.c, with the ability to set extra flags in FDIRCMD register
+ * base/ixgbe_82599.c, with the ability to set extra flags in FDIRCMD register
  * added, and IPv6 support also added. The hash value is also pre-calculated
  * as the pballoc value is needed to do it.
  */
@@ -800,7 +800,7 @@ fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
 
 /**
  * This function is based on ixgbe_atr_add_signature_filter_82599() in
- * ixgbe/ixgbe_82599.c, but uses a pre-calculated hash value. It also supports
+ * base/ixgbe_82599.c, but uses a pre-calculated hash value. It also supports
  * setting extra fields in the FDIRCMD register, and removes the code that was
  * verifying the flow_type field. According to the documentation, a flow type of
  * 00 (i.e. not TCP, UDP, or SCTP) is not supported, however it appears to
@@ -842,7 +842,7 @@ fdir_add_signature_filter_82599(struct ixgbe_hw *hw,
 
 /*
  * This is based on ixgbe_fdir_erase_perfect_filter_82599() in
- * ixgbe/ixgbe_82599.c. It is modified to take in the hash as a parameter so
+ * base/ixgbe_82599.c. It is modified to take in the hash as a parameter so
  * that it can be used for removing signature and perfect filters.
  */
 static int

drivers/net/ixgbe/ixgbe_pf.c

@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 #include <rte_malloc.h>
 #include <rte_random.h>
 
-#include "ixgbe/ixgbe_common.h"
+#include "base/ixgbe_common.h"
 #include "ixgbe_ethdev.h"
 
 #define IXGBE_MAX_VFTA     (128)

drivers/net/ixgbe/ixgbe_rxtx.c

@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   Copyright 2014 6WIND S.A.
  *   All rights reserved.
  *
@@ -73,11 +73,11 @@
 #include <rte_ip.h>
 
 #include "ixgbe_logs.h"
-#include "ixgbe/ixgbe_api.h"
-#include "ixgbe/ixgbe_vf.h"
+#include "base/ixgbe_api.h"
+#include "base/ixgbe_vf.h"
 #include "ixgbe_ethdev.h"
-#include "ixgbe/ixgbe_dcb.h"
-#include "ixgbe/ixgbe_common.h"
+#include "base/ixgbe_dcb.h"
+#include "base/ixgbe_common.h"
 #include "ixgbe_rxtx.h"
 
 /* Bit Mask to indicate what bits required for building TX context */

lib/Makefile

@@ -41,7 +41,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer
 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_MLX4_PMD) += librte_pmd_mlx4
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += librte_pmd_ring
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap