i40evf: Add support for Adaptive Virtual Function

Add device ID define and mac_type assignment needed for
Adaptive Virtual Function (VF Base Mode Support).

Also, update version to v3.0.0 in order to indicate
clearly that this is the first driver supporting the AVF
device ID.

Signed-off-by: Preethi Banala <preethi.banala@intel.com>
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>

diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 1542a2158e962d66915d6330e6d94fb215735b5c..1feb54b6d92e1e9f504f01ec076222ead66b59d7 100644 (file)
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -236,12 +236,14 @@ config I40E_DCB
          If unsure, say N.
 
 config I40EVF
-       tristate "Intel(R) XL710 X710 Virtual Function Ethernet support"
+       tristate "Intel(R) Ethernet Adaptive Virtual Function support"
        depends on PCI_MSI
        ---help---
-         This driver supports Intel(R) XL710 and X710 virtual functions.
-         For more information on how to identify your adapter, go to the
-         Adapter & Driver ID Guide that can be located at:
+         This driver supports virtual functions for Intel XL710,
+         X710, X722, and all devices advertising support for Intel
+         Ethernet Adaptive Virtual Function devices. For more
+         information on how to identify your adapter, go to the Adapter
+         & Driver ID Guide that can be located at:
 
          <http://support.intel.com>
 

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c
index 9dec7753911c927328f8639739ca306f2a6e73b6..1dd1938f594f533d0bbc807af284ee062dad854a 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c
@@ -68,6 +68,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw)
                        break;
                case I40E_DEV_ID_VF:
                case I40E_DEV_ID_VF_HV:
+               case I40E_DEV_ID_ADAPTIVE_VF:
                        hw->mac.type = I40E_MAC_VF;
                        break;
                default:

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_devids.h b/drivers/net/ethernet/intel/i40evf/i40e_devids.h
index d76393c9505606a815d54833ec9f11dc2f64576f..0469e4bfd3ec2437d2fc7eebaaeb6ff199ab8537 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_devids.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_devids.h
@@ -43,6 +43,7 @@
 #define I40E_DEV_ID_25G_SFP28          0x158B
 #define I40E_DEV_ID_VF                 0x154C
 #define I40E_DEV_ID_VF_HV              0x1571
+#define I40E_DEV_ID_ADAPTIVE_VF                0x1889
 #define I40E_DEV_ID_SFP_X722           0x37D0
 #define I40E_DEV_ID_1G_BASE_T_X722     0x37D1
 #define I40E_DEV_ID_10G_BASE_T_X722    0x37D2

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 1b00274de5304b1029225fff37c0aaceb8531ae7..3a3ca965b24272ee3896c39c6dd9ada9648d11eb 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -44,9 +44,9 @@ static const char i40evf_driver_string[] =
 
 #define DRV_KERN "-k"
 
-#define DRV_VERSION_MAJOR 2
-#define DRV_VERSION_MINOR 1
-#define DRV_VERSION_BUILD 14
+#define DRV_VERSION_MAJOR 3
+#define DRV_VERSION_MINOR 0
+#define DRV_VERSION_BUILD 0
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
             __stringify(DRV_VERSION_MINOR) "." \
             __stringify(DRV_VERSION_BUILD) \
@@ -67,6 +67,7 @@ static const struct pci_device_id i40evf_pci_tbl[] = {
        {PCI_VDEVICE(INTEL, I40E_DEV_ID_VF), 0},
        {PCI_VDEVICE(INTEL, I40E_DEV_ID_VF_HV), 0},
        {PCI_VDEVICE(INTEL, I40E_DEV_ID_X722_VF), 0},
+       {PCI_VDEVICE(INTEL, I40E_DEV_ID_ADAPTIVE_VF), 0},
        /* required last entry */
        {0, }
 };