intel-ethernet: rename i40evf to iavf

Rename the Intel Ethernet Adaptive Virtual Function driver
(i40evf) to a new name (iavf) that is more consistent with
the ongoing maintenance of the driver as the universal VF driver
for multiple product lines.

This first patch fixes up the directory names and the .ko name,
intentionally ignoring the function names inside the driver
for now.  Basically this is the simplest patch that gets
the rename done and will be followed by other patches that
rename the internal functions.

This patch also addresses a couple of string/name issues
and updates the Copyright year.

Also, made sure to add a MODULE_ALIAS to the old name.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jesse Brandeburg 2018-09-14 17:37:44 -07:00 committed by Jeff Kirsher
parent cf7d97e1e5
commit 8062b2263a
29 changed files with 43 additions and 34 deletions

View File

@ -94,8 +94,8 @@ gianfar.txt
- Gianfar Ethernet Driver. - Gianfar Ethernet Driver.
i40e.txt i40e.txt
- README for the Intel Ethernet Controller XL710 Driver (i40e). - README for the Intel Ethernet Controller XL710 Driver (i40e).
i40evf.txt iavf.txt
- Short note on the Driver for the Intel(R) XL710 X710 Virtual Function - README for the Intel Ethernet Adaptive Virtual Function Driver (iavf).
ieee802154.txt ieee802154.txt
- Linux IEEE 802.15.4 implementation, API and drivers - Linux IEEE 802.15.4 implementation, API and drivers
igb.txt igb.txt

View File

@ -2,7 +2,7 @@ Linux* Base Driver for Intel(R) Network Connection
================================================== ==================================================
Intel Ethernet Adaptive Virtual Function Linux driver. Intel Ethernet Adaptive Virtual Function Linux driver.
Copyright(c) 2013-2017 Intel Corporation. Copyright(c) 2013-2018 Intel Corporation.
Contents Contents
======== ========
@ -11,20 +11,21 @@ Contents
- Known Issues/Troubleshooting - Known Issues/Troubleshooting
- Support - Support
This file describes the i40evf Linux* Base Driver. This file describes the iavf Linux* Base Driver. This driver
was formerly called i40evf.
The i40evf driver supports the below mentioned virtual function The iavf driver supports the below mentioned virtual function
devices and can only be activated on kernels running the i40e or devices and can only be activated on kernels running the i40e or
newer Physical Function (PF) driver compiled with CONFIG_PCI_IOV. newer Physical Function (PF) driver compiled with CONFIG_PCI_IOV.
The i40evf driver requires CONFIG_PCI_MSI to be enabled. The iavf driver requires CONFIG_PCI_MSI to be enabled.
The guest OS loading the i40evf driver must support MSI-X interrupts. The guest OS loading the iavf driver must support MSI-X interrupts.
Supported Hardware Supported Hardware
================== ==================
Intel XL710 X710 Virtual Function Intel XL710 X710 Virtual Function
Intel Ethernet Adaptive Virtual Function
Intel X722 Virtual Function Intel X722 Virtual Function
Intel Ethernet Adaptive Virtual Function
Identifying Your Adapter Identifying Your Adapter
======================== ========================
@ -32,7 +33,8 @@ Identifying Your Adapter
For more information on how to identify your adapter, go to the For more information on how to identify your adapter, go to the
Adapter & Driver ID Guide at: Adapter & Driver ID Guide at:
http://support.intel.com/support/go/network/adapter/idguide.htm https://www.intel.com/content/www/us/en/support/articles/000005584/network-and-i-o/ethernet-products.html
Known Issues/Troubleshooting Known Issues/Troubleshooting
============================ ============================

View File

@ -7332,7 +7332,7 @@ F: Documentation/networking/ixgb.txt
F: Documentation/networking/ixgbe.txt F: Documentation/networking/ixgbe.txt
F: Documentation/networking/ixgbevf.txt F: Documentation/networking/ixgbevf.txt
F: Documentation/networking/i40e.txt F: Documentation/networking/i40e.txt
F: Documentation/networking/i40evf.txt F: Documentation/networking/iavf.txt
F: Documentation/networking/ice.txt F: Documentation/networking/ice.txt
F: drivers/net/ethernet/intel/ F: drivers/net/ethernet/intel/
F: drivers/net/ethernet/intel/*/ F: drivers/net/ethernet/intel/*/

View File

