net/iavf: rename avf to iavf

Rename Intel Ethernet Adaptive Virtual Function driver avf to iavf.

This is the first patch which will only renames the directory name,
lib name, filenames and updates the new name in makefile and meson
files. Also updates the #include files in source files.

Signed-off-by: Leyi Rong <leyi.rong@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

MAINTAINERS

@@ -575,12 +575,12 @@ F: drivers/net/fm10k/
 F: doc/guides/nics/fm10k.rst
 F: doc/guides/nics/features/fm10k*.ini
 
-Intel avf
+Intel iavf
 M: Jingjing Wu <jingjing.wu@intel.com>
 M: Wenzhuo Lu <wenzhuo.lu@intel.com>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/avf/
+F: drivers/net/iavf/
-F: doc/guides/nics/features/avf*.ini
+F: doc/guides/nics/features/iavf*.ini
 
 Intel ifc
 M: Xiao Wang <xiao.w.wang@intel.com>

doc/guides/nics/features/iavf.ini

@@ -1,5 +1,5 @@
 ;
-; Supported features of the 'avf' network poll mode driver.
+; Supported features of the 'iavf' network poll mode driver.
 ;
 ; Refer to default.ini for the full list of available PMD features.
 ;

doc/guides/nics/features/iavf_vec.ini

@@ -1,5 +1,5 @@
 ;
-; Supported features of the 'avf_vec' network poll mode driver.
+; Supported features of the 'iavf_vec' network poll mode driver.
 ;
 ; Refer to default.ini for the full list of available PMD features.
 ;

drivers/net/Makefile

@@ -11,7 +11,6 @@ endif
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet
 DIRS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark
 DIRS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atlantic
-DIRS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf
 DIRS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp
 DIRS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe
 DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x
@@ -30,6 +29,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe
 DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k
 DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e
+DIRS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf
 DIRS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice
 DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe
 DIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += liquidio

drivers/net/iavf/Makefile

@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 #
 # library name
 #
-LIB = librte_pmd_avf.a
+LIB = librte_pmd_iavf.a
 
 CFLAGS += -O3 $(WERROR_FLAGS) -Wno-strict-aliasing -DALLOW_EXPERIMENTAL_API
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
@@ -16,7 +16,7 @@ LDLIBS += -lrte_bus_pci
 # used to dump HW descriptor for debugging
 # CFLAGS += -DDEBUG_DUMP_DESC
 
-EXPORT_MAP := rte_pmd_avf_version.map
+EXPORT_MAP := rte_pmd_iavf_version.map
 
 LIBABIVER := 1
 
@@ -41,14 +41,14 @@ VPATH += $(SRCDIR)/base
 #
 # all source are stored in SRCS-y
 #
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_adminq.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_adminq.c
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_common.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_common.c
 
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_ethdev.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_vchnl.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_vchnl.c
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_rxtx.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_rxtx.c
 ifeq ($(CONFIG_RTE_ARCH_X86), y)
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_INC_VECTOR) += avf_rxtx_vec_sse.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_INC_VECTOR) += iavf_rxtx_vec_sse.c
 endif
 
 include $(RTE_SDK)/mk/rte.lib.mk

drivers/net/iavf/base/iavf_adminq.c

