ixgbe: Remove unnecessary PHY reset, properly identify multispeed fiber modules

This patch does two things:
1) On 82599, the PHY is emedded in the MAC.  On 82598, the SFP+ NIC has an external PHY.  The reset in the SFP+ setup patch for 82598 is unnecessary on 82599, and adds extra dead time to device initialization.  This removes that PHY reset for 82599 only.

2) On 82599, the SFP+ modules are multispeed fiber modules (10G/1G).  We need to make sure to identify them properly for the remaining init sections to properly set them up.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 9a9998985004..72a0d27a19af 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -102,6 +102,9 @@ s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)
 
         if (hw->phy.sfp_type != ixgbe_sfp_type_unknown) {
                 ixgbe_init_mac_link_ops_82599(hw);
+
+                hw->phy.ops.reset = NULL;
+
                 ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,
                                                               &data_offset);
 
@@ -716,19 +719,24 @@ s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
         /* Call adapter stop to disable tx/rx and clear interrupts */
         hw->mac.ops.stop_adapter(hw);
 
-        /* Reset PHY */
-        if (hw->phy.reset_disable == false) {
-                /* PHY ops must be identified and initialized prior to reset */
+        /* PHY ops must be identified and initialized prior to reset */
 
-                /* Init PHY and function pointers, perform SFP setup */
-                status = hw->phy.ops.init(hw);
+        /* Init PHY and function pointers, perform SFP setup */
+        status = hw->phy.ops.init(hw);
 
-                if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
-                        goto reset_hw_out;
+        if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
+                goto reset_hw_out;
 
-                hw->phy.ops.reset(hw);
+        /* Setup SFP module if there is one present. */
+        if (hw->phy.sfp_setup_needed) {
+                status = hw->mac.ops.setup_sfp(hw);
+                hw->phy.sfp_setup_needed = false;
         }
 
+        /* Reset PHY */
+        if (hw->phy.reset_disable == false && hw->phy.ops.reset != NULL)
+                hw->phy.ops.reset(hw);
+
         /*
          * Prevent the PCI-E bus from from hanging by disabling PCI-E master
          * access and verify no pending requests before reset