@ -235,20 +235,27 @@ config I40E_DCB
If unsure, say N. If unsure, say N.
# this is here to allow seamless migration from I40EVF --> IAVF name
# so that CONFIG_IAVF symbol will always mirror the state of CONFIG_I40EVF
config IAVF
tristate
config I40EVF config I40EVF
tristate "Intel(R) Ethernet Adaptive Virtual Function support" tristate "Intel(R) Ethernet Adaptive Virtual Function support"
select IAVF
depends on PCI_MSI depends on PCI_MSI
---help--- ---help---
This driver supports virtual functions for Intel XL710, This driver supports virtual functions for Intel XL710,
X710, X722, and all devices advertising support for Intel X710, X722, XXV710, and all devices advertising support for
Ethernet Adaptive Virtual Function devices. For more Intel Ethernet Adaptive Virtual Function devices. For more
information on how to identify your adapter, go to the Adapter information on how to identify your adapter, go to the Adapter
& Driver ID Guide that can be located at: & Driver ID Guide that can be located at:
<http://support.intel.com> <https://support.intel.com>
This driver was formerly named i40evf.
To compile this driver as a module, choose M here. The module To compile this driver as a module, choose M here. The module
will be called i40evf. MSI-X interrupt support is required will be called iavf. MSI-X interrupt support is required
for this driver to work correctly. for this driver to work correctly.
config ICE config ICE

View File

@ -12,6 +12,6 @@ obj-$(CONFIG_IXGBE) += ixgbe/
obj-$(CONFIG_IXGBEVF) += ixgbevf/ obj-$(CONFIG_IXGBEVF) += ixgbevf/
obj-$(CONFIG_I40E) += i40e/ obj-$(CONFIG_I40E) += i40e/
obj-$(CONFIG_IXGB) += ixgb/ obj-$(CONFIG_IXGB) += ixgb/
obj-$(CONFIG_I40EVF) += i40evf/ obj-$(CONFIG_IAVF) += iavf/
obj-$(CONFIG_FM10K) += fm10k/ obj-$(CONFIG_FM10K) += fm10k/
obj-$(CONFIG_ICE) += ice/ obj-$(CONFIG_ICE) += ice/

View File

@ -1,16 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright(c) 2013 - 2018 Intel Corporation.
#
## Makefile for the Intel(R) 40GbE VF driver
#
#
ccflags-y += -I$(src)
subdir-ccflags-y += -I$(src)
obj-$(CONFIG_I40EVF) += i40evf.o
i40evf-objs := i40evf_main.o i40evf_ethtool.o i40evf_virtchnl.o \
i40e_txrx.o i40e_common.o i40e_adminq.o i40evf_client.o

View File

@ -0,0 +1,15 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright(c) 2013 - 2018 Intel Corporation.
#
# Makefile for the Intel(R) Ethernet Adaptive Virtual Function (iavf)
# driver
#
#
ccflags-y += -I$(src)
subdir-ccflags-y += -I$(src)
obj-$(CONFIG_IAVF) += iavf.o
iavf-objs := i40evf_main.o i40evf_ethtool.o i40evf_virtchnl.o \
i40e_txrx.o i40e_common.o i40e_adminq.o i40evf_client.o

View File

@ -17,20 +17,20 @@ static int i40evf_close(struct net_device *netdev);
char i40evf_driver_name[] = "i40evf"; char i40evf_driver_name[] = "i40evf";
static const char i40evf_driver_string[] = static const char i40evf_driver_string[] =
"Intel(R) 40-10 Gigabit Virtual Function Network Driver"; "Intel(R) Ethernet Adaptive Virtual Function Network Driver";
#define DRV_KERN "-k" #define DRV_KERN "-k"
#define DRV_VERSION_MAJOR 3 #define DRV_VERSION_MAJOR 3
#define DRV_VERSION_MINOR 2 #define DRV_VERSION_MINOR 2
#define DRV_VERSION_BUILD 2 #define DRV_VERSION_BUILD 3
#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \ #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
__stringify(DRV_VERSION_MINOR) "." \ __stringify(DRV_VERSION_MINOR) "." \
__stringify(DRV_VERSION_BUILD) \ __stringify(DRV_VERSION_BUILD) \
DRV_KERN DRV_KERN
const char i40evf_driver_version[] = DRV_VERSION; const char i40evf_driver_version[] = DRV_VERSION;
static const char i40evf_copyright[] = static const char i40evf_copyright[] =
"Copyright (c) 2013 - 2015 Intel Corporation."; "Copyright (c) 2013 - 2018 Intel Corporation.";
/* i40evf_pci_tbl - PCI Device ID Table /* i40evf_pci_tbl - PCI Device ID Table
* *
@ -51,6 +51,7 @@ static const struct pci_device_id i40evf_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, i40evf_pci_tbl); MODULE_DEVICE_TABLE(pci, i40evf_pci_tbl);
MODULE_ALIAS("i40evf");
MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
MODULE_DESCRIPTION("Intel(R) XL710 X710 Virtual Function Network Driver"); MODULE_DESCRIPTION("Intel(R) XL710 X710 Virtual Function Network Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");