Commit 87e6c1d7 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher

i40e/i40evf: Add device ids for X722

Adding device ids for new hardware X722
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9dc20a64
...@@ -54,6 +54,15 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) ...@@ -54,6 +54,15 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)
case I40E_DEV_ID_20G_KR2: case I40E_DEV_ID_20G_KR2:
hw->mac.type = I40E_MAC_XL710; hw->mac.type = I40E_MAC_XL710;
break; break;
case I40E_DEV_ID_SFP_X722:
case I40E_DEV_ID_1G_BASE_T_X722:
case I40E_DEV_ID_10G_BASE_T_X722:
hw->mac.type = I40E_MAC_X722;
break;
case I40E_DEV_ID_X722_VF:
case I40E_DEV_ID_X722_VF_HV:
hw->mac.type = I40E_MAC_X722_VF;
break;
case I40E_DEV_ID_VF: case I40E_DEV_ID_VF:
case I40E_DEV_ID_VF_HV: case I40E_DEV_ID_VF_HV:
hw->mac.type = I40E_MAC_VF; hw->mac.type = I40E_MAC_VF;
...@@ -769,6 +778,7 @@ i40e_status i40e_init_shared_code(struct i40e_hw *hw) ...@@ -769,6 +778,7 @@ i40e_status i40e_init_shared_code(struct i40e_hw *hw)
switch (hw->mac.type) { switch (hw->mac.type) {
case I40E_MAC_XL710: case I40E_MAC_XL710:
case I40E_MAC_X722:
break; break;
default: default:
return I40E_ERR_DEVICE_NOT_SUPPORTED; return I40E_ERR_DEVICE_NOT_SUPPORTED;
......
...@@ -76,6 +76,9 @@ static const struct pci_device_id i40e_pci_tbl[] = { ...@@ -76,6 +76,9 @@ static const struct pci_device_id i40e_pci_tbl[] = {
{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_X722), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_X722), 0},
/* required last entry */ /* required last entry */
{0, } {0, }
}; };
......
...@@ -47,6 +47,11 @@ ...@@ -47,6 +47,11 @@
#define I40E_DEV_ID_20G_KR2 0x1587 #define I40E_DEV_ID_20G_KR2 0x1587
#define I40E_DEV_ID_VF 0x154C #define I40E_DEV_ID_VF 0x154C
#define I40E_DEV_ID_VF_HV 0x1571 #define I40E_DEV_ID_VF_HV 0x1571
#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
#define I40E_DEV_ID_X722_VF 0x37CD
#define I40E_DEV_ID_X722_VF_HV 0x37D9
#define i40e_is_40G_device(d) ((d) == I40E_DEV_ID_QSFP_A || \ #define i40e_is_40G_device(d) ((d) == I40E_DEV_ID_QSFP_A || \
(d) == I40E_DEV_ID_QSFP_B || \ (d) == I40E_DEV_ID_QSFP_B || \
...@@ -120,6 +125,8 @@ enum i40e_mac_type { ...@@ -120,6 +125,8 @@ enum i40e_mac_type {
I40E_MAC_X710, I40E_MAC_X710,
I40E_MAC_XL710, I40E_MAC_XL710,
I40E_MAC_VF, I40E_MAC_VF,
I40E_MAC_X722,
I40E_MAC_X722_VF,
I40E_MAC_GENERIC, I40E_MAC_GENERIC,
}; };
...@@ -502,7 +509,8 @@ struct i40e_hw { ...@@ -502,7 +509,8 @@ struct i40e_hw {
static inline bool i40e_is_vf(struct i40e_hw *hw) static inline bool i40e_is_vf(struct i40e_hw *hw)
{ {
return hw->mac.type == I40E_MAC_VF; return (hw->mac.type == I40E_MAC_VF ||
hw->mac.type == I40E_MAC_X722_VF);
} }
struct i40e_driver_version { struct i40e_driver_version {
......
...@@ -54,6 +54,15 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw) ...@@ -54,6 +54,15 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw)
case I40E_DEV_ID_20G_KR2: case I40E_DEV_ID_20G_KR2:
hw->mac.type = I40E_MAC_XL710; hw->mac.type = I40E_MAC_XL710;
break; break;
case I40E_DEV_ID_SFP_X722:
case I40E_DEV_ID_1G_BASE_T_X722:
case I40E_DEV_ID_10G_BASE_T_X722:
hw->mac.type = I40E_MAC_X722;
break;
case I40E_DEV_ID_X722_VF:
case I40E_DEV_ID_X722_VF_HV:
hw->mac.type = I40E_MAC_X722_VF;
break;
case I40E_DEV_ID_VF: case I40E_DEV_ID_VF:
case I40E_DEV_ID_VF_HV: case I40E_DEV_ID_VF_HV:
hw->mac.type = I40E_MAC_VF; hw->mac.type = I40E_MAC_VF;
......
...@@ -47,6 +47,11 @@ ...@@ -47,6 +47,11 @@
#define I40E_DEV_ID_20G_KR2 0x1587 #define I40E_DEV_ID_20G_KR2 0x1587
#define I40E_DEV_ID_VF 0x154C #define I40E_DEV_ID_VF 0x154C
#define I40E_DEV_ID_VF_HV 0x1571 #define I40E_DEV_ID_VF_HV 0x1571
#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
#define I40E_DEV_ID_X722_VF 0x37CD
#define I40E_DEV_ID_X722_VF_HV 0x37D9
#define i40e_is_40G_device(d) ((d) == I40E_DEV_ID_QSFP_A || \ #define i40e_is_40G_device(d) ((d) == I40E_DEV_ID_QSFP_A || \
(d) == I40E_DEV_ID_QSFP_B || \ (d) == I40E_DEV_ID_QSFP_B || \
...@@ -120,6 +125,8 @@ enum i40e_mac_type { ...@@ -120,6 +125,8 @@ enum i40e_mac_type {
I40E_MAC_X710, I40E_MAC_X710,
I40E_MAC_XL710, I40E_MAC_XL710,
I40E_MAC_VF, I40E_MAC_VF,
I40E_MAC_X722,
I40E_MAC_X722_VF,
I40E_MAC_GENERIC, I40E_MAC_GENERIC,
}; };
...@@ -496,7 +503,8 @@ struct i40e_hw { ...@@ -496,7 +503,8 @@ struct i40e_hw {
static inline bool i40e_is_vf(struct i40e_hw *hw) static inline bool i40e_is_vf(struct i40e_hw *hw)
{ {
return hw->mac.type == I40E_MAC_VF; return (hw->mac.type == I40E_MAC_VF ||
hw->mac.type == I40E_MAC_X722_VF);
} }
struct i40e_driver_version { struct i40e_driver_version {
......
...@@ -49,6 +49,7 @@ static const char i40evf_copyright[] = ...@@ -49,6 +49,7 @@ static const char i40evf_copyright[] =
*/ */
static const struct pci_device_id i40evf_pci_tbl[] = { static const struct pci_device_id i40evf_pci_tbl[] = {
{PCI_VDEVICE(INTEL, I40E_DEV_ID_VF), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_VF), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_X722_VF), 0},
/* required last entry */ /* required last entry */
{0, } {0, }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment