| Message ID | 20231206192919.3826128-2-grzegorz.nitka@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ice: add E825C device family support | expand |
On Wed, Dec 06, 2023 at 08:29:17PM +0100, Grzegorz Nitka wrote: > Introduce new Intel Ethernet E825C family devices. > Add new PCI device IDs which are going to be supported by the > driver: > - 579C: Intel(R) Ethernet Connection E825-C for backplane > - 579D: Intel(R) Ethernet Connection E825-C for QSFP > - 579E: Intel(R) Ethernet Connection E825-C for SFP > - 579F: Intel(R) Ethernet Connection E825-C for SGMII > > Add helper function ice_is_e825c() to verify if the running device > belongs to E825C family. > > Co-developed-by: Jan Glaza <jan.glaza@intel.com> > Signed-off-by: Jan Glaza <jan.glaza@intel.com> > Co-developed-by: Michal Michalik <michal.michalik@intel.com> > Signed-off-by: Michal Michalik <michal.michalik@intel.com> > Signed-off-by: Grzegorz Nitka <grzegorz.nitka@intel.com> Reviewed-by: Simon Horman <horms@kernel.org>
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Grzegorz Nitka > Sent: Thursday, December 7, 2023 12:59 AM > To: intel-wired-lan@lists.osuosl.org > Cc: netdev@vger.kernel.org; Michalik, Michal <michal.michalik@intel.com>; Glaza, Jan <jan.glaza@intel.com> > Subject: [Intel-wired-lan] [PATCH iwl-next v1 1/3] ice: introduce new E825C devices family > > Introduce new Intel Ethernet E825C family devices. > Add new PCI device IDs which are going to be supported by the > driver: > - 579C: Intel(R) Ethernet Connection E825-C for backplane > - 579D: Intel(R) Ethernet Connection E825-C for QSFP > - 579E: Intel(R) Ethernet Connection E825-C for SFP > - 579F: Intel(R) Ethernet Connection E825-C for SGMII > > Add helper function ice_is_e825c() to verify if the running device > belongs to E825C family. > > Co-developed-by: Jan Glaza <jan.glaza@intel.com> > Signed-off-by: Jan Glaza <jan.glaza@intel.com> > Co-developed-by: Michal Michalik <michal.michalik@intel.com> > Signed-off-by: Michal Michalik <michal.michalik@intel.com> > Signed-off-by: Grzegorz Nitka <grzegorz.nitka@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_common.c | 19 +++++++++++++++++++ > drivers/net/ethernet/intel/ice/ice_common.h | 1 + > drivers/net/ethernet/intel/ice/ice_devids.h | 8 ++++++++ > drivers/net/ethernet/intel/ice/ice_main.c | 4 ++++ > 4 files changed, 32 insertions(+) > Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index 41b0ac666cb9..0a519310472b 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -240,6 +240,25 @@ bool ice_is_e823(struct ice_hw *hw) } } +/** + * ice_is_e825c - Check if a device is E825C family device + * @hw: pointer to the hardware structure + * + * Return: true if the device is E825-C based, false if not. + */ +bool ice_is_e825c(struct ice_hw *hw) +{ + switch (hw->device_id) { + case ICE_DEV_ID_E825C_BACKPLANE: + case ICE_DEV_ID_E825C_QSFP: + case ICE_DEV_ID_E825C_SFP: + case ICE_DEV_ID_E825C_SGMII: + return true; + default: + return false; + } +} + /** * ice_clear_pf_cfg - Clear PF configuration * @hw: pointer to the hardware structure diff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h index 9696ed59d1a8..39be42ae3711 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.h +++ b/drivers/net/ethernet/intel/ice/ice_common.h @@ -250,6 +250,7 @@ ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat); bool ice_is_e810t(struct ice_hw *hw); bool ice_is_e823(struct ice_hw *hw); +bool ice_is_e825c(struct ice_hw *hw); int ice_sched_query_elem(struct ice_hw *hw, u32 node_teid, struct ice_aqc_txsched_elem_data *buf); diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h index a2d384dbfc76..9dfae9bce758 100644 --- a/drivers/net/ethernet/intel/ice/ice_devids.h +++ b/drivers/net/ethernet/intel/ice/ice_devids.h @@ -71,5 +71,13 @@ #define ICE_DEV_ID_E822L_10G_BASE_T 0x1899 /* Intel(R) Ethernet Connection E822-L 1GbE */ #define ICE_DEV_ID_E822L_SGMII 0x189A +/* Intel(R) Ethernet Connection E825-C for backplane */ +#define ICE_DEV_ID_E825C_BACKPLANE 0x579c +/* Intel(R) Ethernet Connection E825-C for QSFP */ +#define ICE_DEV_ID_E825C_QSFP 0x579d +/* Intel(R) Ethernet Connection E825-C for SFP */ +#define ICE_DEV_ID_E825C_SFP 0x579e +/* Intel(R) Ethernet Connection E825-C 1GbE */ +#define ICE_DEV_ID_E825C_SGMII 0x579f #endif /* _ICE_DEVIDS_H_ */ diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index c04ee2255d95..0c3b64f65a0d 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5774,6 +5774,10 @@ static const struct pci_device_id ice_pci_tbl[] = { { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_1GBE) }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_QSFP) }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822_SI_DFLT) }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_BACKPLANE), }, + { 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) },