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

Commit ab60085e authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

i40e: Fix device ID define names to align to standard 



Rework the device ID #defines to follow the _DEV_ID convention
already established in the other Intel drivers.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d488727

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

+12 −12
Original line number Diff line number Diff line
@@ -42,20 +42,20 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 


	if (hw->vendor_id == PCI_VENDOR_ID_INTEL) {

		switch (hw->device_id) {

		case I40E_SFP_XL710_DEVICE_ID:

		case I40E_SFP_X710_DEVICE_ID:

		case I40E_QEMU_DEVICE_ID:

		case I40E_KX_A_DEVICE_ID:

		case I40E_KX_B_DEVICE_ID:

		case I40E_KX_C_DEVICE_ID:

		case I40E_KX_D_DEVICE_ID:

		case I40E_QSFP_A_DEVICE_ID:

		case I40E_QSFP_B_DEVICE_ID:

		case I40E_QSFP_C_DEVICE_ID:

		case I40E_DEV_ID_SFP_XL710:

		case I40E_DEV_ID_SFP_X710:

		case I40E_DEV_ID_QEMU:

		case I40E_DEV_ID_KX_A:

		case I40E_DEV_ID_KX_B:

		case I40E_DEV_ID_KX_C:

		case I40E_DEV_ID_KX_D:

		case I40E_DEV_ID_QSFP_A:

		case I40E_DEV_ID_QSFP_B:

		case I40E_DEV_ID_QSFP_C:

			hw->mac.type = I40E_MAC_XL710;

			break;

		case I40E_VF_DEVICE_ID:

		case I40E_VF_HV_DEVICE_ID:

		case I40E_DEV_ID_VF:

		case I40E_DEV_ID_VF_HV:

			hw->mac.type = I40E_MAC_VF;

			break;

		default:

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

+11 −11
Original line number Diff line number Diff line
@@ -65,16 +65,16 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb); 
 *   Class, Class Mask, private data (not used) }

 */

static DEFINE_PCI_DEVICE_TABLE(i40e_pci_tbl) = {

	{PCI_VDEVICE(INTEL, I40E_SFP_XL710_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_SFP_X710_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_QEMU_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_KX_A_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_KX_B_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_KX_C_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_KX_D_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_QSFP_A_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_QSFP_B_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_QSFP_C_DEVICE_ID), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_XL710), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X710), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QEMU), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_A), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_B), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_C), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_D), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_A), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},

	/* required last entry */

	{0, }

};
@@ -469,7 +469,7 @@ static void i40e_stat_update48(struct i40e_hw *hw, u32 hireg, u32 loreg, 
{

	u64 new_data;



	if (hw->device_id == I40E_QEMU_DEVICE_ID) {

	if (hw->device_id == I40E_DEV_ID_QEMU) {

		new_data = rd32(hw, loreg);

		new_data |= ((u64)(rd32(hw, hireg) & 0xFFFF)) << 32;

	} else {

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

+16 −16
Original line number Diff line number Diff line
@@ -35,22 +35,22 @@ 
#include "i40e_lan_hmc.h"



/* Device IDs */

#define I40E_SFP_XL710_DEVICE_ID	0x1572

#define I40E_SFP_X710_DEVICE_ID		0x1573

#define I40E_QEMU_DEVICE_ID		0x1574

#define I40E_KX_A_DEVICE_ID		0x157F

#define I40E_KX_B_DEVICE_ID		0x1580

#define I40E_KX_C_DEVICE_ID		0x1581

#define I40E_KX_D_DEVICE_ID		0x1582

#define I40E_QSFP_A_DEVICE_ID		0x1583

#define I40E_QSFP_B_DEVICE_ID		0x1584

#define I40E_QSFP_C_DEVICE_ID		0x1585

#define I40E_VF_DEVICE_ID		0x154C

#define I40E_VF_HV_DEVICE_ID		0x1571



#define i40e_is_40G_device(d)		((d) == I40E_QSFP_A_DEVICE_ID  || \

					 (d) == I40E_QSFP_B_DEVICE_ID  || \

					 (d) == I40E_QSFP_C_DEVICE_ID)

#define I40E_DEV_ID_SFP_XL710		0x1572

#define I40E_DEV_ID_SFP_X710		0x1573

#define I40E_DEV_ID_QEMU		0x1574

#define I40E_DEV_ID_KX_A		0x157F

#define I40E_DEV_ID_KX_B		0x1580

#define I40E_DEV_ID_KX_C		0x1581

#define I40E_DEV_ID_KX_D		0x1582

#define I40E_DEV_ID_QSFP_A		0x1583

#define I40E_DEV_ID_QSFP_B		0x1584

#define I40E_DEV_ID_QSFP_C		0x1585

#define I40E_DEV_ID_VF			0x154C

#define I40E_DEV_ID_VF_HV		0x1571



#define i40e_is_40G_device(d)		((d) == I40E_DEV_ID_QSFP_A  || \

					 (d) == I40E_DEV_ID_QSFP_B  || \

					 (d) == I40E_DEV_ID_QSFP_C)



#define I40E_MAX_VSI_QP			16

#define I40E_MAX_VF_VSI			3

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

+2 −2
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static bool i40e_vfs_are_assigned(struct i40e_pf *pf) 
	struct pci_dev *vfdev;



	/* loop through all the VFs to see if we own any that are assigned */

	vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, I40E_VF_DEVICE_ID , NULL);

	vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_VF , NULL);

	while (vfdev) {

		/* if we don't own it we don't care */

		if (vfdev->is_virtfn && pci_physfn(vfdev) == pdev) {
@@ -710,7 +710,7 @@ static bool i40e_vfs_are_assigned(struct i40e_pf *pf) 
		}



		vfdev = pci_get_device(PCI_VENDOR_ID_INTEL,

				       I40E_VF_DEVICE_ID,

				       I40E_DEV_ID_VF,

				       vfdev);

	}

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

+12 −12
Original line number Diff line number Diff line
@@ -39,20 +39,20 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw) 


	if (hw->vendor_id == PCI_VENDOR_ID_INTEL) {

		switch (hw->device_id) {

		case I40E_SFP_XL710_DEVICE_ID:

		case I40E_SFP_X710_DEVICE_ID:

		case I40E_QEMU_DEVICE_ID:

		case I40E_KX_A_DEVICE_ID:

		case I40E_KX_B_DEVICE_ID:

		case I40E_KX_C_DEVICE_ID:

		case I40E_KX_D_DEVICE_ID:

		case I40E_QSFP_A_DEVICE_ID:

		case I40E_QSFP_B_DEVICE_ID:

		case I40E_QSFP_C_DEVICE_ID:

		case I40E_DEV_ID_SFP_XL710:

		case I40E_DEV_ID_SFP_X710:

		case I40E_DEV_ID_QEMU:

		case I40E_DEV_ID_KX_A:

		case I40E_DEV_ID_KX_B:

		case I40E_DEV_ID_KX_C:

		case I40E_DEV_ID_KX_D:

		case I40E_DEV_ID_QSFP_A:

		case I40E_DEV_ID_QSFP_B:

		case I40E_DEV_ID_QSFP_C:

			hw->mac.type = I40E_MAC_XL710;

			break;

		case I40E_VF_DEVICE_ID:

		case I40E_VF_HV_DEVICE_ID:

		case I40E_DEV_ID_VF:

		case I40E_DEV_ID_VF_HV:

			hw->mac.type = I40E_MAC_VF;

			break;

		default: