net/ixgbe/base: support FW commands to control some PHYs
[dpdk.git] / drivers / net / ixgbe / base / ixgbe_x550.c
index bf3da10..0a041b7 100644 (file)
@@ -41,6 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 STATIC s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed);
 STATIC s32 ixgbe_acquire_swfw_sync_X550a(struct ixgbe_hw *, u32 mask);
 STATIC void ixgbe_release_swfw_sync_X550a(struct ixgbe_hw *, u32 mask);
+STATIC s32 ixgbe_read_mng_if_sel_x550em(struct ixgbe_hw *hw);
 
 /**
  *  ixgbe_init_ops_X550 - Inits func ptrs and MAC type
@@ -61,7 +62,7 @@ s32 ixgbe_init_ops_X550(struct ixgbe_hw *hw)
        mac->ops.dmac_config = ixgbe_dmac_config_X550;
        mac->ops.dmac_config_tcs = ixgbe_dmac_config_tcs_X550;
        mac->ops.dmac_update_tcs = ixgbe_dmac_update_tcs_X550;
-       mac->ops.setup_eee = ixgbe_setup_eee_X550;
+       mac->ops.setup_eee = NULL;
        mac->ops.set_source_address_pruning =
                        ixgbe_set_source_address_pruning_X550;
        mac->ops.set_ethertype_anti_spoofing =
@@ -82,6 +83,8 @@ s32 ixgbe_init_ops_X550(struct ixgbe_hw *hw)
        mac->ops.mdd_event = ixgbe_mdd_event_X550;
        mac->ops.restore_mdd_vf = ixgbe_restore_mdd_vf_X550;
        mac->ops.disable_rx = ixgbe_disable_rx_x550;
+       /* Manageability interface */
+       mac->ops.set_fw_drv_ver = ixgbe_set_fw_drv_ver_x550;
        switch (hw->device_id) {
        case IXGBE_DEV_ID_X550EM_X_10G_T:
        case IXGBE_DEV_ID_X550EM_A_10G_T:
@@ -428,18 +431,15 @@ STATIC s32 ixgbe_write_phy_reg_mdi_22(struct ixgbe_hw *hw, u32 reg_addr,
  */
 STATIC s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)
 {
+       hw->mac.ops.set_lan_id(hw);
+
+       ixgbe_read_mng_if_sel_x550em(hw);
+
        switch (hw->device_id) {
        case IXGBE_DEV_ID_X550EM_A_SFP:
-               hw->phy.ops.read_reg = ixgbe_read_phy_reg_x550a;
-               hw->phy.ops.write_reg = ixgbe_write_phy_reg_x550a;
-               if (hw->bus.lan_id)
-                       hw->phy.phy_semaphore_mask |= IXGBE_GSSR_PHY1_SM;
-               else
-                       hw->phy.phy_semaphore_mask |= IXGBE_GSSR_PHY0_SM;
                return ixgbe_identify_module_generic(hw);
        case IXGBE_DEV_ID_X550EM_X_SFP:
                /* set up for CS4227 usage */
-               hw->phy.phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;
                ixgbe_setup_mux_ctl(hw);
                ixgbe_check_cs4227(hw);
                /* Fallthrough */
@@ -456,9 +456,6 @@ STATIC s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)
                hw->phy.type = ixgbe_phy_x550em_kr;
                break;
        case IXGBE_DEV_ID_X550EM_A_10G_T:
-               hw->phy.ops.read_reg = ixgbe_read_phy_reg_x550a;
-               hw->phy.ops.write_reg = ixgbe_write_phy_reg_x550a;
-       /* Fallthrough to ixgbe_identify_phy_generic */
        case IXGBE_DEV_ID_X550EM_A_1G_T:
        case IXGBE_DEV_ID_X550EM_A_1G_T_L:
        case IXGBE_DEV_ID_X550EM_X_1G_T:
@@ -470,6 +467,133 @@ STATIC s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)
        return IXGBE_SUCCESS;
 }
 
+/**
+ * ixgbe_fw_phy_activity - Perform an activity on a PHY
+ * @hw: pointer to hardware structure
+ * @activity: activity to perform
+ * @data: Pointer to 4 32-bit words of data
+ */
+s32 ixgbe_fw_phy_activity(struct ixgbe_hw *hw, u16 activity,
+                         u32 (*data)[FW_PHY_ACT_DATA_COUNT])
+{
+       union {
+               struct ixgbe_hic_phy_activity_req cmd;
+               struct ixgbe_hic_phy_activity_resp rsp;
+       } hic;
+       u16 retries = FW_PHY_ACT_RETRIES;
+       s32 rc;
+       u16 i;
+
+       do {
+               memset(&hic, 0, sizeof(hic));
+               hic.cmd.hdr.cmd = FW_PHY_ACT_REQ_CMD;
+               hic.cmd.hdr.buf_len = FW_PHY_ACT_REQ_LEN;
+               hic.cmd.hdr.checksum = FW_DEFAULT_CHECKSUM;
+               hic.cmd.port_number = hw->bus.lan_id;
+               hic.cmd.activity_id = IXGBE_CPU_TO_LE16(activity);
+               for (i = 0; i < FW_PHY_ACT_DATA_COUNT; ++i)
+                       hic.cmd.data[i] = IXGBE_CPU_TO_BE32((*data)[i]);
+
+               rc = ixgbe_host_interface_command(hw, (u32 *)&hic.cmd,
+                                                 sizeof(hic.cmd),
+                                                 IXGBE_HI_COMMAND_TIMEOUT,
+                                                 true);
+               if (rc != IXGBE_SUCCESS)
+                       return rc;
+               if (hic.rsp.hdr.cmd_or_resp.ret_status ==
+                   FW_CEM_RESP_STATUS_SUCCESS) {
+                       for (i = 0; i < FW_PHY_ACT_DATA_COUNT; ++i)
+                               (*data)[i] = IXGBE_BE32_TO_CPU(hic.rsp.data[i]);
+                       return IXGBE_SUCCESS;
+               }
+               usec_delay(20);
+               --retries;
+       } while (retries > 0);
+
+       return IXGBE_ERR_HOST_INTERFACE_COMMAND;
+}
+
+static const struct {
+       u16 fw_speed;
+       ixgbe_link_speed phy_speed;
+} ixgbe_fw_map[] = {
+       { FW_PHY_ACT_LINK_SPEED_10, IXGBE_LINK_SPEED_10_FULL },
+       { FW_PHY_ACT_LINK_SPEED_100, IXGBE_LINK_SPEED_100_FULL },
+       { FW_PHY_ACT_LINK_SPEED_1G, IXGBE_LINK_SPEED_1GB_FULL },
+       { FW_PHY_ACT_LINK_SPEED_2_5G, IXGBE_LINK_SPEED_2_5GB_FULL },
+       { FW_PHY_ACT_LINK_SPEED_5G, IXGBE_LINK_SPEED_5GB_FULL },
+       { FW_PHY_ACT_LINK_SPEED_10G, IXGBE_LINK_SPEED_10GB_FULL },
+};
+
+/**
+ * ixgbe_get_phy_id_fw - Get the phy ID via firmware command
+ * @hw: pointer to hardware structure
+ *
+ * Returns error code
+ */
+static s32 ixgbe_get_phy_id_fw(struct ixgbe_hw *hw)
+{
+       u32 info[FW_PHY_ACT_DATA_COUNT] = { 0 };
+       u16 phy_speeds;
+       u16 phy_id_lo;
+       s32 rc;
+       u16 i;
+
+       rc = ixgbe_fw_phy_activity(hw, FW_PHY_ACT_GET_PHY_INFO, &info);
+       if (rc)
+               return rc;
+
+       hw->phy.speeds_supported = 0;
+       phy_speeds = info[0] & FW_PHY_INFO_SPEED_MASK;
+       for (i = 0; i < sizeof(ixgbe_fw_map) / sizeof(ixgbe_fw_map[0]); ++i) {
+               if (phy_speeds & ixgbe_fw_map[i].fw_speed)
+                       hw->phy.speeds_supported |= ixgbe_fw_map[i].phy_speed;
+       }
+       if (!hw->phy.autoneg_advertised)
+               hw->phy.autoneg_advertised = hw->phy.speeds_supported;
+
+       hw->phy.id = info[0] & FW_PHY_INFO_ID_HI_MASK;
+       phy_id_lo = info[1] & FW_PHY_INFO_ID_LO_MASK;
+       hw->phy.id |= phy_id_lo & IXGBE_PHY_REVISION_MASK;
+       hw->phy.revision = phy_id_lo & ~IXGBE_PHY_REVISION_MASK;
+       if (!hw->phy.id || hw->phy.id == IXGBE_PHY_REVISION_MASK)
+               return IXGBE_ERR_PHY_ADDR_INVALID;
+       return IXGBE_SUCCESS;
+}
+
+/**
+ * ixgbe_identify_phy_fw - Get PHY type based on firmware command
+ * @hw: pointer to hardware structure
+ *
+ * Returns error code
+ */
+static s32 ixgbe_identify_phy_fw(struct ixgbe_hw *hw)
+{
+       if (hw->bus.lan_id)
+               hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY1_SM;
+       else
+               hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY0_SM;
+
+       hw->phy.type = ixgbe_phy_m88;
+       hw->phy.ops.read_reg = NULL;
+       hw->phy.ops.write_reg = NULL;
+       return ixgbe_get_phy_id_fw(hw);
+}
+
+/**
+ * ixgbe_shutdown_fw_phy - Shutdown a firmware-controlled PHY
+ * @hw: pointer to hardware structure
+ *
+ * Returns error code
+ */
+s32 ixgbe_shutdown_fw_phy(struct ixgbe_hw *hw)
+{
+       u32 setup[FW_PHY_ACT_DATA_COUNT] = { 0 };
+
+       setup[0] = FW_PHY_ACT_FORCE_LINK_DOWN_OFF;
+       return ixgbe_fw_phy_activity(hw, FW_PHY_ACT_FORCE_LINK_DOWN, &setup);
+}
+
 STATIC s32 ixgbe_read_phy_reg_x550em(struct ixgbe_hw *hw, u32 reg_addr,
                                     u32 device_type, u16 *phy_data)
 {
@@ -606,18 +730,20 @@ s32 ixgbe_init_ops_X550EM(struct ixgbe_hw *hw)
        else
                mac->ops.setup_fc = ixgbe_setup_fc_X550em;
 
+       /* PHY */
+       phy->ops.init = ixgbe_init_phy_ops_X550em;
        switch (hw->device_id) {
-       case IXGBE_DEV_ID_X550EM_X_KR:
-       case IXGBE_DEV_ID_X550EM_A_KR:
-       case IXGBE_DEV_ID_X550EM_A_KR_L:
+       case IXGBE_DEV_ID_X550EM_A_1G_T:
+       case IXGBE_DEV_ID_X550EM_A_1G_T_L:
+               mac->ops.setup_fc = NULL;
+               phy->ops.identify = ixgbe_identify_phy_fw;
+               phy->ops.set_phy_power = NULL;
+               phy->ops.get_firmware_version = NULL;
                break;
        default:
-               mac->ops.setup_eee = NULL;
+               phy->ops.identify = ixgbe_identify_phy_x550em;
        }
 
-       /* PHY */
-       phy->ops.init = ixgbe_init_phy_ops_X550em;
-       phy->ops.identify = ixgbe_identify_phy_x550em;
        if (mac->ops.get_media_type(hw) != ixgbe_media_type_copper)
                phy->ops.set_phy_power = NULL;
 
@@ -635,6 +761,92 @@ s32 ixgbe_init_ops_X550EM(struct ixgbe_hw *hw)
        return ret_val;
 }
 
