Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/intel/i40e/i40e_common.c

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_20G_KR2:

			hw->mac.type = I40E_MAC_XL710;

			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_HV:

			hw->mac.type = I40E_MAC_VF;
@@ -769,6 +778,7 @@ i40e_status i40e_init_shared_code(struct i40e_hw *hw) 


	switch (hw->mac.type) {

	case I40E_MAC_XL710:

	case I40E_MAC_X722:

		break;

	default:

		return I40E_ERR_DEVICE_NOT_SUPPORTED;

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −0
Original line number Diff line number Diff line
@@ -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_10G_BASE_T), 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 */

	{0, }

};

drivers/net/ethernet/intel/i40e/i40e_type.h

+9 −1
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ 
#define I40E_DEV_ID_20G_KR2		0x1587

#define I40E_DEV_ID_VF			0x154C

#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  || \

					 (d) == I40E_DEV_ID_QSFP_B  || \
@@ -120,6 +125,8 @@ enum i40e_mac_type { 
	I40E_MAC_X710,

	I40E_MAC_XL710,

	I40E_MAC_VF,

	I40E_MAC_X722,

	I40E_MAC_X722_VF,

	I40E_MAC_GENERIC,

};
@@ -502,7 +509,8 @@ struct i40e_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 {

drivers/net/ethernet/intel/i40evf/i40e_common.c

+9 −0
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_20G_KR2:

			hw->mac.type = I40E_MAC_XL710;

			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_HV:

			hw->mac.type = I40E_MAC_VF;

drivers/net/ethernet/intel/i40evf/i40e_type.h

+9 −1
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ 
#define I40E_DEV_ID_20G_KR2		0x1587

#define I40E_DEV_ID_VF			0x154C

#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  || \

					 (d) == I40E_DEV_ID_QSFP_B  || \
@@ -120,6 +125,8 @@ enum i40e_mac_type { 
	I40E_MAC_X710,

	I40E_MAC_XL710,

	I40E_MAC_VF,

	I40E_MAC_X722,

	I40E_MAC_X722_VF,

	I40E_MAC_GENERIC,

};
@@ -496,7 +503,8 @@ struct i40e_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 {