@@ -31,11 +31,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-#include "avf_status.h"
+#include "iavf_status.h"
-#include "avf_type.h"
+#include "iavf_type.h"
-#include "avf_register.h"
+#include "iavf_register.h"
-#include "avf_adminq.h"
+#include "iavf_adminq.h"
-#include "avf_prototype.h"
+#include "iavf_prototype.h"
 
 /**
  *  avf_adminq_init_regs - Initialize AdminQ registers

drivers/net/iavf/base/iavf_adminq.h

@@ -34,9 +34,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef _AVF_ADMINQ_H_
 #define _AVF_ADMINQ_H_
 
-#include "avf_osdep.h"
+#include "iavf_osdep.h"
-#include "avf_status.h"
+#include "iavf_status.h"
-#include "avf_adminq_cmd.h"
+#include "iavf_adminq_cmd.h"
 
 #define AVF_ADMINQ_DESC(R, i)   \
 	(&(((struct avf_aq_desc *)((R).desc_buf.va))[i]))

drivers/net/iavf/base/iavf_common.c

@@ -31,9 +31,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-#include "avf_type.h"
+#include "iavf_type.h"
-#include "avf_adminq.h"
+#include "iavf_adminq.h"
-#include "avf_prototype.h"
+#include "iavf_prototype.h"
 #include "virtchnl.h"
 
 

drivers/net/iavf/base/iavf_osdep.h

@@ -21,7 +21,7 @@
 #include <rte_log.h>
 #include <rte_io.h>
 
-#include "../avf_log.h"
+#include "../iavf_log.h"
 
 #define INLINE inline
 #define STATIC static

drivers/net/iavf/base/iavf_prototype.h

@@ -34,8 +34,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef _AVF_PROTOTYPE_H_
 #define _AVF_PROTOTYPE_H_
 
-#include "avf_type.h"
+#include "iavf_type.h"
-#include "avf_alloc.h"
+#include "iavf_alloc.h"
 #include "virtchnl.h"
 
 /* Prototypes for shared code functions that are not in

drivers/net/iavf/base/iavf_type.h

@@ -34,13 +34,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef _AVF_TYPE_H_
 #define _AVF_TYPE_H_
 
-#include "avf_status.h"
+#include "iavf_status.h"
-#include "avf_osdep.h"
+#include "iavf_osdep.h"
-#include "avf_register.h"
+#include "iavf_register.h"
-#include "avf_adminq.h"
+#include "iavf_adminq.h"
-#include "avf_hmc.h"
+#include "iavf_hmc.h"
-#include "avf_lan_hmc.h"
+#include "iavf_lan_hmc.h"
-#include "avf_devids.h"
+#include "iavf_devids.h"
 
 #define UNREFERENCED_XPARAMETER
 #define UNREFERENCED_1PARAMETER(_p) (_p);

drivers/net/iavf/base/meson.build

@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = [
-	'avf_adminq.c',
+	'iavf_adminq.c',
-	'avf_common.c',
+	'iavf_common.c',
 ]
 
 error_cflags = ['-Wno-pointer-to-int-cast']
@@ -17,7 +17,7 @@ foreach flag: error_cflags
 	endif
 endforeach
 
-base_lib = static_library('avf_base', sources,
+base_lib = static_library('iavf_base', sources,
 	dependencies: static_rte_eal,
 	c_args: c_args)
 base_objs = base_lib.extract_all_objects()

drivers/net/iavf/iavf_ethdev.c

@@ -25,13 +25,13 @@
 #include <rte_memzone.h>
 #include <rte_dev.h>
 
-#include "avf_log.h"
+#include "iavf_log.h"
-#include "base/avf_prototype.h"
+#include "base/iavf_prototype.h"
-#include "base/avf_adminq_cmd.h"
+#include "base/iavf_adminq_cmd.h"
-#include "base/avf_type.h"
+#include "base/iavf_type.h"
 
-#include "avf.h"
+#include "iavf.h"
-#include "avf_rxtx.h"
+#include "iavf_rxtx.h"
 
 static int avf_dev_configure(struct rte_eth_dev *dev);
 static int avf_dev_start(struct rte_eth_dev *dev);

drivers/net/iavf/iavf_rxtx.c

@@ -24,11 +24,11 @@
 #include <rte_ip.h>
 #include <rte_net.h>
 
-#include "avf_log.h"
+#include "iavf_log.h"
-#include "base/avf_prototype.h"
+#include "base/iavf_prototype.h"
-#include "base/avf_type.h"
+#include "base/iavf_type.h"
-#include "avf.h"
+#include "iavf.h"
-#include "avf_rxtx.h"
+#include "iavf_rxtx.h"
 
 static inline int
 check_rx_thresh(uint16_t nb_desc, uint16_t thresh)

drivers/net/iavf/iavf_rxtx_vec_common.h

@@ -8,8 +8,8 @@
 #include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 
-#include "avf.h"
+#include "iavf.h"
-#include "avf_rxtx.h"
+#include "iavf_rxtx.h"
 
 static inline uint16_t
 reassemble_packets(struct avf_rx_queue *rxq, struct rte_mbuf **rx_bufs,

drivers/net/iavf/iavf_rxtx_vec_sse.c

@@ -6,11 +6,11 @@
 #include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 
-#include "base/avf_prototype.h"
+#include "base/iavf_prototype.h"
-#include "base/avf_type.h"
+#include "base/iavf_type.h"
-#include "avf.h"
+#include "iavf.h"
-#include "avf_rxtx.h"
+#include "iavf_rxtx.h"
-#include "avf_rxtx_vec_common.h"
+#include "iavf_rxtx_vec_common.h"
 
 #include <tmmintrin.h>
 

drivers/net/iavf/iavf_vchnl.c

@@ -19,13 +19,13 @@
 #include <rte_ethdev_driver.h>
 #include <rte_dev.h>
 
-#include "avf_log.h"
+#include "iavf_log.h"
-#include "base/avf_prototype.h"
+#include "base/iavf_prototype.h"
-#include "base/avf_adminq_cmd.h"
+#include "base/iavf_adminq_cmd.h"
-#include "base/avf_type.h"
+#include "base/iavf_type.h"
 
-#include "avf.h"
+#include "iavf.h"
-#include "avf_rxtx.h"
+#include "iavf_rxtx.h"
 
 #define MAX_TRY_TIMES 200
 #define ASQ_DELAY_MS  10

drivers/net/iavf/meson.build

@@ -9,12 +9,12 @@ subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'avf_ethdev.c',
+	'iavf_ethdev.c',
-	'avf_rxtx.c',
+	'iavf_rxtx.c',
-	'avf_vchnl.c',
+	'iavf_vchnl.c',
 )
 
 if arch_subdir == 'x86'
 	dpdk_conf.set('RTE_LIBRTE_AVF_INC_VECTOR', 1)
-	sources += files('avf_rxtx_vec_sse.c')
+	sources += files('iavf_rxtx_vec_sse.c')
 endif

drivers/net/meson.build

@@ -4,7 +4,6 @@
 drivers = ['af_packet',
 	'ark',
 	'atlantic',
-	'avf',
 	'avp',
 	'axgbe', 'bonding',
 	'bnx2x',
@@ -17,6 +16,7 @@ drivers = ['af_packet',
 	'enic',
 	'failsafe',
 	'fm10k', 'i40e',
+	'iavf',
 	'ice',
 	'ifc',
 	'ixgbe',

mk/rte.app.mk

@@ -145,7 +145,6 @@ endif
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET)  += -lrte_pmd_af_packet
 _LDLIBS-$(CONFIG_RTE_LIBRTE_ARK_PMD)        += -lrte_pmd_ark
 _LDLIBS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD)   += -lrte_pmd_atlantic
-_LDLIBS-$(CONFIG_RTE_LIBRTE_AVF_PMD)        += -lrte_pmd_avf
 _LDLIBS-$(CONFIG_RTE_LIBRTE_AVP_PMD)        += -lrte_pmd_avp
 _LDLIBS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD)      += -lrte_pmd_axgbe
 _LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD)      += -lrte_pmd_bnx2x -lz
@@ -165,6 +164,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD)       += -lrte_pmd_enic
 _LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD)      += -lrte_pmd_fm10k
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE)   += -lrte_pmd_failsafe
 _LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD)       += -lrte_pmd_i40e
+_LDLIBS-$(CONFIG_RTE_LIBRTE_AVF_PMD)        += -lrte_pmd_iavf
 _LDLIBS-$(CONFIG_RTE_LIBRTE_ICE_PMD)        += -lrte_pmd_ice
 _LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD)      += -lrte_pmd_ixgbe
 ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)