+/**
+ * ixgbe_setup_fw_link - Setup firmware-controlled PHYs
+ * @hw: pointer to hardware structure
+ */
+static s32 ixgbe_setup_fw_link(struct ixgbe_hw *hw)
+{
+       u32 setup[FW_PHY_ACT_DATA_COUNT] = { 0 };
+       s32 rc;
+       u16 i;
+
+       if (hw->phy.reset_disable || ixgbe_check_reset_blocked(hw))
+               return 0;
+
+       if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
+               ERROR_REPORT1(IXGBE_ERROR_UNSUPPORTED,
+                             "ixgbe_fc_rx_pause not valid in strict IEEE mode\n");
+               return IXGBE_ERR_INVALID_LINK_SETTINGS;
+       }
+
+       switch (hw->fc.requested_mode) {
+       case ixgbe_fc_full:
+               setup[0] |= FW_PHY_ACT_SETUP_LINK_PAUSE_RXTX <<
+                           FW_PHY_ACT_SETUP_LINK_PAUSE_SHIFT;
+               break;
+       case ixgbe_fc_rx_pause:
+               setup[0] |= FW_PHY_ACT_SETUP_LINK_PAUSE_RX <<
+                           FW_PHY_ACT_SETUP_LINK_PAUSE_SHIFT;
+               break;
+       case ixgbe_fc_tx_pause:
+               setup[0] |= FW_PHY_ACT_SETUP_LINK_PAUSE_TX <<
+                           FW_PHY_ACT_SETUP_LINK_PAUSE_SHIFT;
+               break;
+       default:
+               break;
+       }
+
+       for (i = 0; i < sizeof(ixgbe_fw_map) / sizeof(ixgbe_fw_map[0]); ++i) {
+               if (hw->phy.autoneg_advertised & ixgbe_fw_map[i].phy_speed)
+                       setup[0] |= ixgbe_fw_map[i].fw_speed;
+       }
+       setup[0] |= FW_PHY_ACT_SETUP_LINK_HP | FW_PHY_ACT_SETUP_LINK_AN;
+
+       if (hw->phy.eee_speeds_advertised)
+               setup[0] |= FW_PHY_ACT_SETUP_LINK_EEE;
+
+       rc = ixgbe_fw_phy_activity(hw, FW_PHY_ACT_SETUP_LINK, &setup);
+       if (rc)
+               return rc;
+       if (setup[0] == FW_PHY_ACT_SETUP_LINK_RSP_DOWN)
+               return IXGBE_ERR_OVERTEMP;
+       return IXGBE_SUCCESS;
+}
+
+/**
+ * ixgbe_fc_autoneg_fw _ Set up flow control for FW-controlled PHYs
+ * @hw: pointer to hardware structure
+ *
+ *  Called at init time to set up flow control.
+ */
+static s32 ixgbe_fc_autoneg_fw(struct ixgbe_hw *hw)
+{
+       if (hw->fc.requested_mode == ixgbe_fc_default)
+               hw->fc.requested_mode = ixgbe_fc_full;
+
+       return ixgbe_setup_fw_link(hw);
+}
+
+/**
+ * ixgbe_setup_eee_fw - Enable/disable EEE support
+ * @hw: pointer to the HW structure
+ * @enable_eee: boolean flag to enable EEE
+ *
+ * Enable/disable EEE based on enable_eee flag.
+ * This function controls EEE for firmware-based PHY implementations.
+ */
+static s32 ixgbe_setup_eee_fw(struct ixgbe_hw *hw, bool enable_eee)
+{
+       if (!!hw->phy.eee_speeds_advertised == enable_eee)
+               return IXGBE_SUCCESS;
+       if (enable_eee)
+               hw->phy.eee_speeds_advertised = hw->phy.eee_speeds_supported;
+       else
+               hw->phy.eee_speeds_advertised = 0;
+       return hw->phy.ops.setup_link(hw);
+}
+
 /**
 *  ixgbe_init_ops_X550EM_a - Inits func ptrs and MAC type
 *  @hw: pointer to hardware structure
@@ -652,14 +864,20 @@ s32 ixgbe_init_ops_X550EM_a(struct ixgbe_hw *hw)
        /* Start with generic X550EM init */
        ret_val = ixgbe_init_ops_X550EM(hw);
 
-       mac->ops.read_iosf_sb_reg = ixgbe_read_iosf_sb_reg_x550;
-       mac->ops.write_iosf_sb_reg = ixgbe_write_iosf_sb_reg_x550;
+       if (hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||
+           hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L) {
+               mac->ops.read_iosf_sb_reg = ixgbe_read_iosf_sb_reg_x550;
+               mac->ops.write_iosf_sb_reg = ixgbe_write_iosf_sb_reg_x550;
+       } else {
+               mac->ops.read_iosf_sb_reg = ixgbe_read_iosf_sb_reg_x550a;
+               mac->ops.write_iosf_sb_reg = ixgbe_write_iosf_sb_reg_x550a;
+       }
        mac->ops.acquire_swfw_sync = ixgbe_acquire_swfw_sync_X550a;
        mac->ops.release_swfw_sync = ixgbe_release_swfw_sync_X550a;
 
        switch (mac->ops.get_media_type(hw)) {
        case ixgbe_media_type_fiber:
-               mac->ops.setup_fc = ixgbe_setup_fc_fiber_x550em_a;
+               mac->ops.setup_fc = NULL;
                mac->ops.fc_autoneg = ixgbe_fc_autoneg_fiber_x550em_a;
                break;
        case ixgbe_media_type_backplane:
@@ -670,6 +888,21 @@ s32 ixgbe_init_ops_X550EM_a(struct ixgbe_hw *hw)
                break;
        }
 
+       if ((hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T) ||
+               (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)) {
+               mac->ops.fc_autoneg = ixgbe_fc_autoneg_sgmii_x550em_a;
+               mac->ops.setup_fc = ixgbe_fc_autoneg_fw;
+       }
+
+       switch (hw->device_id) {
+       case IXGBE_DEV_ID_X550EM_A_KR:
+       case IXGBE_DEV_ID_X550EM_A_KR_L:
+               mac->ops.setup_eee = ixgbe_setup_eee_fw;
+               break;
+       default:
+               mac->ops.setup_eee = NULL;
+       }
+
        return ret_val;
 }
 
@@ -768,6 +1001,7 @@ s32 ixgbe_dmac_config_tcs_X550(struct ixgbe_hw *hw)
 
        /* Configure DMA coalescing enabled */
        switch (hw->mac.dmac_config.link_speed) {
+       case IXGBE_LINK_SPEED_10_FULL:
        case IXGBE_LINK_SPEED_100_FULL:
                pb_headroom = IXGBE_DMACRXT_100M;
                break;
@@ -873,45 +1107,27 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)
  */
 STATIC s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
 {
-       u16 autoneg_eee_reg;
        u32 link_reg;
        s32 status;
 
-       if (hw->mac.type == ixgbe_mac_X550) {
-               /* Advertise EEE capability */
-               hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
-                                    IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-                                    &autoneg_eee_reg);
-
-               autoneg_eee_reg |= (IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |
-                                   IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |
-                                   IXGBE_AUTO_NEG_100BASE_EEE_ADVT);
-
-               hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
-                                     IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-                                     autoneg_eee_reg);
-               return IXGBE_SUCCESS;
-       }
-
        switch (hw->device_id) {
-       case IXGBE_DEV_ID_X550EM_X_KR:
        case IXGBE_DEV_ID_X550EM_A_KR:
        case IXGBE_DEV_ID_X550EM_A_KR_L:
                status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                    IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                    IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);
                if (status != IXGBE_SUCCESS)
                        return status;
 
                link_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |
-                       IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX;
+                           IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX;
 
                /* Don't advertise FEC capability when EEE enabled. */
                link_reg &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;
 
                status = hw->mac.ops.write_iosf_sb_reg(hw,
-                                     IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                     IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);
                if (status != IXGBE_SUCCESS)
                        return status;
                break;
@@ -928,33 +1144,16 @@ STATIC s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
  */
 STATIC s32 ixgbe_disable_eee_x550(struct ixgbe_hw *hw)
 {
-       u16 autoneg_eee_reg;
        u32 link_reg;
        s32 status;
 
-       if (hw->mac.type == ixgbe_mac_X550) {
-               /* Disable advertised EEE capability */
-               hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
-                                    IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-                                    &autoneg_eee_reg);
-
-               autoneg_eee_reg &= ~(IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |
-                                    IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |
-                                    IXGBE_AUTO_NEG_100BASE_EEE_ADVT);
-
-               hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
-                                     IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-                                     autoneg_eee_reg);
-               return IXGBE_SUCCESS;
-       }
-
        switch (hw->device_id) {
        case IXGBE_DEV_ID_X550EM_X_KR:
        case IXGBE_DEV_ID_X550EM_A_KR:
        case IXGBE_DEV_ID_X550EM_A_KR_L:
                status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                    IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                    IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);
                if (status != IXGBE_SUCCESS)
                        return status;
 
@@ -965,8 +1164,8 @@ STATIC s32 ixgbe_disable_eee_x550(struct ixgbe_hw *hw)
                link_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;
 
                status = hw->mac.ops.write_iosf_sb_reg(hw,
-                                     IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                     IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);
                if (status != IXGBE_SUCCESS)
                        return status;
                break;
@@ -999,11 +1198,6 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
        if (enable_eee) {
                eeer |= (IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
 
-               /* Not supported on first revision of X550EM_x. */
-               if ((hw->mac.type == ixgbe_mac_X550EM_x) &&
-                   !(IXGBE_FUSES0_REV_MASK &
-                     IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))
-                       return IXGBE_SUCCESS;
                status = ixgbe_enable_eee_x550(hw);
                if (status)
                        return status;
@@ -1105,8 +1299,8 @@ STATIC s32 ixgbe_iosf_wait(struct ixgbe_hw *hw, u32 *ctrl)
 }
 
 /**
- *  ixgbe_write_iosf_sb_reg_x550 - Writes a value to specified register of the IOSF
- *  device
+ *  ixgbe_write_iosf_sb_reg_x550 - Writes a value to specified register
+ *  of the IOSF device
  *  @hw: pointer to hardware structure
  *  @reg_addr: 32 bit PHY register to write
  *  @device_type: 3 bit device type
@@ -1152,12 +1346,11 @@ out:
 }
 
 /**
- *  ixgbe_read_iosf_sb_reg_x550 - Writes a value to specified register of the IOSF
- *  device
+ *  ixgbe_read_iosf_sb_reg_x550 - Reads specified register of the IOSF device
  *  @hw: pointer to hardware structure
  *  @reg_addr: 32 bit PHY register to write
  *  @device_type: 3 bit device type
- *  @phy_data: Pointer to read data from the register
+ *  @data: Pointer to read data from the register
  **/
 s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr,
                           u32 device_type, u32 *data)
