ice: add E835 device IDs

E835 is an enhanced version of the E830.
It continues to use the same set of commands, registers and interfaces
as other devices in the 800 Series.

Following device IDs are added:
- 0x1248: Intel(R) Ethernet Controller E835-CC for backplane
- 0x1249: Intel(R) Ethernet Controller E835-CC for QSFP
- 0x124A: Intel(R) Ethernet Controller E835-CC for SFP
- 0x1261: Intel(R) Ethernet Controller E835-C for backplane
- 0x1262: Intel(R) Ethernet Controller E835-C for QSFP
- 0x1263: Intel(R) Ethernet Controller E835-C for SFP
- 0x1265: Intel(R) Ethernet Controller E835-L for backplane
- 0x1266: Intel(R) Ethernet Controller E835-L for QSFP
- 0x1267: Intel(R) Ethernet Controller E835-L for SFP

Reviewed-by: Konrad Knitter <konrad.knitter@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Dawid Osuchowski <dawid.osuchowski@linux.intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index b4fe096ace08c97c933fac9d8e4a43e38da53a5f..b542e1e0f0c9b5b2f3785d00db274eabbb71c8e5 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -171,6 +171,15 @@ static int ice_set_mac_type(struct ice_hw *hw)
        case ICE_DEV_ID_E830_XXV_QSFP:
        case ICE_DEV_ID_E830C_SFP:
        case ICE_DEV_ID_E830_XXV_SFP:
+       case ICE_DEV_ID_E835CC_BACKPLANE:
+       case ICE_DEV_ID_E835CC_QSFP56:
+       case ICE_DEV_ID_E835CC_SFP:
+       case ICE_DEV_ID_E835C_BACKPLANE:
+       case ICE_DEV_ID_E835C_QSFP:
+       case ICE_DEV_ID_E835C_SFP:
+       case ICE_DEV_ID_E835_L_BACKPLANE:
+       case ICE_DEV_ID_E835_L_QSFP:
+       case ICE_DEV_ID_E835_L_SFP:
                hw->mac_type = ICE_MAC_E830;
                break;
        default:

diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h
index 34fd604132f53b6b4f5a193ef849cbb77a4fc219..bd4e66df03729803650a533b080143fd01ccd61e 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_devids.h
+++ b/drivers/net/ethernet/intel/ice/ice_devids.h
@@ -6,6 +6,24 @@
 
 /* Device IDs */
 #define ICE_DEV_ID_E822_SI_DFLT         0x1888
+/* Intel(R) Ethernet Controller E835-CC for backplane */
+#define ICE_DEV_ID_E835CC_BACKPLANE    0x1248
+/* Intel(R) Ethernet Controller E835-CC for QSFP */
+#define ICE_DEV_ID_E835CC_QSFP56       0x1249
+/* Intel(R) Ethernet Controller E835-CC for SFP */
+#define ICE_DEV_ID_E835CC_SFP          0x124A
+/* Intel(R) Ethernet Controller E835-C for backplane */
+#define ICE_DEV_ID_E835C_BACKPLANE     0x1261
+/* Intel(R) Ethernet Controller E835-C for QSFP */
+#define ICE_DEV_ID_E835C_QSFP          0x1262
+/* Intel(R) Ethernet Controller E835-C for SFP */
+#define ICE_DEV_ID_E835C_SFP           0x1263
+/* Intel(R) Ethernet Controller E835-L for backplane */
+#define ICE_DEV_ID_E835_L_BACKPLANE    0x1265
+/* Intel(R) Ethernet Controller E835-L for QSFP */
+#define ICE_DEV_ID_E835_L_QSFP         0x1266
+/* Intel(R) Ethernet Controller E835-L for SFP */
+#define ICE_DEV_ID_E835_L_SFP          0x1267
 /* Intel(R) Ethernet Connection E823-L for backplane */
 #define ICE_DEV_ID_E823L_BACKPLANE     0x124C
 /* Intel(R) Ethernet Connection E823-L for SFP */

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index af68869693edf6004e70caa4e952794439d800ab..204e906af5917a035d1602a05d12a2912faac5c7 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5897,6 +5897,15 @@ static const struct pci_device_id ice_pci_tbl[] = {
        { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_XXV_QSFP), },
        { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_SFP), },
        { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_XXV_SFP), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835CC_BACKPLANE), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835CC_QSFP56), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835CC_SFP), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835C_BACKPLANE), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835C_QSFP), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835C_SFP), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835_L_BACKPLANE), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835_L_QSFP), },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E835_L_SFP), },
        /* required last entry */
        {}
 };