ixgbe: add support for 1G SX modules

This patch adds support for 1G Fiber PHY modules (SFP+ modules). This support
comes along side support for 1G Copper PHY modules, but uses a different PHY
type (ixgbe_sfp_type_1g_sx_core).

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 19 insertions, 4 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index 24117709d6a2..71659edf81aa 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -907,6 +907,8 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                   * 8   SFP_act_lmt_DA_CORE1 - 82599-specific
                   * 9   SFP_1g_cu_CORE0 - 82599-specific
                   * 10  SFP_1g_cu_CORE1 - 82599-specific
+                  * 11  SFP_1g_sx_CORE0 - 82599-specific
+                  * 12  SFP_1g_sx_CORE1 - 82599-specific
                   */
                 if (hw->mac.type == ixgbe_mac_82598EB) {
                         if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
@@ -957,6 +959,13 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                                 else
                                         hw->phy.sfp_type =
                                                 ixgbe_sfp_type_1g_cu_core1;
+                        } else if (comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) {
+                                if (hw->bus.lan_id == 0)
+                                        hw->phy.sfp_type =
+                                                ixgbe_sfp_type_1g_sx_core0;
+                                else
+                                        hw->phy.sfp_type =
+                                                ixgbe_sfp_type_1g_sx_core1;
                         } else {
                                 hw->phy.sfp_type = ixgbe_sfp_type_unknown;
                         }
@@ -1049,7 +1058,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                 /* Verify supported 1G SFP modules */
                 if (comp_codes_10g == 0 &&
                     !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
-                      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0)) {
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) {
                         hw->phy.type = ixgbe_phy_sfp_unsupported;
                         status = IXGBE_ERR_SFP_NOT_SUPPORTED;
                         goto out;
@@ -1064,7 +1075,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                 hw->mac.ops.get_device_caps(hw, &enforce_sfp);
                 if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP) &&
                     !((hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0) ||
-                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1))) {
+                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) ||
+                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0) ||
+                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1))) {
                         /* Make sure we're a supported PHY type */
                         if (hw->phy.type == ixgbe_phy_sfp_intel) {
                                 status = 0;
@@ -1128,10 +1141,12 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
          * SR modules
          */
         if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||
-            sfp_type == ixgbe_sfp_type_1g_cu_core0)
+            sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+            sfp_type == ixgbe_sfp_type_1g_sx_core0)
                 sfp_type = ixgbe_sfp_type_srlr_core0;
         else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||
-                 sfp_type == ixgbe_sfp_type_1g_cu_core1)
+                 sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+                 sfp_type == ixgbe_sfp_type_1g_sx_core1)
                 sfp_type = ixgbe_sfp_type_srlr_core1;
 
         /* Read offset to PHY init contents */