@@ -1291,8 +1484,7 @@ s32 ixgbe_write_iosf_sb_reg_x550a(struct ixgbe_hw *hw, u32 reg_addr,
 }
 
 /**
- *  ixgbe_read_iosf_sb_reg_x550a - Writes a value to specified register
- *  of the IOSF device.
+ *  ixgbe_read_iosf_sb_reg_x550a - Reads specified register of the IOSF device
  *  @hw: pointer to hardware structure
  *  @reg_addr: 32 bit PHY register to write
  *  @device_type: 3 bit device type
@@ -1600,6 +1792,53 @@ s32 ixgbe_setup_sfp_modules_X550em(struct ixgbe_hw *hw)
        return IXGBE_SUCCESS;
 }
 
+/**
+*  ixgbe_restart_an_internal_phy_x550em - restart autonegotiation for the
+*  internal PHY
+*  @hw: pointer to hardware structure
+**/
+STATIC s32 ixgbe_restart_an_internal_phy_x550em(struct ixgbe_hw *hw)
+{
+       s32 status;
+       u32 link_ctrl;
+
+       /* Restart auto-negotiation. */
+       status = hw->mac.ops.read_iosf_sb_reg(hw,
+                                      IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                      IXGBE_SB_IOSF_TARGET_KR_PHY, &link_ctrl);
+
+       if (status) {
+               DEBUGOUT("Auto-negotiation did not complete\n");
+               return status;
+       }
+
+       link_ctrl |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;
+       status = hw->mac.ops.write_iosf_sb_reg(hw,
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, link_ctrl);
+
+       if (hw->mac.type == ixgbe_mac_X550EM_a) {
+               u32 flx_mask_st20;
+
+               /* Indicate to FW that AN restart has been asserted */
+               status = hw->mac.ops.read_iosf_sb_reg(hw,
+                               IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, &flx_mask_st20);
+
+               if (status) {
+                       DEBUGOUT("Auto-negotiation did not complete\n");
+                       return status;
+               }
+
+               flx_mask_st20 |= IXGBE_KRM_PMD_FLX_MASK_ST20_FW_AN_RESTART;
+               status = hw->mac.ops.write_iosf_sb_reg(hw,
+                               IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, flx_mask_st20);
+       }
+
+       return status;
+}
+
 /**
  * ixgbe_setup_sgmii - Set up link for sgmii
  * @hw: pointer to hardware structure
@@ -1608,7 +1847,7 @@ STATIC s32 ixgbe_setup_sgmii(struct ixgbe_hw *hw, ixgbe_link_speed speed,
                             bool autoneg_wait)
 {
        struct ixgbe_mac_info *mac = &hw->mac;
-       u32 lval, sval;
+       u32 lval, sval, flx_val;
        s32 rc;
 
        rc = mac->ops.read_iosf_sb_reg(hw,
@@ -1642,17 +1881,32 @@ STATIC s32 ixgbe_setup_sgmii(struct ixgbe_hw *hw, ixgbe_link_speed speed,
        if (rc)
                return rc;
 
-       lval |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;
+       rc = mac->ops.read_iosf_sb_reg(hw,
+                                   IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                                   IXGBE_SB_IOSF_TARGET_KR_PHY, &flx_val);
+       if (rc)
+               return rc;
+
+       flx_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_MASK;
+       flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_1G;
+       flx_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_AN_EN;
+       flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SGMII_EN;
+       flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_AN37_EN;
+
        rc = mac->ops.write_iosf_sb_reg(hw,
-                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                       IXGBE_SB_IOSF_TARGET_KR_PHY, lval);
+                                   IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                                   IXGBE_SB_IOSF_TARGET_KR_PHY, flx_val);
+       if (rc)
+               return rc;
+
+       rc = ixgbe_restart_an_internal_phy_x550em(hw);
        if (rc)
                return rc;
 
        return hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait);
 }
 
- /**
+/**
  * ixgbe_setup_sgmii_m88 - Set up link for sgmii with Marvell PHYs
  * @hw: pointer to hardware structure
  */
@@ -1660,7 +1914,7 @@ STATIC s32 ixgbe_setup_sgmii_m88(struct ixgbe_hw *hw, ixgbe_link_speed speed,
                                 bool autoneg_wait)
 {
        struct ixgbe_mac_info *mac = &hw->mac;
-       u32 lval, sval;
+       u32 lval, sval, flx_val;
        s32 rc;
 
        rc = mac->ops.read_iosf_sb_reg(hw,
@@ -1694,80 +1948,33 @@ STATIC s32 ixgbe_setup_sgmii_m88(struct ixgbe_hw *hw, ixgbe_link_speed speed,
        if (rc)
                return rc;
 
-       lval |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;
        rc = mac->ops.write_iosf_sb_reg(hw,
                                        IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
                                        IXGBE_SB_IOSF_TARGET_KR_PHY, lval);
        if (rc)
                return rc;
 
-       return hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait);
-}
-
-/**
- * ixgbe_check_link_m88 - Poll PHY for link
- * @hw: pointer to hardware structure
- * @speed: pointer to link speed
- * @link_up: true when link is up
- * @link_up_wait: bool indicating whether to wait for link
- *
- * Check that both the MAC and PHY have link.
- */
-static s32
-ixgbe_check_link_m88(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
-                    bool *link_up, bool link_up_wait)
-{
-       u16 reg;
-       s32 rc;
-       u32 i;
-
-       rc = ixgbe_check_mac_link_generic(hw, speed, link_up, link_up_wait);
-       if (rc || !*link_up)
+       rc = mac->ops.read_iosf_sb_reg(hw,
+                                   IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                                   IXGBE_SB_IOSF_TARGET_KR_PHY, &flx_val);
+       if (rc)
                return rc;
 
-       rc = hw->phy.ops.read_reg(hw, IXGBE_M88E1500_PHY_SPEC_STATUS, 0, &reg);
+       flx_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_MASK;
+       flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_AN;
+       flx_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_AN_EN;
+       flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SGMII_EN;
+       flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_AN37_EN;
 
-       /* MAC link is up, so check external PHY link */
-       *link_up = !!(reg & IXGBE_M88E1500_PHY_SPEC_STATUS_LINK);
-
-       if (link_up_wait) {
-               for (i = 0; i < IXGBE_AUTO_NEG_TIME; i++) {
-                       if (!rc &&
-                           (reg & IXGBE_M88E1500_PHY_SPEC_STATUS_LINK)) {
-                               *link_up = true;
-                               break;
-                       }
-                       *link_up = false;
-                       msec_delay(100);
-                       rc = hw->phy.ops.read_reg(hw,
-                                                IXGBE_M88E1500_PHY_SPEC_STATUS,
-                                                0, &reg);
-               }
-       }
+       rc = mac->ops.write_iosf_sb_reg(hw,
+                                   IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                                   IXGBE_SB_IOSF_TARGET_KR_PHY, flx_val);
+       if (rc)
+               return rc;
 
-#define M88_SPEED(x) (IXGBE_M88E1500_PHY_SPEC_STATUS_RESOLVED  | \
-                     IXGBE_M88E1500_PHY_SPEC_STATUS_DUPLEX     | \
-                     ((IXGBE_M88E1500_PHY_SPEC_STATUS_SPEED_##x) <<\
-                       IXGBE_M88E1500_PHY_SPEC_STATUS_SPEED_SHIFT))
+       rc = ixgbe_restart_an_internal_phy_x550em(hw);
 
-       reg &= M88_SPEED(MASK);
-       switch (reg) {
-       case M88_SPEED(10):
-               *speed = IXGBE_LINK_SPEED_10_FULL;
-               break;
-       case M88_SPEED(100):
-               *speed = IXGBE_LINK_SPEED_100_FULL;
-               break;
-       case M88_SPEED(1000):
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-               break;
-       default:
-               *speed = IXGBE_LINK_SPEED_UNKNOWN;
-               break;
-       }
-#undef M88_SPEED
-
-       return rc;
+       return hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait);
 }
 
 /**
@@ -1791,19 +1998,24 @@ void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)
                mac->ops.setup_link = ixgbe_setup_mac_link_multispeed_fiber;
                mac->ops.set_rate_select_speed =
                                        ixgbe_set_soft_rate_select_speed;
+
                if ((hw->device_id == IXGBE_DEV_ID_X550EM_A_SFP_N) ||
                    (hw->device_id == IXGBE_DEV_ID_X550EM_A_SFP))
                        mac->ops.setup_mac_link =
-                               ixgbe_setup_mac_link_sfp_x550a;
+                                               ixgbe_setup_mac_link_sfp_x550a;
                else
                        mac->ops.setup_mac_link =
-                               ixgbe_setup_mac_link_sfp_x550em;
+                                               ixgbe_setup_mac_link_sfp_x550em;
                break;
        case ixgbe_media_type_copper:
-               if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
-                   hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L) {
-                       mac->ops.setup_link = ixgbe_setup_sgmii_m88;
-                       mac->ops.check_link = ixgbe_check_link_m88;
+               if (hw->mac.type == ixgbe_mac_X550EM_a) {
+                       if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
+                           hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L) {
+                               mac->ops.setup_link = ixgbe_setup_sgmii_m88;
+                       } else {
+                               mac->ops.setup_link =
+                                                 ixgbe_setup_mac_link_t_X550em;
+                       }
                } else {
                        mac->ops.setup_link = ixgbe_setup_mac_link_t_X550em;
                        mac->ops.check_link = ixgbe_check_link_t_X550em;
@@ -1831,6 +2043,7 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 {
        DEBUGFUNC("ixgbe_get_link_capabilities_X550em");
 
+
        /* SFP */
        if (hw->phy.media_type == ixgbe_media_type_fiber) {
 
@@ -1862,6 +2075,20 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
                case ixgbe_phy_sgmii:
                        *speed = IXGBE_LINK_SPEED_1GB_FULL;
                        break;
+               case ixgbe_phy_x550em_kr:
+                       if (hw->mac.type == ixgbe_mac_X550EM_a) {
+                               /* check different backplane modes */
+                               if (hw->phy.nw_mng_if_sel &
+                                          IXGBE_NW_MNG_IF_SEL_PHY_SPEED_2_5G) {
+                                       *speed = IXGBE_LINK_SPEED_2_5GB_FULL;
+                                       break;
+                               } else if (hw->device_id ==
+                                                  IXGBE_DEV_ID_X550EM_A_KR_L) {
+                                       *speed = IXGBE_LINK_SPEED_1GB_FULL;
+                                       break;
+                               }
+                       }
+                       /* fall through */
                default:
                        *speed = IXGBE_LINK_SPEED_10GB_FULL |
                                 IXGBE_LINK_SPEED_1GB_FULL;
@@ -1982,19 +2209,32 @@ STATIC s32 ixgbe_enable_lasi_ext_t_x550em(struct ixgbe_hw *hw)
        status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc);
 
        /* Enable link status change alarm */
-       status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
-                                     IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &reg);
 
