Commit e36aeec0 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

ice: add support for E823 devices 



Add E823 device ids and convert conditional expressions to a more
appropriate switch statement.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 195fb977

drivers/net/ethernet/intel/ice/ice_devids.h

+20 −0
Original line number Diff line number Diff line
@@ -5,6 +5,16 @@ 
#define _ICE_DEVIDS_H_



/* Device IDs */

/* Intel(R) Ethernet Connection E823-L for backplane */

#define ICE_DEV_ID_E823L_BACKPLANE	0x124C

/* Intel(R) Ethernet Connection E823-L for SFP */

#define ICE_DEV_ID_E823L_SFP		0x124D

/* Intel(R) Ethernet Connection E823-L/X557-AT 10GBASE-T */

#define ICE_DEV_ID_E823L_10G_BASE_T	0x124E

/* Intel(R) Ethernet Connection E823-L 1GbE */

#define ICE_DEV_ID_E823L_1GBE		0x124F

/* Intel(R) Ethernet Connection E823-L for QSFP */

#define ICE_DEV_ID_E823L_QSFP		0x151D

/* Intel(R) Ethernet Controller E810-C for backplane */

#define ICE_DEV_ID_E810C_BACKPLANE	0x1591

/* Intel(R) Ethernet Controller E810-C for QSFP */
@@ -13,6 +23,16 @@ 
#define ICE_DEV_ID_E810C_SFP		0x1593

/* Intel(R) Ethernet Controller E810-XXV for SFP */

#define ICE_DEV_ID_E810_XXV_SFP		0x159B

/* Intel(R) Ethernet Connection E823-C for backplane */

#define ICE_DEV_ID_E823C_BACKPLANE	0x188A

/* Intel(R) Ethernet Connection E823-C for QSFP */

#define ICE_DEV_ID_E823C_QSFP		0x188B

/* Intel(R) Ethernet Connection E823-C for SFP */

#define ICE_DEV_ID_E823C_SFP		0x188C

/* Intel(R) Ethernet Connection E823-C/X557-AT 10GBASE-T */

#define ICE_DEV_ID_E823C_10G_BASE_T	0x188D

/* Intel(R) Ethernet Connection E823-C 1GbE */

#define ICE_DEV_ID_E823C_SGMII		0x188E

/* Intel(R) Ethernet Connection E822-C for backplane */

#define ICE_DEV_ID_E822C_BACKPLANE	0x1890

/* Intel(R) Ethernet Connection E822-C for QSFP */

drivers/net/ethernet/intel/ice/ice_main.c

+10 −0
Original line number Diff line number Diff line
@@ -3553,6 +3553,11 @@ static const struct pci_device_id ice_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_QSFP), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_SFP), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_SFP), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_BACKPLANE), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_QSFP), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_SFP), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_10G_BASE_T), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_SGMII), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_BACKPLANE), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_QSFP), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_SFP), 0 },
@@ -3562,6 +3567,11 @@ static const struct pci_device_id ice_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_SFP), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_10G_BASE_T), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_SGMII), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_BACKPLANE), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_SFP), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_10G_BASE_T), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_1GBE), 0 },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_QSFP), 0 },

	/* required last entry */

	{ 0, }

};

drivers/net/ethernet/intel/ice/ice_nvm.c

+23 −9
Original line number Diff line number Diff line
@@ -289,17 +289,31 @@ enum ice_status ice_init_nvm(struct ice_hw *hw) 


	nvm->eetrack = (eetrack_hi << 16) | eetrack_lo;



	switch (hw->device_id) {

	/* the following devices do not have boot_cfg_tlv yet */

	if (hw->device_id == ICE_DEV_ID_E822C_BACKPLANE ||

	    hw->device_id == ICE_DEV_ID_E822C_QSFP ||

	    hw->device_id == ICE_DEV_ID_E822C_10G_BASE_T ||

	    hw->device_id == ICE_DEV_ID_E822C_SGMII ||

	    hw->device_id == ICE_DEV_ID_E822C_SFP ||

	    hw->device_id == ICE_DEV_ID_E822X_BACKPLANE ||

	    hw->device_id == ICE_DEV_ID_E822L_SFP ||

	    hw->device_id == ICE_DEV_ID_E822L_10G_BASE_T ||

	    hw->device_id == ICE_DEV_ID_E822L_SGMII)

	case ICE_DEV_ID_E823C_BACKPLANE:

	case ICE_DEV_ID_E823C_QSFP:

	case ICE_DEV_ID_E823C_SFP:

	case ICE_DEV_ID_E823C_10G_BASE_T:

	case ICE_DEV_ID_E823C_SGMII:

	case ICE_DEV_ID_E822C_BACKPLANE:

	case ICE_DEV_ID_E822C_QSFP:

	case ICE_DEV_ID_E822C_10G_BASE_T:

	case ICE_DEV_ID_E822C_SGMII:

	case ICE_DEV_ID_E822C_SFP:

	case ICE_DEV_ID_E822X_BACKPLANE:

	case ICE_DEV_ID_E822L_SFP:

	case ICE_DEV_ID_E822L_10G_BASE_T:

	case ICE_DEV_ID_E822L_SGMII:

	case ICE_DEV_ID_E823L_BACKPLANE:

	case ICE_DEV_ID_E823L_SFP:

	case ICE_DEV_ID_E823L_10G_BASE_T:

	case ICE_DEV_ID_E823L_1GBE:

	case ICE_DEV_ID_E823L_QSFP:

		return status;

	default:

		break;

	}



	status = ice_get_pfa_module_tlv(hw, &boot_cfg_tlv, &boot_cfg_tlv_len,

					ICE_SR_BOOT_CFG_PTR);

CRA Git | Maintained and supported by SUSTech CRA and CCSE