Revert "ixgbe: Manual AN-37 for troublesome link partners for X550 SFI"

[linux-2.6-block.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_x550.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index 2decb0710b6e381b06cc3484a3c166255abc73a3..a5f6449344450cef75fb7f6299fc9d3ce5b7c7dd 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -1722,59 +1722,9 @@ static int ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed)
                return -EINVAL;
        }
 
-       (void)mac->ops.write_iosf_sb_reg(hw,
-                       IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
-
-       /* change mode enforcement rules to hybrid */
-       (void)mac->ops.read_iosf_sb_reg(hw,
-                       IXGBE_KRM_FLX_TMRS_CTRL_ST31(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
-       reg_val |= 0x0400;
-
-       (void)mac->ops.write_iosf_sb_reg(hw,
-                       IXGBE_KRM_FLX_TMRS_CTRL_ST31(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
-
-       /* manually control the config */
-       (void)mac->ops.read_iosf_sb_reg(hw,
-                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
-       reg_val |= 0x20002240;
-
-       (void)mac->ops.write_iosf_sb_reg(hw,
-                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
-
-       /* move the AN base page values */
-       (void)mac->ops.read_iosf_sb_reg(hw,
-                       IXGBE_KRM_PCS_KX_AN(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
-       reg_val |= 0x1;
-
-       (void)mac->ops.write_iosf_sb_reg(hw,
-                       IXGBE_KRM_PCS_KX_AN(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
-
-       /* set the AN37 over CB mode */
-       (void)mac->ops.read_iosf_sb_reg(hw,
-                       IXGBE_KRM_AN_CNTL_4(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
-       reg_val |= 0x20000000;
-
-       (void)mac->ops.write_iosf_sb_reg(hw,
-                       IXGBE_KRM_AN_CNTL_4(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
-
-       /* restart AN manually */
-       (void)mac->ops.read_iosf_sb_reg(hw,
-                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
-       reg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;
-
-       (void)mac->ops.write_iosf_sb_reg(hw,
-                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
+       status = mac->ops.write_iosf_sb_reg(hw,
+                               IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
 
        /* Toggle port SW reset by AN reset. */
        status = ixgbe_restart_an_internal_phy_x550em(hw);