-       if (status != IXGBE_SUCCESS)
-               return status;
+       /* Enable the LASI interrupts on X552 devices to receive notifications
+        * of the link configurations of the external PHY and correspondingly
+        * support the configuration of the internal iXFI link, since iXFI does
+        * not support auto-negotiation. This is not required for X553 devices
+        * having KR support, which performs auto-negotiations and which is used
+        * as the internal link to the external PHY. Hence adding a check here
+        * to avoid enabling LASI interrupts for X553 devices.
+        */
+       if (hw->mac.type != ixgbe_mac_X550EM_a) {
+               status = hw->phy.ops.read_reg(hw,
+                                       IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
+                                       IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &reg);
 
-       reg |= IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN;
+               if (status != IXGBE_SUCCESS)
+                       return status;
 
-       status = hw->phy.ops.write_reg(hw, IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
-                                      IXGBE_MDIO_AUTO_NEG_DEV_TYPE, reg);
+               reg |= IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN;
 
-       if (status != IXGBE_SUCCESS)
-               return status;
+               status = hw->phy.ops.write_reg(hw,
+                                       IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
+                                       IXGBE_MDIO_AUTO_NEG_DEV_TYPE, reg);
+
+               if (status != IXGBE_SUCCESS)
+                       return status;
+       }
 
        /* Enable high temperature failure and global fault alarms */
        status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_INT_MASK,
@@ -2063,8 +2303,8 @@ STATIC s32 ixgbe_setup_kr_speed_x550em(struct ixgbe_hw *hw,
        u32 reg_val;
 
        status = hw->mac.ops.read_iosf_sb_reg(hw,
-                     IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                     IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status)
                return status;
 
@@ -2080,13 +2320,31 @@ STATIC s32 ixgbe_setup_kr_speed_x550em(struct ixgbe_hw *hw,
        if (speed & IXGBE_LINK_SPEED_1GB_FULL)
                reg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_KX;
 
-       /* Restart auto-negotiation. */
-       reg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;
        status = hw->mac.ops.write_iosf_sb_reg(hw,
-                      IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                      IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
 
-       return status;
+       if (hw->mac.type == ixgbe_mac_X550EM_a) {
+               /* Set lane mode  to KR auto negotiation */
+               status = hw->mac.ops.read_iosf_sb_reg(hw,
+                                   IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                                   IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
+
+               if (status)
+                       return status;
+
+               reg_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_MASK;
+               reg_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_AN;
+               reg_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_AN_EN;
+               reg_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_AN37_EN;
+               reg_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_SGMII_EN;
+
+               status = hw->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);
+       }
+
+       return ixgbe_restart_an_internal_phy_x550em(hw);
 }
 
 /**
@@ -2177,27 +2435,15 @@ STATIC s32 ixgbe_setup_m88(struct ixgbe_hw *hw)
        rc = hw->phy.ops.read_reg_mdi(hw, IXGBE_M88E1500_COPPER_AN, 0, &reg);
        if (rc)
                goto out;
-       reg &= ~IXGBE_M88E1500_COPPER_AN_AS_PAUSE;
-       reg &= ~IXGBE_M88E1500_COPPER_AN_PAUSE;
        reg &= ~IXGBE_M88E1500_COPPER_AN_T4;
        reg &= ~IXGBE_M88E1500_COPPER_AN_100TX_FD;
        reg &= ~IXGBE_M88E1500_COPPER_AN_100TX_HD;
        reg &= ~IXGBE_M88E1500_COPPER_AN_10TX_FD;
        reg &= ~IXGBE_M88E1500_COPPER_AN_10TX_HD;
-       switch (hw->fc.current_mode) {
-       case ixgbe_fc_full:
-               reg |= IXGBE_M88E1500_COPPER_AN_PAUSE;
-               break;
-       case ixgbe_fc_rx_pause:
-               reg |= IXGBE_M88E1500_COPPER_AN_PAUSE;
-               reg |= IXGBE_M88E1500_COPPER_AN_AS_PAUSE;
-               break;
-       case ixgbe_fc_tx_pause:
-               reg |= IXGBE_M88E1500_COPPER_AN_AS_PAUSE;
-               break;
-       default:
-               break;
-       }
+
+       /* Flow control auto negotiation configuration was moved from here to
+        * the function ixgbe_setup_fc_sgmii_x550em_a()
+        */
 
        if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
                reg |= IXGBE_M88E1500_COPPER_AN_100TX_FD;
@@ -2346,9 +2592,16 @@ STATIC s32 ixgbe_reset_phy_m88(struct ixgbe_hw *hw)
 
        hw->mac.ops.release_swfw_sync(hw, mask);
 
+       /* In case of first reset set advertised speeds to default value */
+       if (!hw->phy.autoneg_advertised)
+               hw->phy.autoneg_advertised = IXGBE_LINK_SPEED_1GB_FULL |
+                                            IXGBE_LINK_SPEED_100_FULL |
+                                            IXGBE_LINK_SPEED_10_FULL;
+
        return ixgbe_setup_m88(hw);
 
 out:
+       hw->phy.ops.write_reg_mdi(hw, IXGBE_M88E1500_PAGE_ADDR, 0, 0);
        hw->mac.ops.release_swfw_sync(hw, mask);
        return rc;
 }
@@ -2374,7 +2627,7 @@ STATIC s32 ixgbe_read_mng_if_sel_x550em(struct ixgbe_hw *hw)
            hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_MDIO_ACT) {
                hw->phy.addr = (hw->phy.nw_mng_if_sel &
                                IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD) >>
-                               IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD_SHIFT;
+                              IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD_SHIFT;
        }
 
        return IXGBE_SUCCESS;
@@ -2395,10 +2648,6 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
 
        DEBUGFUNC("ixgbe_init_phy_ops_X550em");
 
-       hw->mac.ops.set_lan_id(hw);
-
-       ixgbe_read_mng_if_sel_x550em(hw);
-
        if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) {
                phy->phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;
                ixgbe_setup_mux_ctl(hw);
@@ -2410,6 +2659,26 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
        case IXGBE_DEV_ID_X550EM_A_1G_T_L:
                phy->ops.read_reg_mdi = ixgbe_read_phy_reg_mdi_22;
                phy->ops.write_reg_mdi = ixgbe_write_phy_reg_mdi_22;
+               hw->phy.ops.read_reg = ixgbe_read_phy_reg_x550a;
+               hw->phy.ops.write_reg = ixgbe_write_phy_reg_x550a;
+               if (hw->bus.lan_id)
+                       hw->phy.phy_semaphore_mask |= IXGBE_GSSR_PHY1_SM;
+               else
+                       hw->phy.phy_semaphore_mask |= IXGBE_GSSR_PHY0_SM;
+
+               break;
+       case IXGBE_DEV_ID_X550EM_A_10G_T:
+       case IXGBE_DEV_ID_X550EM_A_SFP:
+               hw->phy.ops.read_reg = ixgbe_read_phy_reg_x550a;
+               hw->phy.ops.write_reg = ixgbe_write_phy_reg_x550a;
+               if (hw->bus.lan_id)
+                       hw->phy.phy_semaphore_mask |= IXGBE_GSSR_PHY1_SM;
+               else
+                       hw->phy.phy_semaphore_mask |= IXGBE_GSSR_PHY0_SM;
+               break;
+       case IXGBE_DEV_ID_X550EM_X_SFP:
+               /* set up for CS4227 usage */
+               hw->phy.phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;
                break;
        default:
                break;
@@ -2478,8 +2747,6 @@ STATIC void ixgbe_set_mdio_speed(struct ixgbe_hw *hw)
        case IXGBE_DEV_ID_X550EM_X_10G_T:
        case IXGBE_DEV_ID_X550EM_A_SGMII:
        case IXGBE_DEV_ID_X550EM_A_SGMII_L:
-       case IXGBE_DEV_ID_X550EM_A_1G_T:
-       case IXGBE_DEV_ID_X550EM_A_1G_T_L:
        case IXGBE_DEV_ID_X550EM_A_10G_T:
        case IXGBE_DEV_ID_X550EM_A_SFP:
        case IXGBE_DEV_ID_X550EM_A_QSFP:
@@ -2488,6 +2755,13 @@ STATIC void ixgbe_set_mdio_speed(struct ixgbe_hw *hw)
                hlreg0 &= ~IXGBE_HLREG0_MDCSPD;
                IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
                break;
+       case IXGBE_DEV_ID_X550EM_A_1G_T:
+       case IXGBE_DEV_ID_X550EM_A_1G_T_L:
+               /* Select fast MDIO clock speed for these devices */
+               hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
+               hlreg0 |= IXGBE_HLREG0_MDCSPD;
+               IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
+               break;
        default:
                break;
        }
@@ -2691,21 +2965,105 @@ s32 ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
        if (ret_val != IXGBE_SUCCESS)
                return ret_val;
 
-       /* Configure internal PHY for KR/KX. */
-       ixgbe_setup_kr_speed_x550em(hw, speed);
-
-       /* Configure CS4227 LINE side to proper mode. */
-       reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
-                   (hw->bus.lan_id << 12);
-       if (setup_linear)
-               reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
-       else
+       if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
+               /* Configure CS4227 LINE side to 10G SR. */
+               reg_slice = IXGBE_CS4227_LINE_SPARE22_MSB +
+                           (hw->bus.lan_id << 12);
+               reg_val = IXGBE_CS4227_SPEED_10G;
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
+
+               reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
+                           (hw->bus.lan_id << 12);
                reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
-       ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
-                                         reg_val);
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
+
+               /* Configure CS4227 for HOST connection rate then type. */
+               reg_slice = IXGBE_CS4227_HOST_SPARE22_MSB +
+                           (hw->bus.lan_id << 12);
+               reg_val = (speed & IXGBE_LINK_SPEED_10GB_FULL) ?
+               IXGBE_CS4227_SPEED_10G : IXGBE_CS4227_SPEED_1G;
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
+
+               reg_slice = IXGBE_CS4227_HOST_SPARE24_LSB +
+                           (hw->bus.lan_id << 12);
+               if (setup_linear)
+                       reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
+               else
+                       reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
+
+               /* Setup XFI internal link. */
+               ret_val = ixgbe_setup_ixfi_x550em(hw, &speed);
+       } else {
+               /* Configure internal PHY for KR/KX. */
+               ixgbe_setup_kr_speed_x550em(hw, speed);
+
+               /* Configure CS4227 LINE side to proper mode. */
+               reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
+                           (hw->bus.lan_id << 12);
+               if (setup_linear)
+                       reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
+               else
+                       reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
+       }
        return ret_val;
 }
 
+/**
+ *  ixgbe_setup_sfi_x550a - Configure the internal PHY for native SFI mode
+ *  @hw: pointer to hardware structure
+ *  @speed: the link speed to force
+ *
+ *  Configures the integrated PHY for native SFI mode. Used to connect the
+ *  internal PHY directly to an SFP cage, without autonegotiation.
+ **/
+STATIC s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed)
+{
+       struct ixgbe_mac_info *mac = &hw->mac;
+       s32 status;
+       u32 reg_val;
+
+       /* Disable all AN and force speed to 10G Serial. */
+       status = mac->ops.read_iosf_sb_reg(hw,
+                               IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
+       if (status != IXGBE_SUCCESS)
+               return status;
+
+       reg_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_AN_EN;
+       reg_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_AN37_EN;
+       reg_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_SGMII_EN;
+       reg_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_MASK;
+
+       /* Select forced link speed for internal PHY. */
+       switch (*speed) {
+       case IXGBE_LINK_SPEED_10GB_FULL:
+               reg_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_10G;
+               break;
+       case IXGBE_LINK_SPEED_1GB_FULL:
+               reg_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_1G;
+               break;
+       default:
+               /* Other link speeds are not supported by internal PHY. */
+               return IXGBE_ERR_LINK_SETUP;
+       }
+
+       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);
+
+       return status;
+}
+
 /**
  *  ixgbe_setup_mac_link_sfp_x550a - Setup internal PHY for SFP
  *  @hw: pointer to hardware structure
@@ -2713,8 +3071,8 @@ s32 ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
  *  Configure the the integrated PHY for SFP support.
  **/
 s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
