Skip to content

Commit a8e682f

Browse files
pgreenwaanguy11
authored andcommitted
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: Wojciech Drewek <wojciech.drewek@intel.com> Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 4fd1040 commit a8e682f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ static int ice_set_mac_type(struct ice_hw *hw)
160160
case ICE_DEV_ID_E825C_SGMII:
161161
hw->mac_type = ICE_MAC_GENERIC_3K_E825;
162162
break;
163-
case ICE_DEV_ID_E830_BACKPLANE:
164-
case ICE_DEV_ID_E830_QSFP56:
165-
case ICE_DEV_ID_E830_SFP:
166-
case ICE_DEV_ID_E830_SFP_DD:
163+
case ICE_DEV_ID_E830CC_BACKPLANE:
164+
case ICE_DEV_ID_E830CC_QSFP56:
165+
case ICE_DEV_ID_E830CC_SFP:
166+
case ICE_DEV_ID_E830CC_SFP_DD:
167167
case ICE_DEV_ID_E830C_BACKPLANE:
168168
case ICE_DEV_ID_E830_XXV_BACKPLANE:
169169
case ICE_DEV_ID_E830C_QSFP:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
#define ICE_DEV_ID_E823L_1GBE 0x124F
1717
/* Intel(R) Ethernet Connection E823-L for QSFP */
1818
#define ICE_DEV_ID_E823L_QSFP 0x151D
19-
/* Intel(R) Ethernet Controller E830-C for backplane */
20-
#define ICE_DEV_ID_E830_BACKPLANE 0x12D1
21-
/* Intel(R) Ethernet Controller E830-C for QSFP */
22-
#define ICE_DEV_ID_E830_QSFP56 0x12D2
23-
/* Intel(R) Ethernet Controller E830-C for SFP */
24-
#define ICE_DEV_ID_E830_SFP 0x12D3
25-
/* Intel(R) Ethernet Controller E830-C for SFP-DD */
26-
#define ICE_DEV_ID_E830_SFP_DD 0x12D4
19+
/* Intel(R) Ethernet Controller E830-CC for backplane */
20+
#define ICE_DEV_ID_E830CC_BACKPLANE 0x12D1
21+
/* Intel(R) Ethernet Controller E830-CC for QSFP */
22+
#define ICE_DEV_ID_E830CC_QSFP56 0x12D2
23+
/* Intel(R) Ethernet Controller E830-CC for SFP */
24+
#define ICE_DEV_ID_E830CC_SFP 0x12D3
25+
/* Intel(R) Ethernet Controller E830-CC for SFP-DD */
26+
#define ICE_DEV_ID_E830CC_SFP_DD 0x12D4
2727
/* Intel(R) Ethernet Controller E830-C for backplane */
2828
#define ICE_DEV_ID_E830C_BACKPLANE 0x12D5
2929
/* Intel(R) Ethernet Controller E830-C for QSFP */

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5805,10 +5805,10 @@ static const struct pci_device_id ice_pci_tbl[] = {
58055805
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_QSFP), },
58065806
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_SFP), },
58075807
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_SGMII), },
5808-
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_BACKPLANE) },
5809-
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_QSFP56) },
5810-
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_SFP) },
5811-
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_SFP_DD) },
5808+
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_BACKPLANE) },
5809+
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_QSFP56) },
5810+
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_SFP) },
5811+
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_SFP_DD) },
58125812
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_BACKPLANE), },
58135813
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_XXV_BACKPLANE), },
58145814
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_QSFP), },

0 commit comments

Comments
 (0)