| Message ID | 20240326163635.1529314-2-paul.greenwalt@intel.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [iwl-next,v1,1/2] ice: add additional E830 device ids | expand |
On 3/26/2024 9:36 AM, Paul Greenwalt wrote: > 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> > --- ... > diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h > index c37b2b450b02..9a1bc434f167 100644 > --- a/drivers/net/ethernet/intel/ice/ice_devids.h > +++ b/drivers/net/ethernet/intel/ice/ice_devids.h > @@ -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_E83CC0_SFP_DD 0x12D4 This doesn't compile; there's a stray '0' here. ../drivers/net/ethernet/intel/ice/ice_common.c:166:14: error: ‘ICE_DEV_ID_E830CC_SFP_DD’ undeclared (first use in this function); did you mean ‘ICE_DEV_ID_E83CC0_SFP_DD’? 166 | case ICE_DEV_ID_E830CC_SFP_DD: | ^~~~~~~~~~~~~~~~~~~~~~~~ | ICE_DEV_ID_E83CC0_SFP_DD ... > /* Intel(R) Ethernet Controller E830-C for backplane */ > #define ICE_DEV_ID_E830C_BACKPLANE 0x12D5 > /* Intel(R) Ethernet Controller E830-C for QSFP */
> On Mar 28, 2024, at 2:16 PM, Tony Nguyen <anthony.l.nguyen@intel.com> wrote: > >> +/* Intel(R) Ethernet Controller E830-CC for SFP-DD */ >> +#define ICE_DEV_ID_E83CC0_SFP_DD 0x12D4 > > This doesn't compile; there's a stray '0' here. Not stray, just mispositioned in the definition above. > ../drivers/net/ethernet/intel/ice/ice_common.c:166:14: error: ‘ICE_DEV_ID_E830CC_SFP_DD’ undeclared (first use in this function); did you mean ‘ICE_DEV_ID_E83CC0_SFP_DD’? > 166 | case ICE_DEV_ID_E830CC_SFP_DD: > | ^~~~~~~~~~~~~~~~~~~~~~~~ > | ICE_DEV_ID_E83CC0_SFP_DD > > ...
On 3/28/2024 2:37 PM, Rustad, Mark D wrote: >> On Mar 28, 2024, at 2:16 PM, Tony Nguyen <anthony.l.nguyen@intel.com> wrote: >> >>> +/* Intel(R) Ethernet Controller E830-CC for SFP-DD */ >>> +#define ICE_DEV_ID_E83CC0_SFP_DD 0x12D4 >> >> This doesn't compile; there's a stray '0' here. > > Not stray, just mispositioned in the definition above. Missed the missing 0. Yea, mispositioned. Thanks Mark :) > >> ../drivers/net/ethernet/intel/ice/ice_common.c:166:14: error: ‘ICE_DEV_ID_E830CC_SFP_DD’ undeclared (first use in this function); did you mean ‘ICE_DEV_ID_E83CC0_SFP_DD’? >> 166 | case ICE_DEV_ID_E830CC_SFP_DD: >> | ^~~~~~~~~~~~~~~~~~~~~~~~ >> | ICE_DEV_ID_E83CC0_SFP_DD >> >> ... >
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index acfae3cd5b6c..199049e08a78 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -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: diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h index c37b2b450b02..9a1bc434f167 100644 --- a/drivers/net/ethernet/intel/ice/ice_devids.h +++ b/drivers/net/ethernet/intel/ice/ice_devids.h @@ -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_E83CC0_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 */ diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 2f198bf3d8b1..3c76c3ffe7a4 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5691,10 +5691,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), },