-                                  ixgbe_link_speed speed,
-                                  bool autoneg_wait_to_complete)
+                                   ixgbe_link_speed speed,
+                                   bool autoneg_wait_to_complete)
 {
        s32 ret_val;
        u16 reg_phy_ext;
@@ -2736,31 +3094,27 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
                return ret_val;
 
        if (hw->device_id == IXGBE_DEV_ID_X550EM_A_SFP_N) {
-               /* Configure internal PHY for native SFI */
+               /* Configure internal PHY for native SFI based on module type */
                ret_val = hw->mac.ops.read_iosf_sb_reg(hw,
-                              IXGBE_KRM_AN_CNTL_8(hw->bus.lan_id),
-                              IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_phy_int);
+                                  IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                                  IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_phy_int);
 
                if (ret_val != IXGBE_SUCCESS)
                        return ret_val;
 
-               if (setup_linear) {
-                       reg_phy_int &= ~IXGBE_KRM_AN_CNTL_8_LIMITING;
-                       reg_phy_int |= IXGBE_KRM_AN_CNTL_8_LINEAR;
-               } else {
-                       reg_phy_int |= IXGBE_KRM_AN_CNTL_8_LIMITING;
-                       reg_phy_int &= ~IXGBE_KRM_AN_CNTL_8_LINEAR;
-               }
+               reg_phy_int &= IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA;
+               if (!setup_linear)
+                       reg_phy_int |= IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_SR;
 
                ret_val = hw->mac.ops.write_iosf_sb_reg(hw,
-                               IXGBE_KRM_AN_CNTL_8(hw->bus.lan_id),
-                               IXGBE_SB_IOSF_TARGET_KR_PHY, reg_phy_int);
+                                  IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
+                                  IXGBE_SB_IOSF_TARGET_KR_PHY, reg_phy_int);
 
                if (ret_val != IXGBE_SUCCESS)
                        return ret_val;
 
-               /* Setup XFI/SFI internal link. */
-               ret_val = ixgbe_setup_ixfi_x550em(hw, &speed);
+               /* Setup SFI internal link. */
+               ret_val = ixgbe_setup_sfi_x550a(hw, &speed);
        } else {
                /* Configure internal PHY for KR/KX. */
                ixgbe_setup_kr_speed_x550em(hw, speed);
@@ -2771,9 +3125,9 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
                        return IXGBE_ERR_PHY_ADDR_INVALID;
                }
 
-               /* Get external PHY device id */
-               ret_val = hw->phy.ops.read_reg(hw, IXGBE_CS4227_GLOBAL_ID_MSB,
-                                      IXGBE_MDIO_ZERO_DEV_TYPE, &reg_phy_ext);
+               /* Get external PHY SKU id */
+               ret_val = hw->phy.ops.read_reg(hw, IXGBE_CS4227_EFUSE_PDF_SKU,
+                                       IXGBE_MDIO_ZERO_DEV_TYPE, &reg_phy_ext);
 
                if (ret_val != IXGBE_SUCCESS)
                        return ret_val;
@@ -2781,7 +3135,7 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
                /* When configuring quad port CS4223, the MAC instance is part
                 * of the slice offset.
                 */
-               if (reg_phy_ext == IXGBE_CS4223_PHY_ID)
+               if (reg_phy_ext == IXGBE_CS4223_SKU_ID)
                        slice_offset = (hw->bus.lan_id +
                                        (hw->bus.instance_id << 1)) << 12;
                else
@@ -2794,7 +3148,7 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
                else
                        reg_phy_ext = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
                ret_val = hw->phy.ops.write_reg(hw, reg_slice,
-                                       IXGBE_MDIO_ZERO_DEV_TYPE, reg_phy_ext);
+                                        IXGBE_MDIO_ZERO_DEV_TYPE, reg_phy_ext);
        }
        return ret_val;
 }
