Commit a8e682f0 authored by Paul Greenwalt's avatar Paul Greenwalt Committed by Tony Nguyen
Browse files

ice: update E830 device ids and comments 



Update existing E830 device ids and comments to align with new naming 'C'
for 100G and 'CC' for 200G.

Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: default avatarPaul Greenwalt <paul.greenwalt@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 4fd10401

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

+4 −4
Original line number Diff line number Diff line
@@ -160,10 +160,10 @@ static int ice_set_mac_type(struct ice_hw *hw) 
	case ICE_DEV_ID_E825C_SGMII:

		hw->mac_type = ICE_MAC_GENERIC_3K_E825;

		break;

	case ICE_DEV_ID_E830_BACKPLANE:

	case ICE_DEV_ID_E830_QSFP56:

	case ICE_DEV_ID_E830_SFP:

	case ICE_DEV_ID_E830_SFP_DD:

	case ICE_DEV_ID_E830CC_BACKPLANE:

	case ICE_DEV_ID_E830CC_QSFP56:

	case ICE_DEV_ID_E830CC_SFP:

	case ICE_DEV_ID_E830CC_SFP_DD:

	case ICE_DEV_ID_E830C_BACKPLANE:

	case ICE_DEV_ID_E830_XXV_BACKPLANE:

	case ICE_DEV_ID_E830C_QSFP:

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

+8 −8
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ 
#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 E830-C for backplane */

#define ICE_DEV_ID_E830_BACKPLANE	0x12D1

/* Intel(R) Ethernet Controller E830-C for QSFP */

#define ICE_DEV_ID_E830_QSFP56		0x12D2

/* Intel(R) Ethernet Controller E830-C for SFP */

#define ICE_DEV_ID_E830_SFP		0x12D3

/* Intel(R) Ethernet Controller E830-C for SFP-DD */

#define ICE_DEV_ID_E830_SFP_DD		0x12D4

/* Intel(R) Ethernet Controller E830-CC for backplane */

#define ICE_DEV_ID_E830CC_BACKPLANE	0x12D1

/* Intel(R) Ethernet Controller E830-CC for QSFP */

#define ICE_DEV_ID_E830CC_QSFP56	0x12D2

/* Intel(R) Ethernet Controller E830-CC for SFP */

#define ICE_DEV_ID_E830CC_SFP		0x12D3

/* Intel(R) Ethernet Controller E830-CC for SFP-DD */

#define ICE_DEV_ID_E830CC_SFP_DD	0x12D4

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

#define ICE_DEV_ID_E830C_BACKPLANE	0x12D5

/* Intel(R) Ethernet Controller E830-C for QSFP */

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

+4 −4
Original line number Diff line number Diff line
@@ -5805,10 +5805,10 @@ static const struct pci_device_id ice_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_QSFP), },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_SFP), },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_SGMII), },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_BACKPLANE) },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_QSFP56) },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_SFP) },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_SFP_DD) },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_BACKPLANE) },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_QSFP56) },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_SFP) },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_SFP_DD) },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_BACKPLANE), },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_XXV_BACKPLANE), },

	{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_QSFP), },