ixgbe: fix issue with sfp events with new X550 devices

Add checks for systems that don't have SFP's to avoid incorrectly
acting on interrupts that are falsely interpreted as SFP events.
We do this by updating the ixgbe_is_sfp to be aware of the
new X550 devices.  This also includes a modified check generating
the EICR mask to be more forward-looking.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 1c3477a974bc5d18b69e7ae1ba124d1aca43efd9..4b681c41a036bf73256aa598fe9f123885f43bf1 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2444,6 +2444,27 @@ static void ixgbe_check_overtemp_event(struct ixgbe_adapter *adapter, u32 eicr)
        e_crit(drv, "%s\n", ixgbe_overheat_msg);
 }
 
+static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
+{
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               if (hw->phy.type == ixgbe_phy_nl)
+                       return true;
+               return false;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X550EM_x:
+               switch (hw->mac.ops.get_media_type(hw)) {
+               case ixgbe_media_type_fiber:
+               case ixgbe_media_type_fiber_qsfp:
+                       return true;
+               default:
+                       return false;
+               }
+       default:
+               return false;
+       }
+}
+
 static void ixgbe_check_sfp_event(struct ixgbe_adapter *adapter, u32 eicr)
 {
        struct ixgbe_hw *hw = &adapter->hw;
@@ -4714,32 +4735,6 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter)
        ixgbe_configure_dfwd(adapter);
 }
 
-static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
-{
-       switch (hw->phy.type) {
-       case ixgbe_phy_sfp_avago:
-       case ixgbe_phy_sfp_ftl:
-       case ixgbe_phy_sfp_intel:
-       case ixgbe_phy_sfp_unknown:
-       case ixgbe_phy_sfp_passive_tyco:
-       case ixgbe_phy_sfp_passive_unknown:
-       case ixgbe_phy_sfp_active_unknown:
-       case ixgbe_phy_sfp_ftl_active:
-       case ixgbe_phy_qsfp_passive_unknown:
-       case ixgbe_phy_qsfp_active_unknown:
-       case ixgbe_phy_qsfp_intel:
-       case ixgbe_phy_qsfp_unknown:
-       /* ixgbe_phy_none is set when no SFP module is present */
-       case ixgbe_phy_none:
-               return true;
-       case ixgbe_phy_nl:
-               if (hw->mac.type == ixgbe_mac_82598EB)
-                       return true;
-       default:
-               return false;
-       }
-}
-
 /**
  * ixgbe_sfp_link_config - set up SFP+ link
  * @adapter: pointer to private adapter struct