@@ -2807,24 +3161,25 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
  **/
 STATIC s32 ixgbe_setup_ixfi_x550em_x(struct ixgbe_hw *hw)
 {
+       struct ixgbe_mac_info *mac = &hw->mac;
        s32 status;
        u32 reg_val;
 
        /* Disable training protocol FSM. */
-       status = ixgbe_read_iosf_sb_reg_x550(hw,
+       status = mac->ops.read_iosf_sb_reg(hw,
                                IXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
        reg_val |= IXGBE_KRM_RX_TRN_LINKUP_CTRL_CONV_WO_PROTOCOL;
-       status = ixgbe_write_iosf_sb_reg_x550(hw,
+       status = mac->ops.write_iosf_sb_reg(hw,
                                IXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
 
        /* Disable Flex from training TXFFE. */
-       status = ixgbe_read_iosf_sb_reg_x550(hw,
+       status = mac->ops.read_iosf_sb_reg(hw,
                                IXGBE_KRM_DSP_TXFFE_STATE_4(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
@@ -2832,12 +3187,12 @@ STATIC s32 ixgbe_setup_ixfi_x550em_x(struct ixgbe_hw *hw)
        reg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_C0_EN;
        reg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_CP1_CN1_EN;
        reg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_CO_ADAPT_EN;
-       status = ixgbe_write_iosf_sb_reg_x550(hw,
+       status = mac->ops.write_iosf_sb_reg(hw,
                                IXGBE_KRM_DSP_TXFFE_STATE_4(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
-       status = ixgbe_read_iosf_sb_reg_x550(hw,
+       status = mac->ops.read_iosf_sb_reg(hw,
                                IXGBE_KRM_DSP_TXFFE_STATE_5(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
@@ -2845,14 +3200,14 @@ STATIC s32 ixgbe_setup_ixfi_x550em_x(struct ixgbe_hw *hw)
        reg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_C0_EN;
        reg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_CP1_CN1_EN;
        reg_val &= ~IXGBE_KRM_DSP_TXFFE_STATE_CO_ADAPT_EN;
-       status = ixgbe_write_iosf_sb_reg_x550(hw,
+       status = mac->ops.write_iosf_sb_reg(hw,
                                IXGBE_KRM_DSP_TXFFE_STATE_5(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
 
        /* Enable override for coefficients. */
-       status = ixgbe_read_iosf_sb_reg_x550(hw,
+       status = mac->ops.read_iosf_sb_reg(hw,
                                IXGBE_KRM_TX_COEFF_CTRL_1(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
@@ -2861,7 +3216,7 @@ STATIC s32 ixgbe_setup_ixfi_x550em_x(struct ixgbe_hw *hw)
        reg_val |= IXGBE_KRM_TX_COEFF_CTRL_1_CZERO_EN;
        reg_val |= IXGBE_KRM_TX_COEFF_CTRL_1_CPLUS1_OVRRD_EN;
        reg_val |= IXGBE_KRM_TX_COEFF_CTRL_1_CMINUS1_OVRRD_EN;
-       status = ixgbe_write_iosf_sb_reg_x550(hw,
+       status = mac->ops.write_iosf_sb_reg(hw,
                                IXGBE_KRM_TX_COEFF_CTRL_1(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
        return status;
@@ -2877,11 +3232,16 @@ STATIC s32 ixgbe_setup_ixfi_x550em_x(struct ixgbe_hw *hw)
  **/
 STATIC s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)
 {
+       struct ixgbe_mac_info *mac = &hw->mac;
        s32 status;
        u32 reg_val;
 
+       /* iXFI is only supported with X552 */
+       if (mac->type != ixgbe_mac_X550EM_x)
+               return IXGBE_ERR_LINK_SETUP;
+
        /* Disable AN and force speed to 10G Serial. */
-       status = ixgbe_read_iosf_sb_reg_x550(hw,
+       status = mac->ops.read_iosf_sb_reg(hw,
                                        IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
                                        IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
@@ -2903,7 +3263,7 @@ STATIC s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)
                return IXGBE_ERR_LINK_SETUP;
        }
 
-       status = ixgbe_write_iosf_sb_reg_x550(hw,
+       status = mac->ops.write_iosf_sb_reg(hw,
                                        IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
                                        IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
        if (status != IXGBE_SUCCESS)
@@ -2917,15 +3277,7 @@ STATIC s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)
        }
 
        /* Toggle port SW reset by AN reset. */
-       status = ixgbe_read_iosf_sb_reg_x550(hw,
-                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
-       if (status != IXGBE_SUCCESS)
-               return status;
-       reg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;
-       status = ixgbe_write_iosf_sb_reg_x550(hw,
-                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
+       status = ixgbe_restart_an_internal_phy_x550em(hw);
 
        return status;
 }
@@ -2984,7 +3336,8 @@ s32 ixgbe_setup_internal_phy_t_x550em(struct ixgbe_hw *hw)
        if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_copper)
                return IXGBE_ERR_CONFIG;
 
-       if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
+       if (hw->mac.type == ixgbe_mac_X550EM_x &&
+           !(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
                /* If link is down, there is no setup necessary so return  */
                status = ixgbe_ext_phy_t_x550em_get_link(hw, &link_up);
                if (status != IXGBE_SUCCESS)
@@ -3043,56 +3396,56 @@ s32 ixgbe_setup_phy_loopback_x550em(struct ixgbe_hw *hw)
 
        /* Disable AN and force speed to 10G Serial. */
        status = hw->mac.ops.read_iosf_sb_reg(hw,
-                     IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                     IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
        reg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE;
        reg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK;
        reg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_10G;
        status = hw->mac.ops.write_iosf_sb_reg(hw,
-                      IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                      IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
+                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
 
        /* Set near-end loopback clocks. */
        status = hw->mac.ops.read_iosf_sb_reg(hw,
-                     IXGBE_KRM_PORT_CAR_GEN_CTRL(hw->bus.lan_id),
-                     IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
+                               IXGBE_KRM_PORT_CAR_GEN_CTRL(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
        reg_val |= IXGBE_KRM_PORT_CAR_GEN_CTRL_NELB_32B;
        reg_val |= IXGBE_KRM_PORT_CAR_GEN_CTRL_NELB_KRPCS;
        status = hw->mac.ops.write_iosf_sb_reg(hw,
-                      IXGBE_KRM_PORT_CAR_GEN_CTRL(hw->bus.lan_id),
-                      IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
+                               IXGBE_KRM_PORT_CAR_GEN_CTRL(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
 
        /* Set loopback enable. */
        status = hw->mac.ops.read_iosf_sb_reg(hw,
-                     IXGBE_KRM_PMD_DFX_BURNIN(hw->bus.lan_id),
-                     IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
+                               IXGBE_KRM_PMD_DFX_BURNIN(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
        reg_val |= IXGBE_KRM_PMD_DFX_BURNIN_TX_RX_KR_LB_MASK;
        status = hw->mac.ops.write_iosf_sb_reg(hw,
-                      IXGBE_KRM_PMD_DFX_BURNIN(hw->bus.lan_id),
-                      IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
+                               IXGBE_KRM_PMD_DFX_BURNIN(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
 
        /* Training bypass. */
        status = hw->mac.ops.read_iosf_sb_reg(hw,
-                     IXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),
-                     IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
+                               IXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
        if (status != IXGBE_SUCCESS)
                return status;
        reg_val |= IXGBE_KRM_RX_TRN_LINKUP_CTRL_PROTOCOL_BYPASS;
        status = hw->mac.ops.write_iosf_sb_reg(hw,
-                      IXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),
-                      IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
+                               IXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
 
        return status;
 }
@@ -3106,13 +3459,13 @@ s32 ixgbe_setup_phy_loopback_x550em(struct ixgbe_hw *hw)
  *
  *  Reads a 16 bit word from the EEPROM using the hostif.
  **/
-s32 ixgbe_read_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset,
-                                  u16 *data)
+s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset, u16 *data)
 {
-       s32 status;
+       const u32 mask = IXGBE_GSSR_SW_MNG_SM | IXGBE_GSSR_EEP_SM;
        struct ixgbe_hic_read_shadow_ram buffer;
+       s32 status;
 
-       DEBUGFUNC("ixgbe_read_ee_hostif_data_X550");
+       DEBUGFUNC("ixgbe_read_ee_hostif_X550");
        buffer.hdr.req.cmd = FW_READ_SHADOW_RAM_CMD;
        buffer.hdr.req.buf_lenh = 0;
        buffer.hdr.req.buf_lenl = FW_READ_SHADOW_RAM_LEN;
@@ -3123,42 +3476,18 @@ s32 ixgbe_read_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset,
        /* one word */
        buffer.length = IXGBE_CPU_TO_BE16(sizeof(u16));
 
-       status = ixgbe_host_interface_command(hw, (u32 *)&buffer,
-                                             sizeof(buffer),
-                                             IXGBE_HI_COMMAND_TIMEOUT, false);
-
+       status = hw->mac.ops.acquire_swfw_sync(hw, mask);
        if (status)
                return status;
 
-       *data = (u16)IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG,
-                                         FW_NVM_DATA_OFFSET);
-
-       return 0;
-}
-
-/**
- *  ixgbe_read_ee_hostif_X550 - Read EEPROM word using a host interface command
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM using the hostif.
- **/
-s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset,
-                             u16 *data)
-{
-       s32 status = IXGBE_SUCCESS;
-
-       DEBUGFUNC("ixgbe_read_ee_hostif_X550");
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           IXGBE_SUCCESS) {
-               status = ixgbe_read_ee_hostif_data_X550(hw, offset, data);
-               hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-       } else {
-               status = IXGBE_ERR_SWFW_SYNC;
+       status = ixgbe_hic_unlocked(hw, (u32 *)&buffer, sizeof(buffer),
+                                   IXGBE_HI_COMMAND_TIMEOUT);
+       if (!status) {
+               *data = (u16)IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG,
+                                                 FW_NVM_DATA_OFFSET);
        }
 
+       hw->mac.ops.release_swfw_sync(hw, mask);
        return status;
 }
 
@@ -3174,6 +3503,7 @@ s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset,
 s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw,
                                     u16 offset, u16 words, u16 *data)
 {
+       const u32 mask = IXGBE_GSSR_SW_MNG_SM | IXGBE_GSSR_EEP_SM;
        struct ixgbe_hic_read_shadow_ram buffer;
        u32 current_word = 0;
        u16 words_to_read;
@@ -3183,11 +3513,12 @@ s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw,
        DEBUGFUNC("ixgbe_read_ee_hostif_buffer_X550");
 
        /* Take semaphore for the entire operation. */
-       status = hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       status = hw->mac.ops.acquire_swfw_sync(hw, mask);
        if (status) {
                DEBUGOUT("EEPROM read buffer - semaphore failed\n");
                return status;
        }
+
        while (words) {
                if (words > FW_MAX_READ_BUFFER_SIZE / 2)
                        words_to_read = FW_MAX_READ_BUFFER_SIZE / 2;
@@ -3203,10 +3534,8 @@ s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw,
                buffer.address = IXGBE_CPU_TO_BE32((offset + current_word) * 2);
                buffer.length = IXGBE_CPU_TO_BE16(words_to_read * 2);
 
-               status = ixgbe_host_interface_command(hw, (u32 *)&buffer,
-                                                     sizeof(buffer),
-                                                     IXGBE_HI_COMMAND_TIMEOUT,
-                                                     false);
+               status = ixgbe_hic_unlocked(hw, (u32 *)&buffer, sizeof(buffer),
+                                           IXGBE_HI_COMMAND_TIMEOUT);
 
                if (status) {
                        DEBUGOUT("Host interface command failed\n");
@@ -3231,7 +3560,7 @@ s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw,
        }
 
 out:
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       hw->mac.ops.release_swfw_sync(hw, mask);
        return status;
 }
 
@@ -3651,6 +3980,8 @@ u32 ixgbe_get_supported_physical_layer_X550em(struct ixgbe_hw *hw)
                if (ext_ability & IXGBE_MDIO_PHY_1000BASET_ABILITY)
                        physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
                break;
+       case ixgbe_phy_m88:
+               physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T;
        default:
                break;
        }
@@ -3933,19 +4264,19 @@ s32 ixgbe_setup_fc_X550em(struct ixgbe_hw *hw)
        case IXGBE_DEV_ID_X550EM_A_KR:
        case IXGBE_DEV_ID_X550EM_A_KR_L:
                ret_val = hw->mac.ops.read_iosf_sb_reg(hw,
-                                     IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
-                                     IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
+                                       IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_val);
                if (ret_val != IXGBE_SUCCESS)
                        goto out;
                reg_val &= ~(IXGBE_KRM_AN_CNTL_1_SYM_PAUSE |
-                            IXGBE_KRM_AN_CNTL_1_ASM_PAUSE);
+                       IXGBE_KRM_AN_CNTL_1_ASM_PAUSE);
                if (pause)
                        reg_val |= IXGBE_KRM_AN_CNTL_1_SYM_PAUSE;
                if (asm_dir)
                        reg_val |= IXGBE_KRM_AN_CNTL_1_ASM_PAUSE;
                ret_val = hw->mac.ops.write_iosf_sb_reg(hw,
-                                      IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
-                                      IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
+                                       IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
 
                /* This device does not fully support AN. */
                hw->fc.disable_fc_autoneg = true;
@@ -3978,7 +4309,7 @@ void ixgbe_fc_autoneg_backplane_x550em_a(struct ixgbe_hw *hw)
         */
        if (hw->fc.disable_fc_autoneg) {
                ERROR_REPORT1(IXGBE_ERROR_UNSUPPORTED,
-                             "Flow control autoneg is disabled");
+                            "Flow control autoneg is disabled");
                goto out;
        }
 
@@ -3990,8 +4321,8 @@ void ixgbe_fc_autoneg_backplane_x550em_a(struct ixgbe_hw *hw)
 
        /* Check at auto-negotiation has completed */
        status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                     IXGBE_KRM_LINK_S1(hw->bus.lan_id),
-                                     IXGBE_SB_IOSF_TARGET_KR_PHY, &link_s1);
+                                       IXGBE_KRM_LINK_S1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, &link_s1);
 
        if (status != IXGBE_SUCCESS ||
            (link_s1 & IXGBE_KRM_LINK_S1_MAC_AN_COMPLETE) == 0) {
@@ -4004,8 +4335,8 @@ void ixgbe_fc_autoneg_backplane_x550em_a(struct ixgbe_hw *hw)
         * local flow control settings accordingly
         */
        status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                     IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
-                                     IXGBE_SB_IOSF_TARGET_KR_PHY, &an_cntl_1);
+                               IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, &an_cntl_1);
 
        if (status != IXGBE_SUCCESS) {
                DEBUGOUT("Auto-Negotiation did not complete\n");
@@ -4013,8 +4344,8 @@ void ixgbe_fc_autoneg_backplane_x550em_a(struct ixgbe_hw *hw)
        }
 
        status = hw->mac.ops.read_iosf_sb_reg(hw,
-                             IXGBE_KRM_LP_BASE_PAGE_HIGH(hw->bus.lan_id),
-                             IXGBE_SB_IOSF_TARGET_KR_PHY, &lp_an_page_low);
+                               IXGBE_KRM_LP_BASE_PAGE_HIGH(hw->bus.lan_id),
+                               IXGBE_SB_IOSF_TARGET_KR_PHY, &lp_an_page_low);
 
        if (status != IXGBE_SUCCESS) {
                DEBUGOUT("Auto-Negotiation did not complete\n");
@@ -4037,15 +4368,26 @@ out:
 }
 
 /**
- *  ixgbe_fc_autoneg_fiber_x550em_a - Enable flow control IEEE clause 37
+ *  ixgbe_fc_autoneg_fiber_x550em_a - passthrough FC settings
  *  @hw: pointer to hardware structure
  *
- *  Enable flow control according to IEEE clause 37.
  **/
 void ixgbe_fc_autoneg_fiber_x550em_a(struct ixgbe_hw *hw)
 {
-       u32 link_s1, pcs_an_lp, pcs_an;
+       hw->fc.fc_was_autonegged = false;
+       hw->fc.current_mode = hw->fc.requested_mode;
+}
+
+/**
+ *  ixgbe_fc_autoneg_sgmii_x550em_a - Enable flow control IEEE clause 37
+ *  @hw: pointer to hardware structure
+ *
+ *  Enable flow control according to IEEE clause 37.
+ **/
+void ixgbe_fc_autoneg_sgmii_x550em_a(struct ixgbe_hw *hw)
+{
        s32 status = IXGBE_ERR_FC_NOT_NEGOTIATED;
+       u16 reg, pcs_an_lp, pcs_an;
        ixgbe_link_speed speed;
        bool link_up;
 
@@ -4067,42 +4409,34 @@ void ixgbe_fc_autoneg_fiber_x550em_a(struct ixgbe_hw *hw)
        }
 
        /* Check if auto-negotiation has completed */
-       status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                        IXGBE_KRM_LINK_S1(hw->bus.lan_id),
-                                        IXGBE_SB_IOSF_TARGET_KR_PHY, &link_s1);
-
+       status = hw->phy.ops.read_reg(hw, IXGBE_M88E1500_COPPER_STATUS,
+                                       IXGBE_MDIO_ZERO_DEV_TYPE, &reg);
        if (status != IXGBE_SUCCESS ||
-           (link_s1 & IXGBE_KRM_LINK_S1_MAC_AN_COMPLETE) == 0) {
+           (reg & IXGBE_M88E1500_COPPER_STATUS_AN_DONE) == 0) {
                DEBUGOUT("Auto-Negotiation did not complete\n");
                status = IXGBE_ERR_FC_NOT_NEGOTIATED;
                goto out;
        }
 
-       /* Determine advertised flow control */
-       status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                         IXGBE_KRM_PCS_KX_AN(hw->bus.lan_id),
-                                         IXGBE_SB_IOSF_TARGET_KR_PHY, &pcs_an);
-
-       if (status != IXGBE_SUCCESS) {
-               DEBUGOUT("Auto-Negotiation did not complete\n");
+       /* Get the advertized flow control */
+       status = hw->phy.ops.read_reg(hw, IXGBE_M88E1500_COPPER_AN,
+                                       IXGBE_MDIO_ZERO_DEV_TYPE, &pcs_an);
+       if (status != IXGBE_SUCCESS)
                goto out;
-       }
-
-       /* Determine link parter flow control */
-       status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                 IXGBE_KRM_PCS_KX_AN_LP(hw->bus.lan_id),
-                                 IXGBE_SB_IOSF_TARGET_KR_PHY, &pcs_an_lp);
 
-       if (status != IXGBE_SUCCESS) {
-               DEBUGOUT("Auto-Negotiation did not complete\n");
+       /* Get link partner's flow control */
+       status = hw->phy.ops.read_reg(hw,
+                       IXGBE_M88E1500_COPPER_AN_LP_ABILITY,
+                                       IXGBE_MDIO_ZERO_DEV_TYPE, &pcs_an_lp);
+       if (status != IXGBE_SUCCESS)
                goto out;
-       }
 
-       status = ixgbe_negotiate_fc(hw, pcs_an, pcs_an_lp,
-                                   IXGBE_KRM_PCS_KX_AN_SYM_PAUSE,
-                                   IXGBE_KRM_PCS_KX_AN_ASM_PAUSE,
-                                   IXGBE_KRM_PCS_KX_AN_LP_SYM_PAUSE,
-                                   IXGBE_KRM_PCS_KX_AN_LP_ASM_PAUSE);
+       /* Negotiate the flow control */
+       status = ixgbe_negotiate_fc(hw, (u32)pcs_an, (u32)pcs_an_lp,
+                                   IXGBE_M88E1500_COPPER_AN_PAUSE,
+                                   IXGBE_M88E1500_COPPER_AN_AS_PAUSE,
+                                   IXGBE_M88E1500_COPPER_AN_LP_PAUSE,
+                                   IXGBE_M88E1500_COPPER_AN_LP_AS_PAUSE);
 
 out:
        if (status == IXGBE_SUCCESS) {
@@ -4114,118 +4448,94 @@ out:
 }
 
 /**
- *  ixgbe_setup_fc_backplane_x550em_a - Set up flow control
+ *  ixgbe_setup_fc_sgmii_x550em_a - Set up flow control
  *  @hw: pointer to hardware structure
  *
  *  Called at init time to set up flow control.
  **/
-s32 ixgbe_setup_fc_backplane_x550em_a(struct ixgbe_hw *hw)
+s32 ixgbe_setup_fc_sgmii_x550em_a(struct ixgbe_hw *hw)
 {
-       s32 status = IXGBE_SUCCESS;
-       u32 an_cntl, link_ctrl = 0;
-
-       DEBUGFUNC("ixgbe_setup_fc_backplane_x550em_a");
+       u16 reg;
+       s32 rc;
 
        /* Validate the requested mode */
        if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
                ERROR_REPORT1(IXGBE_ERROR_UNSUPPORTED,
-                     "ixgbe_fc_rx_pause not valid in strict IEEE mode\n");
+                             "ixgbe_fc_rx_pause not valid in strict IEEE mode\n");
                return IXGBE_ERR_INVALID_LINK_SETTINGS;
        }
 
        if (hw->fc.requested_mode == ixgbe_fc_default)
                hw->fc.requested_mode = ixgbe_fc_full;
 
-       /* Set up the 1G and 10G flow control advertisement registers so the
-        * HW will be able to do FC autoneg once the cable is plugged in.  If
-        * we link at 10G, the 1G advertisement is harmless and vice versa.
-        */
-       status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                     IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
-                                     IXGBE_SB_IOSF_TARGET_KR_PHY, &an_cntl);
+       /* Read contents of the Auto-Negotiation register, page 0 reg 4 */
+       rc = hw->phy.ops.read_reg(hw, IXGBE_M88E1500_COPPER_AN,
+                                       IXGBE_MDIO_ZERO_DEV_TYPE, &reg);
+       if (rc)
+               goto out;
 
-       if (status != IXGBE_SUCCESS) {
-               DEBUGOUT("Auto-Negotiation did not complete\n");
-               return status;
-       }
+       /* Disable all the settings related to Flow control Auto-negotiation */
+       reg &= ~IXGBE_M88E1500_COPPER_AN_AS_PAUSE;
+       reg &= ~IXGBE_M88E1500_COPPER_AN_PAUSE;
 
-       /* The possible values of fc.requested_mode are:
-        * 0: Flow control is completely disabled
-        * 1: Rx flow control is enabled (we can receive pause frames,
-        *    but not send pause frames).
-        * 2: Tx flow control is enabled (we can send pause frames but
-        *    we do not support receiving pause frames).
-        * 3: Both Rx and Tx flow control (symmetric) are enabled.
-        * other: Invalid.
+       /* Configure the Asymmetric and symmetric pause according to the user
+        * requested mode.
         */
        switch (hw->fc.requested_mode) {
-       case ixgbe_fc_none:
-               /* Flow control completely disabled by software override. */
-               an_cntl &= ~(IXGBE_KRM_AN_CNTL_1_SYM_PAUSE |
-                            IXGBE_KRM_AN_CNTL_1_ASM_PAUSE);
-               break;
-       case ixgbe_fc_tx_pause:
-               /* Tx Flow control is enabled, and Rx Flow control is
-                * disabled by software override.
-                */
-               an_cntl |= IXGBE_KRM_AN_CNTL_1_ASM_PAUSE;
-               an_cntl &= ~IXGBE_KRM_AN_CNTL_1_SYM_PAUSE;
+       case ixgbe_fc_full:
+               reg |= IXGBE_M88E1500_COPPER_AN_PAUSE;
+               reg |= IXGBE_M88E1500_COPPER_AN_AS_PAUSE;
                break;
        case ixgbe_fc_rx_pause:
-               /* Rx Flow control is enabled and Tx Flow control is
-                * disabled by software override. Since there really
-                * isn't a way to advertise that we are capable of RX
-                * Pause ONLY, we will advertise that we support both
-                * symmetric and asymmetric Rx PAUSE, as such we fall
-                * through to the fc_full statement.  Later, we will
-                * disable the adapter's ability to send PAUSE frames.
-                */
-       case ixgbe_fc_full:
-               /* Flow control (both Rx and Tx) is enabled by SW override. */
-               an_cntl |= IXGBE_KRM_AN_CNTL_1_SYM_PAUSE |
-                       IXGBE_KRM_AN_CNTL_1_ASM_PAUSE;
+               reg |= IXGBE_M88E1500_COPPER_AN_PAUSE;
+               reg |= IXGBE_M88E1500_COPPER_AN_AS_PAUSE;
+               break;
+       case ixgbe_fc_tx_pause:
+               reg |= IXGBE_M88E1500_COPPER_AN_AS_PAUSE;
                break;
        default:
-               ERROR_REPORT1(IXGBE_ERROR_ARGUMENT,
-                             "Flow control param set incorrectly\n");
-               return IXGBE_ERR_CONFIG;
+               break;
        }
 
-       status = hw->mac.ops.write_iosf_sb_reg(hw,
-                                      IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
-                                      IXGBE_SB_IOSF_TARGET_KR_PHY, an_cntl);
+       /* Write back to the Auto-Negotiation register with newly configured
+        * fields
+        */
+       hw->phy.ops.write_reg(hw, IXGBE_M88E1500_COPPER_AN,
+                                       IXGBE_MDIO_ZERO_DEV_TYPE, reg);
 
-       /* Restart auto-negotiation. */
-       status = hw->mac.ops.read_iosf_sb_reg(hw,
-                                     IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                     IXGBE_SB_IOSF_TARGET_KR_PHY, &link_ctrl);
+       /* In this section of the code we restart Auto-negotiation */
 
-       if (status != IXGBE_SUCCESS) {
-               DEBUGOUT("Auto-Negotiation did not complete\n");
-               return status;
-       }
+       /* Read the CONTROL register, Page 0 reg 0 */
+       rc = hw->phy.ops.read_reg(hw, IXGBE_M88E1500_COPPER_CTRL,
+                                       IXGBE_MDIO_ZERO_DEV_TYPE, &reg);
+       if (rc)
+               goto out;
 
-       link_ctrl |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;
-       status = hw->mac.ops.write_iosf_sb_reg(hw,
-                                      IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                      IXGBE_SB_IOSF_TARGET_KR_PHY, link_ctrl);
+       /* Set the bit to restart Auto-Neg. The bit to enable Auto-neg is ON
+        * by default
+        */
+       reg |= IXGBE_M88E1500_COPPER_CTRL_RESTART_AN;
 
-       return status;
+       /* write the new values to the register to restart Auto-Negotiation */
+       hw->phy.ops.write_reg(hw, IXGBE_M88E1500_COPPER_CTRL,
+                                       IXGBE_MDIO_ZERO_DEV_TYPE, reg);
+
+out:
+       return rc;
 }
 
 /**
- *  ixgbe_setup_fc_fiber_x550em_a - Set up flow control
+ *  ixgbe_setup_fc_backplane_x550em_a - Set up flow control
  *  @hw: pointer to hardware structure
  *
  *  Called at init time to set up flow control.
  **/
-s32 ixgbe_setup_fc_fiber_x550em_a(struct ixgbe_hw *hw)
+s32 ixgbe_setup_fc_backplane_x550em_a(struct ixgbe_hw *hw)
 {
-       struct ixgbe_mac_info *mac = &hw->mac;
-       s32 rc = IXGBE_SUCCESS;
-       u32 an_cntl4, lctrl, pcs_an;
+       s32 status = IXGBE_SUCCESS;
+       u32 an_cntl = 0;
 
-       DEBUGFUNC("ixgbe_setup_fc_fiber_x550em_a");
+       DEBUGFUNC("ixgbe_setup_fc_backplane_x550em_a");
 
        /* Validate the requested mode */
        if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
@@ -4234,46 +4544,21 @@ s32 ixgbe_setup_fc_fiber_x550em_a(struct ixgbe_hw *hw)
                return IXGBE_ERR_INVALID_LINK_SETTINGS;
        }
 
-       /* Enable clause 37 auto-negotiation in KRM_LINK_CTRL_1 */
        if (hw->fc.requested_mode == ixgbe_fc_default)
                hw->fc.requested_mode = ixgbe_fc_full;
 
-       rc = mac->ops.read_iosf_sb_reg(hw,
-                                      IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                      IXGBE_SB_IOSF_TARGET_KR_PHY, &lctrl);
-       if (rc)
-               return rc;
-
-       lctrl |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE;
-       lctrl |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CLAUSE_37_EN;
-
-       rc = mac->ops.write_iosf_sb_reg(hw,
-                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                       IXGBE_SB_IOSF_TARGET_KR_PHY, lctrl);
-       if (rc)
-               return rc;
-
-       /* Enable clause 37 over 73 in KRM_AN_CNTL_4 */
-       rc = mac->ops.read_iosf_sb_reg(hw,
-                                      IXGBE_KRM_AN_CNTL_4(hw->bus.lan_id),
-                                      IXGBE_SB_IOSF_TARGET_KR_PHY, &an_cntl4);
-       if (rc)
-               return rc;
-
-       an_cntl4 |= IXGBE_KRM_AN_CNTL_4_ECSR_AN37_OVER_73;
-
-       rc = mac->ops.write_iosf_sb_reg(hw,
-                                       IXGBE_KRM_AN_CNTL_4(hw->bus.lan_id),
-                                       IXGBE_SB_IOSF_TARGET_KR_PHY, an_cntl4);
-       if (rc)
-               return rc;
-
-       rc = hw->mac.ops.read_iosf_sb_reg(hw,
-                                         IXGBE_KRM_PCS_KX_AN(hw->bus.lan_id),
-                                         IXGBE_SB_IOSF_TARGET_KR_PHY, &pcs_an);
+       /* Set up the 1G and 10G flow control advertisement registers so the
+        * HW will be able to do FC autoneg once the cable is plugged in.  If
+        * we link at 10G, the 1G advertisement is harmless and vice versa.
+        */
+       status = hw->mac.ops.read_iosf_sb_reg(hw,
+                                       IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, &an_cntl);
 
-       if (rc)
-               return rc;
+       if (status != IXGBE_SUCCESS) {
+               DEBUGOUT("Auto-Negotiation did not complete\n");
+               return status;
+       }
 
        /* The possible values of fc.requested_mode are:
         * 0: Flow control is completely disabled
@@ -4287,15 +4572,15 @@ s32 ixgbe_setup_fc_fiber_x550em_a(struct ixgbe_hw *hw)
        switch (hw->fc.requested_mode) {
        case ixgbe_fc_none:
                /* Flow control completely disabled by software override. */
-               pcs_an &= ~(IXGBE_KRM_AN_CNTL_1_SYM_PAUSE |
-                           IXGBE_KRM_AN_CNTL_1_ASM_PAUSE);
+               an_cntl &= ~(IXGBE_KRM_AN_CNTL_1_SYM_PAUSE |
+                            IXGBE_KRM_AN_CNTL_1_ASM_PAUSE);
                break;
        case ixgbe_fc_tx_pause:
                /* Tx Flow control is enabled, and Rx Flow control is
                 * disabled by software override.
                 */
-               pcs_an |= IXGBE_KRM_PCS_KX_AN_ASM_PAUSE;
-               pcs_an &= ~IXGBE_KRM_PCS_KX_AN_SYM_PAUSE;
+               an_cntl |= IXGBE_KRM_AN_CNTL_1_ASM_PAUSE;
+               an_cntl &= ~IXGBE_KRM_AN_CNTL_1_SYM_PAUSE;
                break;
        case ixgbe_fc_rx_pause:
                /* Rx Flow control is enabled and Tx Flow control is
@@ -4308,8 +4593,8 @@ s32 ixgbe_setup_fc_fiber_x550em_a(struct ixgbe_hw *hw)
                 */
        case ixgbe_fc_full:
                /* Flow control (both Rx and Tx) is enabled by SW override. */
-               pcs_an |= IXGBE_KRM_PCS_KX_AN_SYM_PAUSE |
-                          IXGBE_KRM_PCS_KX_AN_ASM_PAUSE;
+               an_cntl |= IXGBE_KRM_AN_CNTL_1_SYM_PAUSE |
+                          IXGBE_KRM_AN_CNTL_1_ASM_PAUSE;
                break;
        default:
                ERROR_REPORT1(IXGBE_ERROR_ARGUMENT,
@@ -4317,26 +4602,14 @@ s32 ixgbe_setup_fc_fiber_x550em_a(struct ixgbe_hw *hw)
                return IXGBE_ERR_CONFIG;
        }
 
-       rc = hw->mac.ops.write_iosf_sb_reg(hw,
-                                          IXGBE_KRM_PCS_KX_AN(hw->bus.lan_id),
-                                          IXGBE_SB_IOSF_TARGET_KR_PHY, pcs_an);
+       status = hw->mac.ops.write_iosf_sb_reg(hw,
+                                       IXGBE_KRM_AN_CNTL_1(hw->bus.lan_id),
+                                       IXGBE_SB_IOSF_TARGET_KR_PHY, an_cntl);
 
        /* Restart auto-negotiation. */
-       rc = hw->mac.ops.read_iosf_sb_reg(hw,
-                                         IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                         IXGBE_SB_IOSF_TARGET_KR_PHY, &lctrl);
-
-       if (rc) {
-               DEBUGOUT("Auto-Negotiation did not complete\n");
-               return rc;
-       }
-
-       lctrl |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;
-       rc = hw->mac.ops.write_iosf_sb_reg(hw,
-                                       IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-                                       IXGBE_SB_IOSF_TARGET_KR_PHY, lctrl);
+       status = ixgbe_restart_an_internal_phy_x550em(hw);
 
-       return rc;
+       return status;
 }
 
 /**
@@ -4431,7 +4704,6 @@ STATIC s32 ixgbe_acquire_swfw_sync_X550a(struct ixgbe_hw *hw, u32 mask)
                        ixgbe_release_swfw_sync_X540(hw, hmask);
                if (status != IXGBE_ERR_TOKEN_RETRY)
                        return status;
-               msec_delay(FW_PHY_TOKEN_DELAY);
        }
 
        return status;
@@ -4468,7 +4740,7 @@ STATIC void ixgbe_release_swfw_sync_X550a(struct ixgbe_hw *hw, u32 mask)
  *  instances.
  **/
 s32 ixgbe_read_phy_reg_x550a(struct ixgbe_hw *hw, u32 reg_addr,
-                            u32 device_type, u16 *phy_data)
+                              u32 device_type, u16 *phy_data)
 {
        s32 status;
        u32 mask = hw->phy.phy_semaphore_mask | IXGBE_GSSR_TOKEN_SM;
@@ -4496,7 +4768,7 @@ s32 ixgbe_read_phy_reg_x550a(struct ixgbe_hw *hw, u32 reg_addr,
  *  The PHY Token is needed since the MDIO is shared between to MAC instances.
  **/
 s32 ixgbe_write_phy_reg_x550a(struct ixgbe_hw *hw, u32 reg_addr,
-                             u32 device_type, u16 phy_data)
+                               u32 device_type, u16 phy_data)
 {
        s32 status;
        u32 mask = hw->phy.phy_semaphore_mask | IXGBE_GSSR_TOKEN_SM;
@@ -4504,7 +4776,7 @@ s32 ixgbe_write_phy_reg_x550a(struct ixgbe_hw *hw, u32 reg_addr,
        DEBUGFUNC("ixgbe_write_phy_reg_x550a");
 
        if (hw->mac.ops.acquire_swfw_sync(hw, mask) == IXGBE_SUCCESS) {
-               status = ixgbe_write_phy_reg_mdi(hw, reg_addr, device_type,
+               status = hw->phy.ops.write_reg_mdi(hw, reg_addr, device_type,
                                                 phy_data);
                hw->mac.ops.release_swfw_sync(hw, mask);
        } else {
@@ -4569,8 +4841,10 @@ s32 ixgbe_setup_mac_link_t_X550em(struct ixgbe_hw *hw,
        else
                force_speed = IXGBE_LINK_SPEED_1GB_FULL;
 
-       /* If internal link mode is XFI, then setup XFI internal link. */
-       if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
+       /* If X552 and internal link mode is XFI, then setup XFI internal link.
+        */
+       if (hw->mac.type == ixgbe_mac_X550EM_x &&
+           !(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
                status = ixgbe_setup_ixfi_x550em(hw, &force_speed);
 
                if (status != IXGBE_SUCCESS)
@@ -4593,7 +4867,7 @@ s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
                              bool *link_up, bool link_up_wait_to_complete)
 {
        u32 status;
-       u16 autoneg_status;
+       u16 i, autoneg_status = 0;
 
        if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_copper)
                return IXGBE_ERR_CONFIG;
@@ -4606,21 +4880,18 @@ s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
                return status;
 
        /* MAC link is up, so check external PHY link.
-        * Read this twice back to back to indicate current status.
+        * X557 PHY. Link status is latching low, and can only be used to detect
+        * link drop, and not the current status of the link without performing
+        * back-to-back reads.
         */
-       status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
-                                     IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-                                     &autoneg_status);
-
-       if (status != IXGBE_SUCCESS)
-               return status;
-
-       status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
-                                     IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-                                     &autoneg_status);
+       for (i = 0; i < 2; i++) {
+               status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
+                                             IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
+                                             &autoneg_status);
 
-       if (status != IXGBE_SUCCESS)
-               return status;
+               if (status != IXGBE_SUCCESS)
+                       return status;
+       }
 
        /* If external PHY link is not up, then indicate link not up */
        if (!(autoneg_status & IXGBE_MDIO_AUTO_NEG_LINK_STATUS))
@@ -4694,3 +4965,63 @@ s32 ixgbe_led_off_t_X550em(struct ixgbe_hw *hw, u32 led_idx)
        return IXGBE_SUCCESS;
 }
 
+/**
+ *  ixgbe_set_fw_drv_ver_x550 - Sends driver version to firmware
+ *  @hw: pointer to the HW structure
+ *  @maj: driver version major number
+ *  @min: driver version minor number
+ *  @build: driver version build number
+ *  @sub: driver version sub build number
+ *  @len: length of driver_ver string
+ *  @driver_ver: driver string
+ *
+ *  Sends driver version number to firmware through the manageability
+ *  block.  On success return IXGBE_SUCCESS
+ *  else returns IXGBE_ERR_SWFW_SYNC when encountering an error acquiring
+ *  semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.
+ **/
+s32 ixgbe_set_fw_drv_ver_x550(struct ixgbe_hw *hw, u8 maj, u8 min,
+                             u8 build, u8 sub, u16 len, const char *driver_ver)
+{
+       struct ixgbe_hic_drv_info2 fw_cmd;
+       s32 ret_val = IXGBE_SUCCESS;
+       int i;
+
+       DEBUGFUNC("ixgbe_set_fw_drv_ver_x550");
+
+       if ((len == 0) || (driver_ver == NULL) ||
+          (len > sizeof(fw_cmd.driver_string)))
+               return IXGBE_ERR_INVALID_ARGUMENT;
+
+       fw_cmd.hdr.cmd = FW_CEM_CMD_DRIVER_INFO;
+       fw_cmd.hdr.buf_len = FW_CEM_CMD_DRIVER_INFO_LEN + len;
+       fw_cmd.hdr.cmd_or_resp.cmd_resv = FW_CEM_CMD_RESERVED;
+       fw_cmd.port_num = (u8)hw->bus.func;
+       fw_cmd.ver_maj = maj;
+       fw_cmd.ver_min = min;
+       fw_cmd.ver_build = build;
+       fw_cmd.ver_sub = sub;
+       fw_cmd.hdr.checksum = 0;
+       memcpy(fw_cmd.driver_string, driver_ver, len);
+       fw_cmd.hdr.checksum = ixgbe_calculate_checksum((u8 *)&fw_cmd,
+                               (FW_CEM_HDR_LEN + fw_cmd.hdr.buf_len));
+
+       for (i = 0; i <= FW_CEM_MAX_RETRIES; i++) {
+               ret_val = ixgbe_host_interface_command(hw, (u32 *)&fw_cmd,
+                                                      sizeof(fw_cmd),
+                                                      IXGBE_HI_COMMAND_TIMEOUT,
+                                                      true);
+               if (ret_val != IXGBE_SUCCESS)
+                       continue;
+
+               if (fw_cmd.hdr.cmd_or_resp.ret_status ==
+                   FW_CEM_RESP_STATUS_SUCCESS)
+                       ret_val = IXGBE_SUCCESS;
+               else
+                       ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
+
+               break;
+       }
+
+       return ret_val;
+}