e1000: convert to use of PMD_REGISTER_DRIVER and fix linking
[dpdk.git] / lib / librte_pmd_e1000 / e1000 / e1000_phy.c
index 381bafc..cc454d9 100644 (file)
@@ -33,14 +33,19 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "e1000_api.h"
 
-static s32 e1000_copper_link_autoneg(struct e1000_hw *hw);
-static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw);
+static s32 e1000_wait_autoneg(struct e1000_hw *hw);
+STATIC s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
+                                         u16 *data, bool read, bool page_set);
+STATIC u32 e1000_get_phy_addr_for_hv_page(u32 page);
+STATIC s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
+                                         u16 *data, bool read);
+
 /* Cable length tables */
 static const u16 e1000_m88_cable_length_table[] = {
        0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
 #define M88E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_m88_cable_length_table) / \
-                 sizeof(e1000_m88_cable_length_table[0]))
+               (sizeof(e1000_m88_cable_length_table) / \
+                sizeof(e1000_m88_cable_length_table[0]))
 
 static const u16 e1000_igp_2_cable_length_table[] = {
        0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21, 0, 0, 0, 3,
@@ -52,8 +57,8 @@ static const u16 e1000_igp_2_cable_length_table[] = {
        100, 105, 109, 113, 116, 119, 122, 124, 104, 109, 114, 118, 121,
        124};
 #define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_igp_2_cable_length_table) / \
-                 sizeof(e1000_igp_2_cable_length_table[0]))
+               (sizeof(e1000_igp_2_cable_length_table) / \
+                sizeof(e1000_igp_2_cable_length_table[0]))
 
 /**
  *  e1000_init_phy_ops_generic - Initialize PHY function pointers
@@ -76,25 +81,45 @@ void e1000_init_phy_ops_generic(struct e1000_hw *hw)
        phy->ops.get_cfg_done = e1000_null_ops_generic;
        phy->ops.get_cable_length = e1000_null_ops_generic;
        phy->ops.get_info = e1000_null_ops_generic;
+       phy->ops.set_page = e1000_null_set_page;
        phy->ops.read_reg = e1000_null_read_reg;
        phy->ops.read_reg_locked = e1000_null_read_reg;
+       phy->ops.read_reg_page = e1000_null_read_reg;
        phy->ops.release = e1000_null_phy_generic;
        phy->ops.reset = e1000_null_ops_generic;
        phy->ops.set_d0_lplu_state = e1000_null_lplu_state;
        phy->ops.set_d3_lplu_state = e1000_null_lplu_state;
        phy->ops.write_reg = e1000_null_write_reg;
        phy->ops.write_reg_locked = e1000_null_write_reg;
+       phy->ops.write_reg_page = e1000_null_write_reg;
        phy->ops.power_up = e1000_null_phy_generic;
        phy->ops.power_down = e1000_null_phy_generic;
+       phy->ops.read_i2c_byte = e1000_read_i2c_byte_null;
+       phy->ops.write_i2c_byte = e1000_write_i2c_byte_null;
+       phy->ops.cfg_on_link_up = e1000_null_ops_generic;
+}
+
+/**
+ *  e1000_null_set_page - No-op function, return 0
+ *  @hw: pointer to the HW structure
+ **/
+s32 e1000_null_set_page(struct e1000_hw E1000_UNUSEDARG *hw,
+                       u16 E1000_UNUSEDARG data)
+{
+       DEBUGFUNC("e1000_null_set_page");
+       UNREFERENCED_2PARAMETER(hw, data);
+       return E1000_SUCCESS;
 }
 
 /**
  *  e1000_null_read_reg - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_read_reg(struct e1000_hw *hw, u32 offset, u16 *data)
+s32 e1000_null_read_reg(struct e1000_hw E1000_UNUSEDARG *hw,
+                       u32 E1000_UNUSEDARG offset, u16 E1000_UNUSEDARG *data)
 {
        DEBUGFUNC("e1000_null_read_reg");
+       UNREFERENCED_3PARAMETER(hw, offset, data);
        return E1000_SUCCESS;
 }
 
@@ -102,9 +127,10 @@ s32 e1000_null_read_reg(struct e1000_hw *hw, u32 offset, u16 *data)
  *  e1000_null_phy_generic - No-op function, return void
  *  @hw: pointer to the HW structure
  **/
-void e1000_null_phy_generic(struct e1000_hw *hw)
+void e1000_null_phy_generic(struct e1000_hw E1000_UNUSEDARG *hw)
 {
        DEBUGFUNC("e1000_null_phy_generic");
+       UNREFERENCED_1PARAMETER(hw);
        return;
 }
 
@@ -112,9 +138,11 @@ void e1000_null_phy_generic(struct e1000_hw *hw)
  *  e1000_null_lplu_state - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_lplu_state(struct e1000_hw *hw, bool active)
+s32 e1000_null_lplu_state(struct e1000_hw E1000_UNUSEDARG *hw,
+                         bool E1000_UNUSEDARG active)
 {
        DEBUGFUNC("e1000_null_lplu_state");
+       UNREFERENCED_2PARAMETER(hw, active);
        return E1000_SUCCESS;
 }
 
@@ -122,9 +150,47 @@ s32 e1000_null_lplu_state(struct e1000_hw *hw, bool active)
  *  e1000_null_write_reg - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_write_reg(struct e1000_hw *hw, u32 offset, u16 data)
+s32 e1000_null_write_reg(struct e1000_hw E1000_UNUSEDARG *hw,
+                        u32 E1000_UNUSEDARG offset, u16 E1000_UNUSEDARG data)
 {
        DEBUGFUNC("e1000_null_write_reg");
+       UNREFERENCED_3PARAMETER(hw, offset, data);
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_read_i2c_byte_null - No-op function, return 0
+ *  @hw: pointer to hardware structure
+ *  @byte_offset: byte offset to write
+ *  @dev_addr: device address
+ *  @data: data value read
+ *
+ **/
+s32 e1000_read_i2c_byte_null(struct e1000_hw E1000_UNUSEDARG *hw,
+                            u8 E1000_UNUSEDARG byte_offset,
+                            u8 E1000_UNUSEDARG dev_addr,
+                            u8 E1000_UNUSEDARG *data)
+{
+       DEBUGFUNC("e1000_read_i2c_byte_null");
+       UNREFERENCED_4PARAMETER(hw, byte_offset, dev_addr, data);
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_write_i2c_byte_null - No-op function, return 0
+ *  @hw: pointer to hardware structure
+ *  @byte_offset: byte offset to write
+ *  @dev_addr: device address
+ *  @data: data value to write
+ *
+ **/
+s32 e1000_write_i2c_byte_null(struct e1000_hw E1000_UNUSEDARG *hw,
+                             u8 E1000_UNUSEDARG byte_offset,
+                             u8 E1000_UNUSEDARG dev_addr,
+                             u8 E1000_UNUSEDARG data)
+{
+       DEBUGFUNC("e1000_write_i2c_byte_null");
+       UNREFERENCED_4PARAMETER(hw, byte_offset, dev_addr, data);
        return E1000_SUCCESS;
 }
 
@@ -160,27 +226,34 @@ s32 e1000_get_phy_id(struct e1000_hw *hw)
        struct e1000_phy_info *phy = &hw->phy;
        s32 ret_val = E1000_SUCCESS;
        u16 phy_id;
+       u16 retry_count = 0;
 
        DEBUGFUNC("e1000_get_phy_id");
 
-       if (!(phy->ops.read_reg))
-               goto out;
+       if (!phy->ops.read_reg)
+               return E1000_SUCCESS;
 
-       ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
-       if (ret_val)
-               goto out;
+       while (retry_count < 2) {
+               ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
+               if (ret_val)
+                       return ret_val;
 
-       phy->id = (u32)(phy_id << 16);
-       usec_delay(20);
-       ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
-       if (ret_val)
-               goto out;
+               phy->id = (u32)(phy_id << 16);
+               usec_delay(20);
+               ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
+               if (ret_val)
+                       return ret_val;
 
-       phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
-       phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+               phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
+               phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
 
-out:
-       return ret_val;
+               if (phy->id != 0 && phy->id != PHY_REVISION_MASK)
+                       return E1000_SUCCESS;
+
+               retry_count++;
+       }
+
+       return E1000_SUCCESS;
 }
 
 /**
@@ -191,21 +264,18 @@ out:
  **/
 s32 e1000_phy_reset_dsp_generic(struct e1000_hw *hw)
 {
-       s32 ret_val = E1000_SUCCESS;
+       s32 ret_val;
 
        DEBUGFUNC("e1000_phy_reset_dsp_generic");
 
-       if (!(hw->phy.ops.write_reg))
-               goto out;
+       if (!hw->phy.ops.write_reg)
+               return E1000_SUCCESS;
 
        ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xC1);
        if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0);
+               return ret_val;
 
-out:
-       return ret_val;
+       return hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0);
 }
 
 /**
@@ -221,7 +291,6 @@ s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
 {
        struct e1000_phy_info *phy = &hw->phy;
        u32 i, mdic = 0;
-       s32 ret_val = E1000_SUCCESS;
 
        DEBUGFUNC("e1000_read_phy_reg_mdic");
 
@@ -230,42 +299,49 @@ s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
                return -E1000_ERR_PARAM;
        }
 
-       /*
-        * Set up Op-code, Phy Address, and register offset in the MDI
+       /* Set up Op-code, Phy Address, and register offset in the MDI
         * Control register.  The MAC will take care of interfacing with the
         * PHY to retrieve the desired data.
         */
        mdic = ((offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_READ));
+               (phy->addr << E1000_MDIC_PHY_SHIFT) |
+               (E1000_MDIC_OP_READ));
 
        E1000_WRITE_REG(hw, E1000_MDIC, mdic);
 
-       /*
-        * Poll the ready bit to see if the MDI read completed
+       /* Poll the ready bit to see if the MDI read completed
         * Increasing the time out as testing showed failures with
         * the lower time out
         */
        for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-               usec_delay(50);
+               usec_delay_irq(50);
                mdic = E1000_READ_REG(hw, E1000_MDIC);
                if (mdic & E1000_MDIC_READY)
                        break;
        }
        if (!(mdic & E1000_MDIC_READY)) {
                DEBUGOUT("MDI Read did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
+               return -E1000_ERR_PHY;
        }
        if (mdic & E1000_MDIC_ERROR) {
                DEBUGOUT("MDI Error\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
+               return -E1000_ERR_PHY;
+       }
+       if (((mdic & E1000_MDIC_REG_MASK) >> E1000_MDIC_REG_SHIFT) != offset) {
+               DEBUGOUT2("MDI Read offset error - requested %d, returned %d\n",
+                         offset,
+                         (mdic & E1000_MDIC_REG_MASK) >> E1000_MDIC_REG_SHIFT);
+               return -E1000_ERR_PHY;
        }
        *data = (u16) mdic;
 
-out:
-       return ret_val;
+       /* Allow some time after each MDIC transaction to avoid
+        * reading duplicate data in the next MDIC transaction.
+        */
+       if (hw->mac.type == e1000_pch2lan)
+               usec_delay_irq(100);
+
+       return E1000_SUCCESS;
 }
 
 /**
@@ -280,7 +356,6 @@ s32 e1000_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
 {
        struct e1000_phy_info *phy = &hw->phy;
        u32 i, mdic = 0;
-       s32 ret_val = E1000_SUCCESS;
 
        DEBUGFUNC("e1000_write_phy_reg_mdic");
 
@@ -289,42 +364,49 @@ s32 e1000_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
                return -E1000_ERR_PARAM;
        }
 
-       /*
-        * Set up Op-code, Phy Address, and register offset in the MDI
+       /* Set up Op-code, Phy Address, and register offset in the MDI
         * Control register.  The MAC will take care of interfacing with the
         * PHY to retrieve the desired data.
         */
        mdic = (((u32)data) |
-               (offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_WRITE));
+               (offset << E1000_MDIC_REG_SHIFT) |
+               (phy->addr << E1000_MDIC_PHY_SHIFT) |
+               (E1000_MDIC_OP_WRITE));
 
        E1000_WRITE_REG(hw, E1000_MDIC, mdic);
 
-       /*
-        * Poll the ready bit to see if the MDI read completed
+       /* Poll the ready bit to see if the MDI read completed
         * Increasing the time out as testing showed failures with
         * the lower time out
         */
        for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-               usec_delay(50);
+               usec_delay_irq(50);
                mdic = E1000_READ_REG(hw, E1000_MDIC);
                if (mdic & E1000_MDIC_READY)
                        break;
        }
        if (!(mdic & E1000_MDIC_READY)) {
                DEBUGOUT("MDI Write did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
+               return -E1000_ERR_PHY;
        }
        if (mdic & E1000_MDIC_ERROR) {
                DEBUGOUT("MDI Error\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
+               return -E1000_ERR_PHY;
+       }
+       if (((mdic & E1000_MDIC_REG_MASK) >> E1000_MDIC_REG_SHIFT) != offset) {
+               DEBUGOUT2("MDI Write offset error - requested %d, returned %d\n",
+                         offset,
+                         (mdic & E1000_MDIC_REG_MASK) >> E1000_MDIC_REG_SHIFT);
+               return -E1000_ERR_PHY;
        }
 
-out:
-       return ret_val;
+       /* Allow some time after each MDIC transaction to avoid
+        * reading duplicate data in the next MDIC transaction.
+        */
+       if (hw->mac.type == e1000_pch2lan)
+               usec_delay_irq(100);
+
+       return E1000_SUCCESS;
 }
 
 /**
@@ -343,14 +425,13 @@ s32 e1000_read_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 *data)
 
        DEBUGFUNC("e1000_read_phy_reg_i2c");
 
-       /*
-        * Set up Op-code, Phy Address, and register address in the I2CCMD
+       /* Set up Op-code, Phy Address, and register address in the I2CCMD
         * register.  The MAC will take care of interfacing with the
         * PHY to retrieve the desired data.
         */
        i2ccmd = ((offset << E1000_I2CCMD_REG_ADDR_SHIFT) |
-                 (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
-                 (E1000_I2CCMD_OPCODE_READ));
+                 (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
+                 (E1000_I2CCMD_OPCODE_READ));
 
        E1000_WRITE_REG(hw, E1000_I2CCMD, i2ccmd);
 
@@ -392,18 +473,24 @@ s32 e1000_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data)
 
        DEBUGFUNC("e1000_write_phy_reg_i2c");
 
+       /* Prevent overwritting SFP I2C EEPROM which is at A0 address.*/
+       if ((hw->phy.addr == 0) || (hw->phy.addr > 7)) {
+               DEBUGOUT1("PHY I2C Address %d is out of range.\n",
+                         hw->phy.addr);
+               return -E1000_ERR_CONFIG;
+       }
+
        /* Swap the data bytes for the I2C interface */
        phy_data_swapped = ((data >> 8) & 0x00FF) | ((data << 8) & 0xFF00);
 
-       /*
-        * Set up Op-code, Phy Address, and register address in the I2CCMD
+       /* Set up Op-code, Phy Address, and register address in the I2CCMD
         * register.  The MAC will take care of interfacing with the
         * PHY to retrieve the desired data.
         */
        i2ccmd = ((offset << E1000_I2CCMD_REG_ADDR_SHIFT) |
-                 (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
-                 E1000_I2CCMD_OPCODE_WRITE |
-                 phy_data_swapped);
+                 (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
+                 E1000_I2CCMD_OPCODE_WRITE |
+                 phy_data_swapped);
 
        E1000_WRITE_REG(hw, E1000_I2CCMD, i2ccmd);
 
@@ -426,6 +513,134 @@ s32 e1000_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data)
        return E1000_SUCCESS;
 }
 
+/**
+ *  e1000_read_sfp_data_byte - Reads SFP module data.
+ *  @hw: pointer to the HW structure
+ *  @offset: byte location offset to be read
+ *  @data: read data buffer pointer
+ *
+ *  Reads one byte from SFP module data stored
+ *  in SFP resided EEPROM memory or SFP diagnostic area.
+ *  Function should be called with
+ *  E1000_I2CCMD_SFP_DATA_ADDR(<byte offset>) for SFP module database access
+ *  E1000_I2CCMD_SFP_DIAG_ADDR(<byte offset>) for SFP diagnostics parameters
+ *  access
+ **/
+s32 e1000_read_sfp_data_byte(struct e1000_hw *hw, u16 offset, u8 *data)
+{
+       u32 i = 0;
+       u32 i2ccmd = 0;
+       u32 data_local = 0;
+
+       DEBUGFUNC("e1000_read_sfp_data_byte");
+
+       if (offset > E1000_I2CCMD_SFP_DIAG_ADDR(255)) {
+               DEBUGOUT("I2CCMD command address exceeds upper limit\n");
+               return -E1000_ERR_PHY;
+       }
+
+       /* Set up Op-code, EEPROM Address,in the I2CCMD
+        * register. The MAC will take care of interfacing with the
+        * EEPROM to retrieve the desired data.
+        */
+       i2ccmd = ((offset << E1000_I2CCMD_REG_ADDR_SHIFT) |
+                 E1000_I2CCMD_OPCODE_READ);
+
+       E1000_WRITE_REG(hw, E1000_I2CCMD, i2ccmd);
+
+       /* Poll the ready bit to see if the I2C read completed */
+       for (i = 0; i < E1000_I2CCMD_PHY_TIMEOUT; i++) {
+               usec_delay(50);
+               data_local = E1000_READ_REG(hw, E1000_I2CCMD);
+               if (data_local & E1000_I2CCMD_READY)
+                       break;
+       }
+       if (!(data_local & E1000_I2CCMD_READY)) {
+               DEBUGOUT("I2CCMD Read did not complete\n");
+               return -E1000_ERR_PHY;
+       }
+       if (data_local & E1000_I2CCMD_ERROR) {
+               DEBUGOUT("I2CCMD Error bit set\n");
+               return -E1000_ERR_PHY;
+       }
+       *data = (u8) data_local & 0xFF;
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_write_sfp_data_byte - Writes SFP module data.
+ *  @hw: pointer to the HW structure
+ *  @offset: byte location offset to write to
+ *  @data: data to write
+ *
+ *  Writes one byte to SFP module data stored
+ *  in SFP resided EEPROM memory or SFP diagnostic area.
+ *  Function should be called with
+ *  E1000_I2CCMD_SFP_DATA_ADDR(<byte offset>) for SFP module database access
+ *  E1000_I2CCMD_SFP_DIAG_ADDR(<byte offset>) for SFP diagnostics parameters
+ *  access
+ **/
+s32 e1000_write_sfp_data_byte(struct e1000_hw *hw, u16 offset, u8 data)
+{
+       u32 i = 0;
+       u32 i2ccmd = 0;
+       u32 data_local = 0;
+
+       DEBUGFUNC("e1000_write_sfp_data_byte");
+
+       if (offset > E1000_I2CCMD_SFP_DIAG_ADDR(255)) {
+               DEBUGOUT("I2CCMD command address exceeds upper limit\n");
+               return -E1000_ERR_PHY;
+       }
+       /* The programming interface is 16 bits wide
+        * so we need to read the whole word first
+        * then update appropriate byte lane and write
+        * the updated word back.
+        */
+       /* Set up Op-code, EEPROM Address,in the I2CCMD
+        * register. The MAC will take care of interfacing
+        * with an EEPROM to write the data given.
+        */
+       i2ccmd = ((offset << E1000_I2CCMD_REG_ADDR_SHIFT) |
+                 E1000_I2CCMD_OPCODE_READ);
+       /* Set a command to read single word */
+       E1000_WRITE_REG(hw, E1000_I2CCMD, i2ccmd);
+       for (i = 0; i < E1000_I2CCMD_PHY_TIMEOUT; i++) {
+               usec_delay(50);
+               /* Poll the ready bit to see if lastly
+                * launched I2C operation completed
+                */
+               i2ccmd = E1000_READ_REG(hw, E1000_I2CCMD);
+               if (i2ccmd & E1000_I2CCMD_READY) {
+                       /* Check if this is READ or WRITE phase */
+                       if ((i2ccmd & E1000_I2CCMD_OPCODE_READ) ==
+                           E1000_I2CCMD_OPCODE_READ) {
+                               /* Write the selected byte
+                                * lane and update whole word
+                                */
+                               data_local = i2ccmd & 0xFF00;
+                               data_local |= data;
+                               i2ccmd = ((offset <<
+                                       E1000_I2CCMD_REG_ADDR_SHIFT) |
+                                       E1000_I2CCMD_OPCODE_WRITE | data_local);
+                               E1000_WRITE_REG(hw, E1000_I2CCMD, i2ccmd);
+                       } else {
+                               break;
+                       }
+               }
+       }
+       if (!(i2ccmd & E1000_I2CCMD_READY)) {
+               DEBUGOUT("I2CCMD Write did not complete\n");
+               return -E1000_ERR_PHY;
+       }
+       if (i2ccmd & E1000_I2CCMD_ERROR) {
+               DEBUGOUT("I2CCMD Error bit set\n");
+               return -E1000_ERR_PHY;
+       }
+       return E1000_SUCCESS;
+}
+
 /**
  *  e1000_read_phy_reg_m88 - Read m88 PHY register
  *  @hw: pointer to the HW structure
@@ -438,23 +653,22 @@ s32 e1000_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data)
  **/
 s32 e1000_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       s32 ret_val = E1000_SUCCESS;
+       s32 ret_val;
 
        DEBUGFUNC("e1000_read_phy_reg_m88");
 
-       if (!(hw->phy.ops.acquire))
-               goto out;
+       if (!hw->phy.ops.acquire)
+               return E1000_SUCCESS;
 
        ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
+                                         data);
 
        hw->phy.ops.release(hw);
 
-out:
        return ret_val;
 }
 
@@ -469,26 +683,45 @@ out:
  **/
 s32 e1000_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       s32 ret_val = E1000_SUCCESS;
+       s32 ret_val;
 
        DEBUGFUNC("e1000_write_phy_reg_m88");
 
-       if (!(hw->phy.ops.acquire))
-               goto out;
+       if (!hw->phy.ops.acquire)
+               return E1000_SUCCESS;
 
        ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
+                                          data);
 
        hw->phy.ops.release(hw);
 
-out:
        return ret_val;
 }
 
+/**
+ *  e1000_set_page_igp - Set page as on IGP-like PHY(s)
+ *  @hw: pointer to the HW structure
+ *  @page: page to set (shifted left when necessary)
+ *
+ *  Sets PHY page required for PHY register access.  Assumes semaphore is
+ *  already acquired.  Note, this function sets phy.addr to 1 so the caller
+ *  must set it appropriately (if necessary) after this function returns.
+ **/
+s32 e1000_set_page_igp(struct e1000_hw *hw, u16 page)
+{
+       DEBUGFUNC("e1000_set_page_igp");
+
+       DEBUGOUT1("Setting page 0x%x\n", page);
+
+       hw->phy.addr = 1;
+
+       return e1000_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT, page);
+}
+
 /**
  *  __e1000_read_phy_reg_igp - Read igp PHY register
  *  @hw: pointer to the HW structure
@@ -501,36 +734,32 @@ out:
  *  semaphores before exiting.
  **/
 static s32 __e1000_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data,
-                                    bool locked)
+                                   bool locked)
 {
        s32 ret_val = E1000_SUCCESS;
 
        DEBUGFUNC("__e1000_read_phy_reg_igp");
 
        if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
+               if (!hw->phy.ops.acquire)
+                       return E1000_SUCCESS;
 
                ret_val = hw->phy.ops.acquire(hw);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        }
 
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
+       if (offset > MAX_PHY_MULTI_PAGE_REG)
                ret_val = e1000_write_phy_reg_mdic(hw,
-                                                  IGP01E1000_PHY_PAGE_SELECT,
-                                                  (u16)offset);
-               if (ret_val)
-                       goto release;
-       }
-
-       ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-
-release:
+                                                  IGP01E1000_PHY_PAGE_SELECT,
+                                                  (u16)offset);
+       if (!ret_val)
+               ret_val = e1000_read_phy_reg_mdic(hw,
+                                                 MAX_PHY_REG_ADDRESS & offset,
+                                                 data);
        if (!locked)
                hw->phy.ops.release(hw);
-out:
+
        return ret_val;
 }
 
@@ -546,7 +775,7 @@ out:
  **/
 s32 e1000_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       return __e1000_read_phy_reg_igp(hw, offset, data, FALSE);
+       return __e1000_read_phy_reg_igp(hw, offset, data, false);
 }
 
 /**
@@ -560,7 +789,7 @@ s32 e1000_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data)
  **/
 s32 e1000_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       return __e1000_read_phy_reg_igp(hw, offset, data, TRUE);
+       return __e1000_read_phy_reg_igp(hw, offset, data, true);
 }
 
 /**
@@ -574,37 +803,32 @@ s32 e1000_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data)
  *  at the offset.  Release any acquired semaphores before exiting.
  **/
 static s32 __e1000_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data,
-                                     bool locked)
+                                    bool locked)
 {
        s32 ret_val = E1000_SUCCESS;
 
        DEBUGFUNC("e1000_write_phy_reg_igp");
 
        if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
+               if (!hw->phy.ops.acquire)
+                       return E1000_SUCCESS;
 
                ret_val = hw->phy.ops.acquire(hw);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        }
 
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
+       if (offset > MAX_PHY_MULTI_PAGE_REG)
                ret_val = e1000_write_phy_reg_mdic(hw,
-                                                  IGP01E1000_PHY_PAGE_SELECT,
-                                                  (u16)offset);
-               if (ret_val)
-                       goto release;
-       }
-
-       ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-release:
+                                                  IGP01E1000_PHY_PAGE_SELECT,
+                                                  (u16)offset);
+       if (!ret_val)
+               ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS &
+                                                      offset,
+                                                  data);
        if (!locked)
                hw->phy.ops.release(hw);
 
-out:
        return ret_val;
 }
 
@@ -619,7 +843,7 @@ out:
  **/
 s32 e1000_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       return __e1000_write_phy_reg_igp(hw, offset, data, FALSE);
+       return __e1000_write_phy_reg_igp(hw, offset, data, false);
 }
 
 /**
@@ -633,7 +857,7 @@ s32 e1000_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
  **/
 s32 e1000_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       return __e1000_write_phy_reg_igp(hw, offset, data, TRUE);
+       return __e1000_write_phy_reg_igp(hw, offset, data, true);
 }
 
 /**
@@ -648,25 +872,27 @@ s32 e1000_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data)
  *  Release any acquired semaphores before exiting.
  **/
 static s32 __e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
-                                 bool locked)
+                                bool locked)
 {
        u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
 
        DEBUGFUNC("__e1000_read_kmrn_reg");
 
        if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
+               s32 ret_val = E1000_SUCCESS;
+
+               if (!hw->phy.ops.acquire)
+                       return E1000_SUCCESS;
 
                ret_val = hw->phy.ops.acquire(hw);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        }
 
        kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
+                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
        E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta);
+       E1000_WRITE_FLUSH(hw);
 
        usec_delay(2);
 
@@ -676,8 +902,7 @@ static s32 __e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
        if (!locked)
                hw->phy.ops.release(hw);
 
-out:
-       return ret_val;
+       return E1000_SUCCESS;
 }
 
 /**
@@ -692,7 +917,7 @@ out:
  **/
 s32 e1000_read_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       return __e1000_read_kmrn_reg(hw, offset, data, FALSE);
+       return __e1000_read_kmrn_reg(hw, offset, data, false);
 }
 
 /**
@@ -707,7 +932,7 @@ s32 e1000_read_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 *data)
  **/
 s32 e1000_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       return __e1000_read_kmrn_reg(hw, offset, data, TRUE);
+       return __e1000_read_kmrn_reg(hw, offset, data, true);
 }
 
 /**
@@ -722,33 +947,34 @@ s32 e1000_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data)
  *  before exiting.
  **/
 static s32 __e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
-                                  bool locked)
+                                 bool locked)
 {
        u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
 
        DEBUGFUNC("e1000_write_kmrn_reg_generic");
 
        if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
+               s32 ret_val = E1000_SUCCESS;
+
+               if (!hw->phy.ops.acquire)
+                       return E1000_SUCCESS;
 
                ret_val = hw->phy.ops.acquire(hw);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        }
 
        kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | data;
+                      E1000_KMRNCTRLSTA_OFFSET) | data;
        E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta);
+       E1000_WRITE_FLUSH(hw);
 
        usec_delay(2);
 
        if (!locked)
                hw->phy.ops.release(hw);
 
-out:
-       return ret_val;
+       return E1000_SUCCESS;
 }
 
 /**
@@ -762,7 +988,7 @@ out:
  **/
 s32 e1000_write_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       return __e1000_write_kmrn_reg(hw, offset, data, FALSE);
+       return __e1000_write_kmrn_reg(hw, offset, data, false);
 }
 
 /**
@@ -776,7 +1002,47 @@ s32 e1000_write_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 data)
  **/
 s32 e1000_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       return __e1000_write_kmrn_reg(hw, offset, data, TRUE);
+       return __e1000_write_kmrn_reg(hw, offset, data, true);
+}
+
+/**
+ *  e1000_set_master_slave_mode - Setup PHY for Master/slave mode
+ *  @hw: pointer to the HW structure
+ *
+ *  Sets up Master/slave mode
+ **/
+STATIC s32 e1000_set_master_slave_mode(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       /* Resolve Master/Slave mode */
+       ret_val = hw->phy.ops.read_reg(hw, PHY_1000T_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /* load defaults for future use */
+       hw->phy.original_ms_type = (phy_data & CR_1000T_MS_ENABLE) ?
+                                  ((phy_data & CR_1000T_MS_VALUE) ?
+                                   e1000_ms_force_master :
+                                   e1000_ms_force_slave) : e1000_ms_auto;
+
+       switch (hw->phy.ms_type) {
+       case e1000_ms_force_master:
+               phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
+               break;
+       case e1000_ms_force_slave:
+               phy_data |= CR_1000T_MS_ENABLE;
+               phy_data &= ~(CR_1000T_MS_VALUE);
+               break;
+       case e1000_ms_auto:
+               phy_data &= ~CR_1000T_MS_ENABLE;
+               /* fall-through */
+       default:
+               break;
+       }
+
+       return hw->phy.ops.write_reg(hw, PHY_1000T_CTRL, phy_data);
 }
 
 /**
@@ -792,23 +1058,18 @@ s32 e1000_copper_link_setup_82577(struct e1000_hw *hw)
 
        DEBUGFUNC("e1000_copper_link_setup_82577");
 
-       if (hw->phy.reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
        if (hw->phy.type == e1000_phy_82580) {
                ret_val = hw->phy.ops.reset(hw);
                if (ret_val) {
                        DEBUGOUT("Error resetting the PHY.\n");
-                       goto out;
+                       return ret_val;
                }
        }
 
        /* Enable CRS on Tx. This must be set for half-duplex operation. */
        ret_val = hw->phy.ops.read_reg(hw, I82577_CFG_REG, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        phy_data |= I82577_CFG_ASSERT_CRS_ON_TX;
 
@@ -816,9 +1077,35 @@ s32 e1000_copper_link_setup_82577(struct e1000_hw *hw)
        phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;
 
        ret_val = hw->phy.ops.write_reg(hw, I82577_CFG_REG, phy_data);
+       if (ret_val)
+               return ret_val;
 
-out:
-       return ret_val;
+       /* Set MDI/MDIX mode */
+       ret_val = hw->phy.ops.read_reg(hw, I82577_PHY_CTRL_2, &phy_data);
+       if (ret_val)
+               return ret_val;
+       phy_data &= ~I82577_PHY_CTRL2_MDIX_CFG_MASK;
+       /* Options:
+        *   0 - Auto (default)
+        *   1 - MDI mode
+        *   2 - MDI-X mode
+        */
+       switch (hw->phy.mdix) {
+       case 1:
+               break;
+       case 2:
+               phy_data |= I82577_PHY_CTRL2_MANUAL_MDIX;
+               break;
+       case 0:
+       default:
+               phy_data |= I82577_PHY_CTRL2_AUTO_MDI_MDIX;
+               break;
+       }
+       ret_val = hw->phy.ops.write_reg(hw, I82577_PHY_CTRL_2, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       return e1000_set_master_slave_mode(hw);
 }
 
 /**
@@ -836,20 +1123,17 @@ s32 e1000_copper_link_setup_m88(struct e1000_hw *hw)
 
        DEBUGFUNC("e1000_copper_link_setup_m88");
 
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
 
        /* Enable CRS on Tx. This must be set for half-duplex operation. */
        ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
+       /* For BM PHY this bit is downshift enable */
+       if (phy->type != e1000_phy_bm)
+               phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
 
-       /*
-        * Options:
+       /* Options:
         *   MDI/MDI-X = 0 (default)
         *   0 - Auto for all speeds
         *   1 - MDI mode
@@ -874,30 +1158,50 @@ s32 e1000_copper_link_setup_m88(struct e1000_hw *hw)
                break;
        }
 
-       /*
-        * Options:
+       /* Options:
         *   disable_polarity_correction = 0 (default)
         *       Automatic Correction for Reversed Cable Polarity
         *   0 - Disabled
         *   1 - Enabled
         */
        phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-       if (phy->disable_polarity_correction == 1)
+       if (phy->disable_polarity_correction)
                phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
 
+       /* Enable downshift on BM (disabled by default) */
+       if (phy->type == e1000_phy_bm) {
+               /* For 82574/82583, first disable then enable downshift */
+               if (phy->id == BME1000_E_PHY_ID_R2) {
+                       phy_data &= ~BME1000_PSCR_ENABLE_DOWNSHIFT;
+                       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL,
+                                                    phy_data);
+                       if (ret_val)
+                               return ret_val;
+                       /* Commit the changes. */
+                       ret_val = phy->ops.commit(hw);
+                       if (ret_val) {
+                               DEBUGOUT("Error committing the PHY changes\n");
+                               return ret_val;
+                       }
+               }
+
+               phy_data |= BME1000_PSCR_ENABLE_DOWNSHIFT;
+       }
+
        ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       if (phy->revision < E1000_REVISION_4) {
-               /*
-                * Force TX_CLK in the Extended PHY Specific Control Register
+       if ((phy->type == e1000_phy_m88) &&
+           (phy->revision < E1000_REVISION_4) &&
+           (phy->id != BME1000_E_PHY_ID_R2)) {
+               /* Force TX_CLK in the Extended PHY Specific Control Register
                 * to 25MHz clock.
                 */
                ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            &phy_data);
+                                           &phy_data);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                phy_data |= M88E1000_EPSCR_TX_CLK_25;
 
@@ -909,29 +1213,55 @@ s32 e1000_copper_link_setup_m88(struct e1000_hw *hw)
                } else {
                        /* Configure Master and Slave downshift values */
                        phy_data &= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |
-                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);
+                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);
                        phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |
-                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);
+                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);
                }
                ret_val = phy->ops.write_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            phy_data);
+                                            phy_data);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       if ((phy->type == e1000_phy_bm) && (phy->id == BME1000_E_PHY_ID_R2)) {
+               /* Set PHY page 0, register 29 to 0x0003 */
+               ret_val = phy->ops.write_reg(hw, 29, 0x0003);
+               if (ret_val)
+                       return ret_val;
+
+               /* Set PHY page 0, register 30 to 0x0000 */
+               ret_val = phy->ops.write_reg(hw, 30, 0x0000);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        }
 
        /* Commit the changes. */
        ret_val = phy->ops.commit(hw);
        if (ret_val) {
                DEBUGOUT("Error committing the PHY changes\n");
-               goto out;
+               return ret_val;
        }
 
-out:
-       return ret_val;
-}
+       if (phy->type == e1000_phy_82578) {
+               ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
+                                           &phy_data);
+               if (ret_val)
+                       return ret_val;
 
-/**
- *  e1000_copper_link_setup_m88_gen2 - Setup m88 PHY's for copper link
+               /* 82578 PHY - set the downshift count to 1x. */
+               phy_data |= I82578_EPSCR_DOWNSHIFT_ENABLE;
+               phy_data &= ~I82578_EPSCR_DOWNSHIFT_COUNTER_MASK;
+               ret_val = phy->ops.write_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
+                                            phy_data);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_copper_link_setup_m88_gen2 - Setup m88 PHY's for copper link
  *  @hw: pointer to the HW structure
  *
  *  Sets up MDI/MDI-X and polarity for i347-AT4, m88e1322 and m88e1112 PHY's.
@@ -945,18 +1275,13 @@ s32 e1000_copper_link_setup_m88_gen2(struct e1000_hw *hw)
 
        DEBUGFUNC("e1000_copper_link_setup_m88_gen2");
 
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
 
        /* Enable CRS on Tx. This must be set for half-duplex operation. */
        ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       /*
-        * Options:
+       /* Options:
         *   MDI/MDI-X = 0 (default)
         *   0 - Auto for all speeds
         *   1 - MDI mode
@@ -984,35 +1309,51 @@ s32 e1000_copper_link_setup_m88_gen2(struct e1000_hw *hw)
                break;
        }
 
-       /*
-        * Options:
+       /* Options:
         *   disable_polarity_correction = 0 (default)
         *       Automatic Correction for Reversed Cable Polarity
         *   0 - Disabled
         *   1 - Enabled
         */
        phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-       if (phy->disable_polarity_correction == 1)
+       if (phy->disable_polarity_correction)
                phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
 
        /* Enable downshift and setting it to X6 */
+       if (phy->id == M88E1543_E_PHY_ID) {
+               phy_data &= ~I347AT4_PSCR_DOWNSHIFT_ENABLE;
+               ret_val =
+                   phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               ret_val = phy->ops.commit(hw);
+               if (ret_val) {
+                       DEBUGOUT("Error committing the PHY changes\n");
+                       return ret_val;
+               }
+       }
+
        phy_data &= ~I347AT4_PSCR_DOWNSHIFT_MASK;
        phy_data |= I347AT4_PSCR_DOWNSHIFT_6X;
        phy_data |= I347AT4_PSCR_DOWNSHIFT_ENABLE;
 
        ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        /* Commit the changes. */
        ret_val = phy->ops.commit(hw);
        if (ret_val) {
                DEBUGOUT("Error committing the PHY changes\n");
-               goto out;
+               return ret_val;
        }
 
-out:
-       return ret_val;
+       ret_val = e1000_set_master_slave_mode(hw);
+       if (ret_val)
+               return ret_val;
+
+       return E1000_SUCCESS;
 }
 
 /**
@@ -1030,35 +1371,42 @@ s32 e1000_copper_link_setup_igp(struct e1000_hw *hw)
 
        DEBUGFUNC("e1000_copper_link_setup_igp");
 
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
 
        ret_val = hw->phy.ops.reset(hw);
        if (ret_val) {
                DEBUGOUT("Error resetting the PHY.\n");
-               goto out;
+               return ret_val;
        }
 
-       /*
-        * Wait 100ms for MAC to configure PHY from NVM settings, to avoid
+       /* Wait 100ms for MAC to configure PHY from NVM settings, to avoid
         * timeout issues when LFS is enabled.
         */
        msec_delay(100);
 
+       /* The NVM settings will configure LPLU in D3 for
+        * non-IGP1 PHYs.
+        */
+       if (phy->type == e1000_phy_igp) {
+               /* disable lplu d3 during driver init */
+               ret_val = hw->phy.ops.set_d3_lplu_state(hw, false);
+               if (ret_val) {
+                       DEBUGOUT("Error Disabling LPLU D3\n");
+                       return ret_val;
+               }
+       }
+
        /* disable lplu d0 during driver init */
        if (hw->phy.ops.set_d0_lplu_state) {
-               ret_val = hw->phy.ops.set_d0_lplu_state(hw, FALSE);
+               ret_val = hw->phy.ops.set_d0_lplu_state(hw, false);
                if (ret_val) {
                        DEBUGOUT("Error Disabling LPLU D0\n");
-                       goto out;
+                       return ret_val;
                }
        }
        /* Configure mdi-mdix settings */
        ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CTRL, &data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        data &= ~IGP01E1000_PSCR_AUTO_MDIX;
 
@@ -1076,141 +1424,43 @@ s32 e1000_copper_link_setup_igp(struct e1000_hw *hw)
        }
        ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CTRL, data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        /* set auto-master slave resolution settings */
        if (hw->mac.autoneg) {
-               /*
-                * when autonegotiation advertisement is only 1000Mbps then we
+               /* when autonegotiation advertisement is only 1000Mbps then we
                 * should disable SmartSpeed and enable Auto MasterSlave
                 * resolution as hardware default.
                 */
                if (phy->autoneg_advertised == ADVERTISE_1000_FULL) {
                        /* Disable SmartSpeed */
                        ret_val = phy->ops.read_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
+                                                   IGP01E1000_PHY_PORT_CONFIG,
+                                                   &data);
                        if (ret_val)
-                               goto out;
+                               return ret_val;
 
                        data &= ~IGP01E1000_PSCFR_SMART_SPEED;
                        ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
+                                                    IGP01E1000_PHY_PORT_CONFIG,
+                                                    data);
                        if (ret_val)
-                               goto out;
+                               return ret_val;
 
                        /* Set auto Master/Slave resolution process */
                        ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL, &data);
                        if (ret_val)
-                               goto out;
+                               return ret_val;
 
                        data &= ~CR_1000T_MS_ENABLE;
                        ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, data);
                        if (ret_val)
-                               goto out;
-               }
-
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL, &data);
-               if (ret_val)
-                       goto out;
-
-               /* load defaults for future use */
-               phy->original_ms_type = (data & CR_1000T_MS_ENABLE) ?
-                       ((data & CR_1000T_MS_VALUE) ?
-                       e1000_ms_force_master :
-                       e1000_ms_force_slave) :
-                       e1000_ms_auto;
-
-               switch (phy->ms_type) {
-               case e1000_ms_force_master:
-                       data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_force_slave:
-                       data |= CR_1000T_MS_ENABLE;
-                       data &= ~(CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_auto:
-                       data &= ~CR_1000T_MS_ENABLE;
-               default:
-                       break;
+                               return ret_val;
                }
-               ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, data);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_copper_link_autoneg - Setup/Enable autoneg for copper link
- *  @hw: pointer to the HW structure
- *
- *  Performs initial bounds checking on autoneg advertisement parameter, then
- *  configure to advertise the full capability.  Setup the PHY to autoneg
- *  and restart the negotiation process between the link partner.  If
- *  autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
- **/
-static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_ctrl;
-
-       DEBUGFUNC("e1000_copper_link_autoneg");
-
-       /*
-        * Perform some bounds checking on the autoneg advertisement
-        * parameter.
-        */
-       phy->autoneg_advertised &= phy->autoneg_mask;
-
-       /*
-        * If autoneg_advertised is zero, we assume it was not defaulted
-        * by the calling code so we set to advertise full capability.
-        */
-       if (phy->autoneg_advertised == 0)
-               phy->autoneg_advertised = phy->autoneg_mask;
-
-       DEBUGOUT("Reconfiguring auto-neg advertisement params\n");
-       ret_val = e1000_phy_setup_autoneg(hw);
-       if (ret_val) {
-               DEBUGOUT("Error Setting up Auto-Negotiation\n");
-               goto out;
-       }
-       DEBUGOUT("Restarting Auto-Neg\n");
-
-       /*
-        * Restart auto-negotiation by setting the Auto Neg Enable bit and
-        * the Auto Neg Restart bit in the PHY control register.
-        */
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       phy_ctrl |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               goto out;
 
-       /*
-        * Does the user want to wait for Auto-Neg to complete here, or
-        * check at a later time (for example, callback routine).
-        */
-       if (phy->autoneg_wait_to_complete) {
-               ret_val = hw->mac.ops.wait_autoneg(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error while waiting for "
-                                "autoneg to complete\n");
-                       goto out;
-               }
+               ret_val = e1000_set_master_slave_mode(hw);
        }
 
-       hw->mac.get_link_status = TRUE;
-
-out:
        return ret_val;
 }
 
@@ -1223,7 +1473,7 @@ out:
  *  return successful.  Otherwise, setup advertisement and flow control to
  *  the appropriate values for the wanted auto-negotiation.
  **/
-static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
+s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
 {
        struct e1000_phy_info *phy = &hw->phy;
        s32 ret_val;
@@ -1237,33 +1487,31 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
        /* Read the MII Auto-Neg Advertisement Register (Address 4). */
        ret_val = phy->ops.read_reg(hw, PHY_AUTONEG_ADV, &mii_autoneg_adv_reg);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
                /* Read the MII 1000Base-T Control Register (Address 9). */
                ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL,
-                                           &mii_1000t_ctrl_reg);
+                                           &mii_1000t_ctrl_reg);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        }
 
-       /*
-        * Need to parse both autoneg_advertised and fc and set up
+       /* Need to parse both autoneg_advertised and fc and set up
         * the appropriate PHY registers.  First we will parse for
         * autoneg_advertised software override.  Since we can advertise
         * a plethora of combinations, we need to check each bit
         * individually.
         */
 
-       /*
-        * First we clear all the 10/100 mb speed bits in the Auto-Neg
+       /* First we clear all the 10/100 mb speed bits in the Auto-Neg
         * Advertisement Register (Address 4) and the 1000 mb speed bits in
         * the  1000Base-T Control Register (Address 9).
         */
        mii_autoneg_adv_reg &= ~(NWAY_AR_100TX_FD_CAPS |
-                                NWAY_AR_100TX_HD_CAPS |
-                                NWAY_AR_10T_FD_CAPS   |
-                                NWAY_AR_10T_HD_CAPS);
+                                NWAY_AR_100TX_HD_CAPS |
+                                NWAY_AR_10T_FD_CAPS   |
+                                NWAY_AR_10T_HD_CAPS);
        mii_1000t_ctrl_reg &= ~(CR_1000T_HD_CAPS | CR_1000T_FD_CAPS);
 
        DEBUGOUT1("autoneg_advertised %x\n", phy->autoneg_advertised);
@@ -1302,8 +1550,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
                mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
        }
 
-       /*
-        * Check for a software override of the flow control settings, and
+       /* Check for a software override of the flow control settings, and
         * setup the PHY advertisement registers accordingly.  If
         * auto-negotiation is enabled, then software will have to set the
         * "PAUSE" bits to the correct value in the Auto-Negotiation
@@ -1322,15 +1569,13 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
         */
        switch (hw->fc.current_mode) {
        case e1000_fc_none:
-               /*
-                * Flow control (Rx & Tx) is completely disabled by a
+               /* Flow control (Rx & Tx) is completely disabled by a
                 * software over-ride.
                 */
                mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
                break;
        case e1000_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled, and Tx Flow control is
+               /* Rx Flow control is enabled, and Tx Flow control is
                 * disabled, by a software over-ride.
                 *
                 * Since there really isn't a way to advertise that we are
@@ -1342,41 +1587,97 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
                mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
                break;
        case e1000_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is
+               /* Tx Flow control is enabled, and Rx Flow control is
                 * disabled, by a software over-ride.
                 */
                mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
                mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
                break;
        case e1000_fc_full:
-               /*
-                * Flow control (both Rx and Tx) is enabled by a software
+               /* Flow control (both Rx and Tx) is enabled by a software
                 * over-ride.
                 */
                mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
                break;
        default:
                DEBUGOUT("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
+               return -E1000_ERR_CONFIG;
        }
 
        ret_val = phy->ops.write_reg(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        DEBUGOUT1("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
 
-       if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
-               ret_val = phy->ops.write_reg(hw,
-                                             PHY_1000T_CTRL,
-                                             mii_1000t_ctrl_reg);
-               if (ret_val)
-                       goto out;
+       if (phy->autoneg_mask & ADVERTISE_1000_FULL)
+               ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,
+                                            mii_1000t_ctrl_reg);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_copper_link_autoneg - Setup/Enable autoneg for copper link
+ *  @hw: pointer to the HW structure
+ *
+ *  Performs initial bounds checking on autoneg advertisement parameter, then
+ *  configure to advertise the full capability.  Setup the PHY to autoneg
+ *  and restart the negotiation process between the link partner.  If
+ *  autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
+ **/
+s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 phy_ctrl;
+
+       DEBUGFUNC("e1000_copper_link_autoneg");
+
+       /* Perform some bounds checking on the autoneg advertisement
+        * parameter.
+        */
+       phy->autoneg_advertised &= phy->autoneg_mask;
+
+       /* If autoneg_advertised is zero, we assume it was not defaulted
+        * by the calling code so we set to advertise full capability.
+        */
+       if (!phy->autoneg_advertised)
+               phy->autoneg_advertised = phy->autoneg_mask;
+
+       DEBUGOUT("Reconfiguring auto-neg advertisement params\n");
+       ret_val = e1000_phy_setup_autoneg(hw);
+       if (ret_val) {
+               DEBUGOUT("Error Setting up Auto-Negotiation\n");
+               return ret_val;
        }
+       DEBUGOUT("Restarting Auto-Neg\n");
+
+       /* Restart auto-negotiation by setting the Auto Neg Enable bit and
+        * the Auto Neg Restart bit in the PHY control register.
+        */
+       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
+       if (ret_val)
+               return ret_val;
+
+       phy_ctrl |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
+       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_ctrl);
+       if (ret_val)
+               return ret_val;
+
+       /* Does the user want to wait for Auto-Neg to complete here, or
+        * check at a later time (for example, callback routine).
+        */
+       if (phy->autoneg_wait_to_complete) {
+               ret_val = e1000_wait_autoneg(hw);
+               if (ret_val) {
+                       DEBUGOUT("Error while waiting for autoneg to complete\n");
+                       return ret_val;
+               }
+       }
+
+       hw->mac.get_link_status = true;
 
-out:
        return ret_val;
 }
 
@@ -1397,46 +1698,40 @@ s32 e1000_setup_copper_link_generic(struct e1000_hw *hw)
        DEBUGFUNC("e1000_setup_copper_link_generic");
 
        if (hw->mac.autoneg) {
-               /*
-                * Setup autoneg and flow control advertisement and perform
+               /* Setup autoneg and flow control advertisement and perform
                 * autonegotiation.
                 */
                ret_val = e1000_copper_link_autoneg(hw);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        } else {
-               /*
-                * PHY will be set to 10H, 10F, 100H or 100F
+               /* PHY will be set to 10H, 10F, 100H or 100F
                 * depending on user settings.
                 */
                DEBUGOUT("Forcing Speed and Duplex\n");
                ret_val = hw->phy.ops.force_speed_duplex(hw);
                if (ret_val) {
                        DEBUGOUT("Error Forcing Speed and Duplex\n");
-                       goto out;
+                       return ret_val;
                }
        }
 
-       /*
-        * Check link status. Wait up to 100 microseconds for link to become
+       /* Check link status. Wait up to 100 microseconds for link to become
         * valid.
         */
-       ret_val = e1000_phy_has_link_generic(hw,
-                                            COPPER_LINK_UP_LIMIT,
-                                            10,
-                                            &link);
+       ret_val = e1000_phy_has_link_generic(hw, COPPER_LINK_UP_LIMIT, 10,
+                                            &link);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        if (link) {
                DEBUGOUT("Valid link established!!!\n");
-               e1000_config_collision_dist_generic(hw);
+               hw->mac.ops.config_collision_dist(hw);
                ret_val = e1000_config_fc_after_link_up_generic(hw);
        } else {
                DEBUGOUT("Unable to establish link!!!\n");
        }
 
-out:
        return ret_val;
 }
 
@@ -1459,28 +1754,27 @@ s32 e1000_phy_force_speed_duplex_igp(struct e1000_hw *hw)
 
        ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        e1000_phy_force_speed_duplex_setup(hw, &phy_data);
 
        ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       /*
-        * Clear Auto-Crossover to force MDI manually.  IGP requires MDI
+       /* Clear Auto-Crossover to force MDI manually.  IGP requires MDI
         * forced whenever speed and duplex are forced.
         */
        ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
        phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
 
        ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        DEBUGOUT1("IGP PSCR: %X\n", phy_data);
 
@@ -1489,26 +1783,19 @@ s32 e1000_phy_force_speed_duplex_igp(struct e1000_hw *hw)
        if (phy->autoneg_wait_to_complete) {
                DEBUGOUT("Waiting for forced speed/duplex link on IGP phy.\n");
 
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
+               ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                    100000, &link);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                if (!link)
                        DEBUGOUT("Link taking longer than expected.\n");
 
                /* Try once more */
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
+               ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                    100000, &link);
        }
 
-out:
        return ret_val;
 }
 
@@ -1531,105 +1818,125 @@ s32 e1000_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 
        DEBUGFUNC("e1000_phy_force_speed_duplex_m88");
 
-       /*
-        * Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
+       /* I210 and I211 devices support Auto-Crossover in forced operation. */
+       if (phy->type != e1000_phy_i210) {
+               /* Clear Auto-Crossover to force MDI manually.  M88E1000
+                * requires MDI forced whenever speed and duplex are forced.
+                */
+               ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL,
+                                           &phy_data);
+               if (ret_val)
+                       return ret_val;
 
-       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
+               phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
+               ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL,
+                                            phy_data);
+               if (ret_val)
+                       return ret_val;
+       }
 
        DEBUGOUT1("M88E1000 PSCR: %X\n", phy_data);
 
        ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        e1000_phy_force_speed_duplex_setup(hw, &phy_data);
 
        ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        /* Reset the phy to commit changes. */
        ret_val = hw->phy.ops.commit(hw);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        if (phy->autoneg_wait_to_complete) {
                DEBUGOUT("Waiting for forced speed/duplex link on M88 phy.\n");
 
                ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
+                                                    100000, &link);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                if (!link) {
-                       if (hw->phy.type != e1000_phy_m88 ||
-                           hw->phy.id == I347AT4_E_PHY_ID ||
-                           hw->phy.id == M88E1340M_E_PHY_ID ||
-                           hw->phy.id == M88E1112_E_PHY_ID) {
+                       bool reset_dsp = true;
+
+                       switch (hw->phy.id) {
+                       case I347AT4_E_PHY_ID:
+                       case M88E1340M_E_PHY_ID:
+                       case M88E1112_E_PHY_ID:
+                       case M88E1543_E_PHY_ID:
+                       case M88E1512_E_PHY_ID:
+                       case I210_I_PHY_ID:
+                               reset_dsp = false;
+                               break;
+                       default:
+                               if (hw->phy.type != e1000_phy_m88)
+                                       reset_dsp = false;
+                               break;
+                       }
+
+                       if (!reset_dsp) {
                                DEBUGOUT("Link taking longer than expected.\n");
                        } else {
-                               /*
-                                * We didn't get link.
+                               /* We didn't get link.
                                 * Reset the DSP and cross our fingers.
                                 */
                                ret_val = phy->ops.write_reg(hw,
                                                M88E1000_PHY_PAGE_SELECT,
                                                0x001d);
                                if (ret_val)
-                                       goto out;
+                                       return ret_val;
                                ret_val = e1000_phy_reset_dsp_generic(hw);
                                if (ret_val)
-                                       goto out;
+                                       return ret_val;
                        }
                }
 
                /* Try once more */
                ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
+                                                    100000, &link);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        }
 
-       if (hw->phy.type != e1000_phy_m88 ||
-           hw->phy.id == I347AT4_E_PHY_ID ||
-           hw->phy.id == M88E1340M_E_PHY_ID ||
-           hw->phy.id == M88E1112_E_PHY_ID)
-               goto out;
+       if (hw->phy.type != e1000_phy_m88)
+               return E1000_SUCCESS;
 
+       if (hw->phy.id == I347AT4_E_PHY_ID ||
+               hw->phy.id == M88E1340M_E_PHY_ID ||
+               hw->phy.id == M88E1112_E_PHY_ID)
+               return E1000_SUCCESS;
+       if (hw->phy.id == I210_I_PHY_ID)
+               return E1000_SUCCESS;
+       if ((hw->phy.id == M88E1543_E_PHY_ID) ||
+           (hw->phy.id == M88E1512_E_PHY_ID))
+               return E1000_SUCCESS;
        ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       /*
-        * Resetting the phy means we need to re-force TX_CLK in the
+       /* Resetting the phy means we need to re-force TX_CLK in the
         * Extended PHY Specific Control Register to 25MHz clock from
         * the reset value of 2.5MHz.
         */
        phy_data |= M88E1000_EPSCR_TX_CLK_25;
        ret_val = phy->ops.write_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       /*
-        * In addition, we must re-enable CRS on Tx for both half and full
+       /* In addition, we must re-enable CRS on Tx for both half and full
         * duplex.
         */
        ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
        ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
 
-out:
        return ret_val;
 }
 
@@ -1652,25 +1959,25 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
 
        ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        e1000_phy_force_speed_duplex_setup(hw, &data);
 
        ret_val = phy->ops.write_reg(hw, PHY_CONTROL, data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        /* Disable MDI-X support for 10/100 */
        ret_val = phy->ops.read_reg(hw, IFE_PHY_MDIX_CONTROL, &data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        data &= ~IFE_PMC_AUTO_MDIX;
        data &= ~IFE_PMC_FORCE_MDIX;
 
        ret_val = phy->ops.write_reg(hw, IFE_PHY_MDIX_CONTROL, data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        DEBUGOUT1("IFE PMC: %X\n", data);
 
@@ -1679,27 +1986,22 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
        if (phy->autoneg_wait_to_complete) {
                DEBUGOUT("Waiting for forced speed/duplex link on IFE phy.\n");
 
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
+               ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                    100000, &link);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                if (!link)
                        DEBUGOUT("Link taking longer than expected.\n");
 
                /* Try once more */
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
+               ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                    100000, &link);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        }
 
-out:
-       return ret_val;
+       return E1000_SUCCESS;
 }
 
 /**
@@ -1750,16 +2052,15 @@ void e1000_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
        if (mac->forced_speed_duplex & E1000_ALL_100_SPEED) {
                ctrl |= E1000_CTRL_SPD_100;
                *phy_ctrl |= MII_CR_SPEED_100;
-               *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_10);
+               *phy_ctrl &= ~MII_CR_SPEED_1000;
                DEBUGOUT("Forcing 100mb\n");
        } else {
                ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
-               *phy_ctrl |= MII_CR_SPEED_10;
                *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_100);
                DEBUGOUT("Forcing 10mb\n");
        }
 
-       e1000_config_collision_dist_generic(hw);
+       hw->mac.ops.config_collision_dist(hw);
 
        E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
 }
@@ -1772,7 +2073,7 @@ void e1000_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
  *  Success returns 0, Failure returns 1
  *
  *  The low power link up (lplu) state is set to the power management level D3
- *  and SmartSpeed is disabled when active is TRUE, else clear lplu for D3
+ *  and SmartSpeed is disabled when active is true, else clear lplu for D3
  *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
  *  is used during Dx states where the power conservation is most important.
  *  During driver activity, SmartSpeed should be enabled so performance is
@@ -1781,78 +2082,76 @@ void e1000_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
 s32 e1000_set_d3_lplu_state_generic(struct e1000_hw *hw, bool active)
 {
        struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
+       s32 ret_val;
        u16 data;
 
        DEBUGFUNC("e1000_set_d3_lplu_state_generic");
 
-       if (!(hw->phy.ops.read_reg))
-               goto out;
+       if (!hw->phy.ops.read_reg)
+               return E1000_SUCCESS;
 
        ret_val = phy->ops.read_reg(hw, IGP02E1000_PHY_POWER_MGMT, &data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        if (!active) {
                data &= ~IGP02E1000_PM_D3_LPLU;
                ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                            data);
+                                            data);
                if (ret_val)
-                       goto out;
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                       return ret_val;
+               /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used
                 * during Dx states where the power conservation is most
                 * important.  During driver activity we should enable
                 * SmartSpeed, so performance is maintained.
                 */
                if (phy->smart_speed == e1000_smart_speed_on) {
                        ret_val = phy->ops.read_reg(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
+                                                   IGP01E1000_PHY_PORT_CONFIG,
+                                                   &data);
                        if (ret_val)
-                               goto out;
+                               return ret_val;
 
                        data |= IGP01E1000_PSCFR_SMART_SPEED;
                        ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
+                                                    IGP01E1000_PHY_PORT_CONFIG,
+                                                    data);
                        if (ret_val)
-                               goto out;
+                               return ret_val;
                } else if (phy->smart_speed == e1000_smart_speed_off) {
                        ret_val = phy->ops.read_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
+                                                   IGP01E1000_PHY_PORT_CONFIG,
+                                                   &data);
                        if (ret_val)
-                               goto out;
+                               return ret_val;
 
                        data &= ~IGP01E1000_PSCFR_SMART_SPEED;
                        ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
+                                                    IGP01E1000_PHY_PORT_CONFIG,
+                                                    data);
                        if (ret_val)
-                               goto out;
+                               return ret_val;
                }
        } else if ((phy->autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
-                  (phy->autoneg_advertised == E1000_ALL_NOT_GIG) ||
-                  (phy->autoneg_advertised == E1000_ALL_10_SPEED)) {
+                  (phy->autoneg_advertised == E1000_ALL_NOT_GIG) ||
+                  (phy->autoneg_advertised == E1000_ALL_10_SPEED)) {
                data |= IGP02E1000_PM_D3_LPLU;
                ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                             data);
+                                            data);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                /* When LPLU is enabled, we should disable SmartSpeed */
                ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                            &data);
+                                           &data);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                data &= ~IGP01E1000_PSCFR_SMART_SPEED;
                ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                             data);
+                                            data);
        }
 
-out:
        return ret_val;
 }
 
@@ -1873,29 +2172,31 @@ s32 e1000_check_downshift_generic(struct e1000_hw *hw)
        DEBUGFUNC("e1000_check_downshift_generic");
 
        switch (phy->type) {
+       case e1000_phy_i210:
        case e1000_phy_m88:
        case e1000_phy_gg82563:
-               offset  = M88E1000_PHY_SPEC_STATUS;
-               mask    = M88E1000_PSSR_DOWNSHIFT;
+       case e1000_phy_bm:
+       case e1000_phy_82578:
+               offset = M88E1000_PHY_SPEC_STATUS;
+               mask = M88E1000_PSSR_DOWNSHIFT;
                break;
+       case e1000_phy_igp:
        case e1000_phy_igp_2:
        case e1000_phy_igp_3:
-               offset  = IGP01E1000_PHY_LINK_HEALTH;
-               mask    = IGP01E1000_PLHR_SS_DOWNGRADE;
+               offset = IGP01E1000_PHY_LINK_HEALTH;
+               mask = IGP01E1000_PLHR_SS_DOWNGRADE;
                break;
        default:
                /* speed downshift not supported */
-               phy->speed_downgraded = FALSE;
-               ret_val = E1000_SUCCESS;
-               goto out;
+               phy->speed_downgraded = false;
+               return E1000_SUCCESS;
        }
 
        ret_val = phy->ops.read_reg(hw, offset, &phy_data);
 
        if (!ret_val)
-               phy->speed_downgraded = (phy_data & mask) ? TRUE : FALSE;
+               phy->speed_downgraded = !!(phy_data & mask);
 
-out:
        return ret_val;
 }
 
@@ -1918,9 +2219,9 @@ s32 e1000_check_polarity_m88(struct e1000_hw *hw)
        ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &data);
 
        if (!ret_val)
-               phy->cable_polarity = (data & M88E1000_PSSR_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
+               phy->cable_polarity = ((data & M88E1000_PSSR_REV_POLARITY)
+                                      ? e1000_rev_polarity_reversed
+                                      : e1000_rev_polarity_normal);
 
        return ret_val;
 }
@@ -1942,35 +2243,32 @@ s32 e1000_check_polarity_igp(struct e1000_hw *hw)
 
        DEBUGFUNC("e1000_check_polarity_igp");
 
-       /*
-        * Polarity is determined based on the speed of
+       /* Polarity is determined based on the speed of
         * our connection.
         */
        ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_STATUS, &data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
            IGP01E1000_PSSR_SPEED_1000MBPS) {
-               offset  = IGP01E1000_PHY_PCS_INIT_REG;
-               mask    = IGP01E1000_PHY_POLARITY_MASK;
+               offset = IGP01E1000_PHY_PCS_INIT_REG;
+               mask = IGP01E1000_PHY_POLARITY_MASK;
        } else {
-               /*
-                * This really only applies to 10Mbps since
+               /* This really only applies to 10Mbps since
                 * there is no polarity for 100Mbps (always 0).
                 */
-               offset  = IGP01E1000_PHY_PORT_STATUS;
-               mask    = IGP01E1000_PSSR_POLARITY_REVERSED;
+               offset = IGP01E1000_PHY_PORT_STATUS;
+               mask = IGP01E1000_PSSR_POLARITY_REVERSED;
        }
 
        ret_val = phy->ops.read_reg(hw, offset, &data);
 
        if (!ret_val)
-               phy->cable_polarity = (data & mask)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
+               phy->cable_polarity = ((data & mask)
+                                      ? e1000_rev_polarity_reversed
+                                      : e1000_rev_polarity_normal);
 
-out:
        return ret_val;
 }
 
@@ -1988,8 +2286,7 @@ s32 e1000_check_polarity_ife(struct e1000_hw *hw)
 
        DEBUGFUNC("e1000_check_polarity_ife");
 
-       /*
-        * Polarity is determined based on the reversal feature being enabled.
+       /* Polarity is determined based on the reversal feature being enabled.
         */
        if (phy->polarity_correction) {
                offset = IFE_PHY_EXTENDED_STATUS_CONTROL;
@@ -2002,28 +2299,28 @@ s32 e1000_check_polarity_ife(struct e1000_hw *hw)
        ret_val = phy->ops.read_reg(hw, offset, &phy_data);
 
        if (!ret_val)
-               phy->cable_polarity = (phy_data & mask)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
+               phy->cable_polarity = ((phy_data & mask)
+                                      ? e1000_rev_polarity_reversed
+                                      : e1000_rev_polarity_normal);
 
        return ret_val;
 }
 
 /**
- *  e1000_wait_autoneg_generic - Wait for auto-neg completion
+ *  e1000_wait_autoneg - Wait for auto-neg completion
  *  @hw: pointer to the HW structure
  *
  *  Waits for auto-negotiation to complete or for the auto-negotiation time
  *  limit to expire, which ever happens first.
  **/
-s32 e1000_wait_autoneg_generic(struct e1000_hw *hw)
+static s32 e1000_wait_autoneg(struct e1000_hw *hw)
 {
        s32 ret_val = E1000_SUCCESS;
        u16 i, phy_status;
 
-       DEBUGFUNC("e1000_wait_autoneg_generic");
+       DEBUGFUNC("e1000_wait_autoneg");
 
-       if (!(hw->phy.ops.read_reg))
+       if (!hw->phy.ops.read_reg)
                return E1000_SUCCESS;
 
        /* Break after autoneg completes or PHY_AUTO_NEG_LIMIT expires. */
@@ -2039,8 +2336,7 @@ s32 e1000_wait_autoneg_generic(struct e1000_hw *hw)
                msec_delay(100);
        }
 
-       /*
-        * PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
+       /* PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
         * has completed.
         */
        return ret_val;
@@ -2056,26 +2352,24 @@ s32 e1000_wait_autoneg_generic(struct e1000_hw *hw)
  *  Polls the PHY status register for link, 'iterations' number of times.
  **/
 s32 e1000_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                               u32 usec_interval, bool *success)
+                              u32 usec_interval, bool *success)
 {
        s32 ret_val = E1000_SUCCESS;
        u16 i, phy_status;
 
        DEBUGFUNC("e1000_phy_has_link_generic");
 
-       if (!(hw->phy.ops.read_reg))
+       if (!hw->phy.ops.read_reg)
                return E1000_SUCCESS;
 
        for (i = 0; i < iterations; i++) {
-               /*
-                * Some PHYs require the PHY_STATUS register to be read
+               /* Some PHYs require the PHY_STATUS register to be read
                 * twice due to the link bit being sticky.  No harm doing
                 * it across the board.
                 */
                ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
                if (ret_val)
-                       /*
-                        * If the first read fails, another entity may have
+                       /* If the first read fails, another entity may have
                         * ownership of the resources, wait and try again to
                         * see if they have relinquished the resources yet.
                         */
@@ -2091,7 +2385,7 @@ s32 e1000_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
                        usec_delay(usec_interval);
        }
 
-       *success = (i < iterations) ? TRUE : FALSE;
+       *success = (i < iterations);
 
        return ret_val;
 }
@@ -2121,91 +2415,113 @@ s32 e1000_get_cable_length_m88(struct e1000_hw *hw)
 
        ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-               M88E1000_PSSR_CABLE_LENGTH_SHIFT;
-       if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1) {
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
+       index = ((phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
+                M88E1000_PSSR_CABLE_LENGTH_SHIFT);
+
+       if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1)
+               return -E1000_ERR_PHY;
 
        phy->min_cable_length = e1000_m88_cable_length_table[index];
        phy->max_cable_length = e1000_m88_cable_length_table[index + 1];
 
        phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
 
-out:
-       return ret_val;
+       return E1000_SUCCESS;
 }
 
 s32 e1000_get_cable_length_m88_gen2(struct e1000_hw *hw)
 {
        struct e1000_phy_info *phy = &hw->phy;
        s32 ret_val;
-       u16 phy_data, phy_data2, index, default_page, is_cm;
+       u16 phy_data, phy_data2, is_cm;
+       u16 index, default_page;
 
        DEBUGFUNC("e1000_get_cable_length_m88_gen2");
 
        switch (hw->phy.id) {
+       case I210_I_PHY_ID:
+               /* Get cable length from PHY Cable Diagnostics Control Reg */
+               ret_val = phy->ops.read_reg(hw, (0x7 << GS40G_PAGE_SHIFT) +
+                                           (I347AT4_PCDL + phy->addr),
+                                           &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               /* Check if the unit of cable length is meters or cm */
+               ret_val = phy->ops.read_reg(hw, (0x7 << GS40G_PAGE_SHIFT) +
+                                           I347AT4_PCDC, &phy_data2);
+               if (ret_val)
+                       return ret_val;
+
+               is_cm = !(phy_data2 & I347AT4_PCDC_CABLE_LENGTH_UNIT);
+
+               /* Populate the phy structure with cable length in meters */
+               phy->min_cable_length = phy_data / (is_cm ? 100 : 1);
+               phy->max_cable_length = phy_data / (is_cm ? 100 : 1);
+               phy->cable_length = phy_data / (is_cm ? 100 : 1);
+               break;
+       case M88E1543_E_PHY_ID:
+       case M88E1512_E_PHY_ID:
        case M88E1340M_E_PHY_ID:
        case I347AT4_E_PHY_ID:
                /* Remember the original page select and set it to 7 */
                ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
                                            &default_page);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0x07);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                /* Get cable length from PHY Cable Diagnostics Control Reg */
                ret_val = phy->ops.read_reg(hw, (I347AT4_PCDL + phy->addr),
                                            &phy_data);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                /* Check if the unit of cable length is meters or cm */
                ret_val = phy->ops.read_reg(hw, I347AT4_PCDC, &phy_data2);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
-               is_cm = !(phy_data & I347AT4_PCDC_CABLE_LENGTH_UNIT);
+               is_cm = !(phy_data2 & I347AT4_PCDC_CABLE_LENGTH_UNIT);
 
                /* Populate the phy structure with cable length in meters */
                phy->min_cable_length = phy_data / (is_cm ? 100 : 1);
                phy->max_cable_length = phy_data / (is_cm ? 100 : 1);
                phy->cable_length = phy_data / (is_cm ? 100 : 1);
 
-               /* Reset the page selec to its original value */
+               /* Reset the page select to its original value */
                ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT,
                                             default_page);
                if (ret_val)
-                       goto out;
+                       return ret_val;
                break;
+
        case M88E1112_E_PHY_ID:
                /* Remember the original page select and set it to 5 */
                ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
                                            &default_page);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0x05);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                ret_val = phy->ops.read_reg(hw, M88E1112_VCT_DSP_DISTANCE,
                                            &phy_data);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
                        M88E1000_PSSR_CABLE_LENGTH_SHIFT;
-               if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
+
+               if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1)
+                       return -E1000_ERR_PHY;
 
                phy->min_cable_length = e1000_m88_cable_length_table[index];
                phy->max_cable_length = e1000_m88_cable_length_table[index + 1];
@@ -2217,15 +2533,13 @@ s32 e1000_get_cable_length_m88_gen2(struct e1000_hw *hw)
                ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT,
                                             default_page);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                break;
        default:
-               ret_val = -E1000_ERR_PHY;
-               goto out;
+               return -E1000_ERR_PHY;
        }
 
-out:
        return ret_val;
 }
 
@@ -2243,15 +2557,15 @@ out:
 s32 e1000_get_cable_length_igp_2(struct e1000_hw *hw)
 {
        struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
+       s32 ret_val;
        u16 phy_data, i, agc_value = 0;
        u16 cur_agc_index, max_agc_index = 0;
        u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;
        static const u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] = {
-              IGP02E1000_PHY_AGC_A,
-              IGP02E1000_PHY_AGC_B,
-              IGP02E1000_PHY_AGC_C,
-              IGP02E1000_PHY_AGC_D
+               IGP02E1000_PHY_AGC_A,
+               IGP02E1000_PHY_AGC_B,
+               IGP02E1000_PHY_AGC_C,
+               IGP02E1000_PHY_AGC_D
        };
 
        DEBUGFUNC("e1000_get_cable_length_igp_2");
@@ -2260,23 +2574,20 @@ s32 e1000_get_cable_length_igp_2(struct e1000_hw *hw)
        for (i = 0; i < IGP02E1000_PHY_CHANNEL_NUM; i++) {
                ret_val = phy->ops.read_reg(hw, agc_reg_array[i], &phy_data);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
-               /*
-                * Getting bits 15:9, which represent the combination of
+               /* Getting bits 15:9, which represent the combination of
                 * coarse and fine gain values.  The result is a number
                 * that can be put into the lookup table to obtain the
                 * approximate cable length.
                 */
-               cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
-                               IGP02E1000_AGC_LENGTH_MASK;
+               cur_agc_index = ((phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
+                                IGP02E1000_AGC_LENGTH_MASK);
 
                /* Array index bound check. */
                if ((cur_agc_index >= IGP02E1000_CABLE_LENGTH_TABLE_SIZE) ||
-                   (cur_agc_index == 0)) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
+                   (cur_agc_index == 0))
+                       return -E1000_ERR_PHY;
 
                /* Remove min & max AGC values from calculation. */
                if (e1000_igp_2_cable_length_table[min_agc_index] >
@@ -2290,18 +2601,17 @@ s32 e1000_get_cable_length_igp_2(struct e1000_hw *hw)
        }
 
        agc_value -= (e1000_igp_2_cable_length_table[min_agc_index] +
-                     e1000_igp_2_cable_length_table[max_agc_index]);
+                     e1000_igp_2_cable_length_table[max_agc_index]);
        agc_value /= (IGP02E1000_PHY_CHANNEL_NUM - 2);
 
        /* Calculate cable length with the error range of +/- 10 meters. */
-       phy->min_cable_length = ((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
-                                (agc_value - IGP02E1000_AGC_RANGE) : 0;
+       phy->min_cable_length = (((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
+                                (agc_value - IGP02E1000_AGC_RANGE) : 0);
        phy->max_cable_length = agc_value + IGP02E1000_AGC_RANGE;
 
        phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
 
-out:
-       return ret_val;
+       return E1000_SUCCESS;
 }
 
 /**
@@ -2325,53 +2635,51 @@ s32 e1000_get_phy_info_m88(struct e1000_hw *hw)
 
        if (phy->media_type != e1000_media_type_copper) {
                DEBUGOUT("Phy info is only valid for copper media\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
+               return -E1000_ERR_CONFIG;
        }
 
        ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        if (!link) {
                DEBUGOUT("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
+               return -E1000_ERR_CONFIG;
        }
 
        ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       phy->polarity_correction = (phy_data & M88E1000_PSCR_POLARITY_REVERSAL)
-                                  ? TRUE : FALSE;
+       phy->polarity_correction = !!(phy_data &
+                                     M88E1000_PSCR_POLARITY_REVERSAL);
 
        ret_val = e1000_check_polarity_m88(hw);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX) ? TRUE : FALSE;
+       phy->is_mdix = !!(phy_data & M88E1000_PSSR_MDIX);
 
        if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
                ret_val = hw->phy.ops.get_cable_length(hw);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &phy_data);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                phy->local_rx = (phy_data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
+                               ? e1000_1000t_rx_status_ok
+                               : e1000_1000t_rx_status_not_ok;
 
                phy->remote_rx = (phy_data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
+                                ? e1000_1000t_rx_status_ok
+                                : e1000_1000t_rx_status_not_ok;
        } else {
                /* Set values to "undefined" */
                phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
@@ -2379,7 +2687,6 @@ s32 e1000_get_phy_info_m88(struct e1000_hw *hw)
                phy->remote_rx = e1000_1000t_rx_status_undefined;
        }
 
-out:
        return ret_val;
 }
 
@@ -2403,50 +2710,48 @@ s32 e1000_get_phy_info_igp(struct e1000_hw *hw)
 
        ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        if (!link) {
                DEBUGOUT("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
+               return -E1000_ERR_CONFIG;
        }
 
-       phy->polarity_correction = TRUE;
+       phy->polarity_correction = true;
 
        ret_val = e1000_check_polarity_igp(hw);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_STATUS, &data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       phy->is_mdix = (data & IGP01E1000_PSSR_MDIX) ? TRUE : FALSE;
+       phy->is_mdix = !!(data & IGP01E1000_PSSR_MDIX);
 
        if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
            IGP01E1000_PSSR_SPEED_1000MBPS) {
                ret_val = phy->ops.get_cable_length(hw);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &data);
                if (ret_val)
-                       goto out;
+                       return ret_val;
 
                phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
+                               ? e1000_1000t_rx_status_ok
+                               : e1000_1000t_rx_status_not_ok;
 
                phy->remote_rx = (data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
+                                ? e1000_1000t_rx_status_ok
+                                : e1000_1000t_rx_status_not_ok;
        } else {
                phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
                phy->local_rx = e1000_1000t_rx_status_undefined;
                phy->remote_rx = e1000_1000t_rx_status_undefined;
        }
 
-out:
        return ret_val;
 }
 
@@ -2467,44 +2772,41 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
 
        ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        if (!link) {
                DEBUGOUT("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
+               return -E1000_ERR_CONFIG;
        }
 
        ret_val = phy->ops.read_reg(hw, IFE_PHY_SPECIAL_CONTROL, &data);
        if (ret_val)
-               goto out;
-       phy->polarity_correction = (data & IFE_PSC_AUTO_POLARITY_DISABLE)
-                                  ? FALSE : TRUE;
+               return ret_val;
+       phy->polarity_correction = !(data & IFE_PSC_AUTO_POLARITY_DISABLE);
 
        if (phy->polarity_correction) {
                ret_val = e1000_check_polarity_ife(hw);
                if (ret_val)
-                       goto out;
+                       return ret_val;
        } else {
                /* Polarity is forced */
-               phy->cable_polarity = (data & IFE_PSC_FORCE_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
+               phy->cable_polarity = ((data & IFE_PSC_FORCE_POLARITY)
+                                      ? e1000_rev_polarity_reversed
+                                      : e1000_rev_polarity_normal);
        }
 
        ret_val = phy->ops.read_reg(hw, IFE_PHY_MDIX_CONTROL, &data);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       phy->is_mdix = (data & IFE_PMC_MDIX_STATUS) ? TRUE : FALSE;
+       phy->is_mdix = !!(data & IFE_PMC_MDIX_STATUS);
 
        /* The following parameters are undefined for 10/100 operation. */
        phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
        phy->local_rx = e1000_1000t_rx_status_undefined;
        phy->remote_rx = e1000_1000t_rx_status_undefined;
 
-out:
-       return ret_val;
+       return E1000_SUCCESS;
 }
 
 /**
@@ -2516,26 +2818,25 @@ out:
  **/
 s32 e1000_phy_sw_reset_generic(struct e1000_hw *hw)
 {
-       s32 ret_val = E1000_SUCCESS;
+       s32 ret_val;
        u16 phy_ctrl;
 
        DEBUGFUNC("e1000_phy_sw_reset_generic");
 
-       if (!(hw->phy.ops.read_reg))
-               goto out;
+       if (!hw->phy.ops.read_reg)
+               return E1000_SUCCESS;
 
        ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        phy_ctrl |= MII_CR_RESET;
        ret_val = hw->phy.ops.write_reg(hw, PHY_CONTROL, phy_ctrl);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        usec_delay(1);
 
-out:
        return ret_val;
 }
 
@@ -2551,20 +2852,20 @@ out:
 s32 e1000_phy_hw_reset_generic(struct e1000_hw *hw)
 {
        struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
+       s32 ret_val;
        u32 ctrl;
 
        DEBUGFUNC("e1000_phy_hw_reset_generic");
 
-       ret_val = phy->ops.check_reset_block(hw);
-       if (ret_val) {
-               ret_val = E1000_SUCCESS;
-               goto out;
+       if (phy->ops.check_reset_block) {
+               ret_val = phy->ops.check_reset_block(hw);
+               if (ret_val)
+                       return E1000_SUCCESS;
        }
 
        ret_val = phy->ops.acquire(hw);
        if (ret_val)
-               goto out;
+               return ret_val;
 
        ctrl = E1000_READ_REG(hw, E1000_CTRL);
        E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_PHY_RST);
@@ -2579,10 +2880,7 @@ s32 e1000_phy_hw_reset_generic(struct e1000_hw *hw)
 
        phy->ops.release(hw);
 
-       ret_val = phy->ops.get_cfg_done(hw);
-
-out:
-       return ret_val;
+       return phy->ops.get_cfg_done(hw);
 }
 
 /**
@@ -2592,9 +2890,10 @@ out:
  *  Generic function to wait 10 milli-seconds for configuration to complete
  *  and return success.
  **/
-s32 e1000_get_cfg_done_generic(struct e1000_hw *hw)
+s32 e1000_get_cfg_done_generic(struct e1000_hw E1000_UNUSEDARG *hw)
 {
        DEBUGFUNC("e1000_get_cfg_done_generic");
+       UNREFERENCED_1PARAMETER(hw);
 
        msec_delay_irq(10);
 
@@ -2664,15 +2963,13 @@ s32 e1000_phy_init_script_igp3(struct e1000_hw *hw)
        hw->phy.ops.write_reg(hw, 0x1796, 0x0008);
        /* Change cg_icount + enable integbp for channels BCD */
        hw->phy.ops.write_reg(hw, 0x1798, 0xD008);
-       /*
-        * Change cg_icount + enable integbp + change prop_factor_master
+       /* Change cg_icount + enable integbp + change prop_factor_master
         * to 8 for channel A
         */
        hw->phy.ops.write_reg(hw, 0x1898, 0xD918);
        /* Disable AHT in Slave mode on channel A */
        hw->phy.ops.write_reg(hw, 0x187A, 0x0800);
-       /*
-        * Enable LPLU and disable AN to 1000 in non-D0a states,
+       /* Enable LPLU and disable AN to 1000 in non-D0a states,
         * Enable SPD+B2B
         */
        hw->phy.ops.write_reg(hw, 0x0019, 0x008D);
@@ -2701,6 +2998,8 @@ enum e1000_phy_type e1000_get_phy_type_from_id(u32 phy_id)
        case M88E1000_E_PHY_ID:
        case M88E1111_I_PHY_ID:
        case M88E1011_I_PHY_ID:
+       case M88E1543_E_PHY_ID:
+       case M88E1512_E_PHY_ID:
        case I347AT4_E_PHY_ID:
        case M88E1112_E_PHY_ID:
        case M88E1340M_E_PHY_ID:
@@ -2720,9 +3019,28 @@ enum e1000_phy_type e1000_get_phy_type_from_id(u32 phy_id)
        case IFE_C_E_PHY_ID:
                phy_type = e1000_phy_ife;
                break;
+       case BME1000_E_PHY_ID:
+       case BME1000_E_PHY_ID_R2:
+               phy_type = e1000_phy_bm;
+               break;
+       case I82578_E_PHY_ID:
+               phy_type = e1000_phy_82578;
+               break;
+       case I82577_E_PHY_ID:
+               phy_type = e1000_phy_82577;
+               break;
+       case I82579_E_PHY_ID:
+               phy_type = e1000_phy_82579;
+               break;
+       case I217_E_PHY_ID:
+               phy_type = e1000_phy_i217;
+               break;
        case I82580_I_PHY_ID:
                phy_type = e1000_phy_82580;
                break;
+       case I210_I_PHY_ID:
+               phy_type = e1000_phy_i210;
+               break;
        default:
                phy_type = e1000_phy_unknown;
                break;
@@ -2740,7 +3058,6 @@ enum e1000_phy_type e1000_get_phy_type_from_id(u32 phy_id)
  **/
 s32 e1000_determine_phy_address(struct e1000_hw *hw)
 {
-       s32 ret_val = -E1000_ERR_PHY_TYPE;
        u32 phy_addr = 0;
        u32 i;
        enum e1000_phy_type phy_type = e1000_phy_unknown;
@@ -2755,233 +3072,1198 @@ s32 e1000_determine_phy_address(struct e1000_hw *hw)
                        e1000_get_phy_id(hw);
                        phy_type = e1000_get_phy_type_from_id(hw->phy.id);
 
-                       /*
-                        * If phy_type is valid, break - we found our
+                       /* If phy_type is valid, break - we found our
                         * PHY address
                         */
-                       if (phy_type != e1000_phy_unknown) {
-                               ret_val = E1000_SUCCESS;
-                               goto out;
-                       }
+                       if (phy_type != e1000_phy_unknown)
+                               return E1000_SUCCESS;
+
                        msec_delay(1);
                        i++;
                } while (i < 10);
        }
 
-out:
-       return ret_val;
+       return -E1000_ERR_PHY_TYPE;
 }
 
 /**
- * e1000_power_up_phy_copper - Restore copper link in case of PHY power down
- * @hw: pointer to the HW structure
+ *  e1000_get_phy_addr_for_bm_page - Retrieve PHY page address
+ *  @page: page to access
  *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, restore the link to previous
- * settings.
+ *  Returns the phy address for the page requested.
  **/
-void e1000_power_up_phy_copper(struct e1000_hw *hw)
+static u32 e1000_get_phy_addr_for_bm_page(u32 page, u32 reg)
 {
-       u16 mii_reg = 0;
+       u32 phy_addr = 2;
 
-       /* The PHY will retain its settings across a power down/up cycle */
-       hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
-       mii_reg &= ~MII_CR_POWER_DOWN;
-       hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
+       if ((page >= 768) || (page == 0 && reg == 25) || (reg == 31))
+               phy_addr = 1;
+
+       return phy_addr;
 }
 
 /**
- * e1000_power_down_phy_copper - Restore copper link in case of PHY power down
- * @hw: pointer to the HW structure
+ *  e1000_write_phy_reg_bm - Write BM PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
  *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, restore the link to previous
- * settings.
+ *  Acquires semaphore, if necessary, then writes the data to PHY register
+ *  at the offset.  Release any acquired semaphores before exiting.
  **/
-void e1000_power_down_phy_copper(struct e1000_hw *hw)
+s32 e1000_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       u16 mii_reg = 0;
+       s32 ret_val;
+       u32 page = offset >> IGP_PAGE_SHIFT;
 
-       /* The PHY will retain its settings across a power down/up cycle */
-       hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
-       mii_reg |= MII_CR_POWER_DOWN;
-       hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
-       msec_delay(1);
+       DEBUGFUNC("e1000_write_phy_reg_bm");
+
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
+
+       /* Page 800 works differently than the rest so it has its own func */
+       if (page == BM_WUC_PAGE) {
+               ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
+                                                        false, false);
+               goto release;
+       }
+
+       hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
+
+       if (offset > MAX_PHY_MULTI_PAGE_REG) {
+               u32 page_shift, page_select;
+
+               /* Page select is register 31 for phy address 1 and 22 for
+                * phy address 2 and 3. Page select is shifted only for
+                * phy address 1.
+                */
+               if (hw->phy.addr == 1) {
+                       page_shift = IGP_PAGE_SHIFT;
+                       page_select = IGP01E1000_PHY_PAGE_SELECT;
+               } else {
+                       page_shift = 0;
+                       page_select = BM_PHY_PAGE_SELECT;
+               }
+
+               /* Page is shifted left, PHY expects (page x 32) */
+               ret_val = e1000_write_phy_reg_mdic(hw, page_select,
+                                                  (page << page_shift));
+               if (ret_val)
+                       goto release;
+       }
+
+       ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
+                                          data);
+
+release:
+       hw->phy.ops.release(hw);
+       return ret_val;
 }
 
 /**
- *  e1000_check_polarity_82577 - Checks the polarity.
+ *  e1000_read_phy_reg_bm - Read BM PHY register
  *  @hw: pointer to the HW structure
+ *  @offset: register offset to be read
+ *  @data: pointer to the read data
  *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- *
- *  Polarity is determined based on the PHY specific status register.
+ *  Acquires semaphore, if necessary, then reads the PHY register at offset
+ *  and storing the retrieved information in data.  Release any acquired
+ *  semaphores before exiting.
  **/
-s32 e1000_check_polarity_82577(struct e1000_hw *hw)
+s32 e1000_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       struct e1000_phy_info *phy = &hw->phy;
        s32 ret_val;
-       u16 data;
+       u32 page = offset >> IGP_PAGE_SHIFT;
 
-       DEBUGFUNC("e1000_check_polarity_82577");
+       DEBUGFUNC("e1000_read_phy_reg_bm");
 
-       ret_val = phy->ops.read_reg(hw, I82577_PHY_STATUS_2, &data);
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
 
-       if (!ret_val)
-               phy->cable_polarity = (data & I82577_PHY_STATUS2_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
+       /* Page 800 works differently than the rest so it has its own func */
+       if (page == BM_WUC_PAGE) {
+               ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
+                                                        true, false);
+               goto release;
+       }
+
+       hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
+
+       if (offset > MAX_PHY_MULTI_PAGE_REG) {
+               u32 page_shift, page_select;
+
+               /* Page select is register 31 for phy address 1 and 22 for
+                * phy address 2 and 3. Page select is shifted only for
+                * phy address 1.
+                */
+               if (hw->phy.addr == 1) {
+                       page_shift = IGP_PAGE_SHIFT;
+                       page_select = IGP01E1000_PHY_PAGE_SELECT;
+               } else {
+                       page_shift = 0;
+                       page_select = BM_PHY_PAGE_SELECT;
+               }
+
+               /* Page is shifted left, PHY expects (page x 32) */
+               ret_val = e1000_write_phy_reg_mdic(hw, page_select,
+                                                  (page << page_shift));
+               if (ret_val)
+                       goto release;
+       }
 
+       ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
+                                         data);
+release:
+       hw->phy.ops.release(hw);
        return ret_val;
 }
 
 /**
- *  e1000_phy_force_speed_duplex_82577 - Force speed/duplex for I82577 PHY
+ *  e1000_read_phy_reg_bm2 - Read BM PHY register
  *  @hw: pointer to the HW structure
+ *  @offset: register offset to be read
+ *  @data: pointer to the read data
  *
- *  Calls the PHY setup function to force speed and duplex.
+ *  Acquires semaphore, if necessary, then reads the PHY register at offset
+ *  and storing the retrieved information in data.  Release any acquired
+ *  semaphores before exiting.
  **/
-s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
+s32 e1000_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       struct e1000_phy_info *phy = &hw->phy;
        s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-       DEBUGFUNC("e1000_phy_force_speed_duplex_82577");
-
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
+       u16 page = (u16)(offset >> IGP_PAGE_SHIFT);
 
-       e1000_phy_force_speed_duplex_setup(hw, &phy_data);
+       DEBUGFUNC("e1000_read_phy_reg_bm2");
 
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
+       ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
-               goto out;
-
-       usec_delay(1);
+               return ret_val;
 
-       if (phy->autoneg_wait_to_complete) {
-               DEBUGOUT("Waiting for forced speed/duplex link on 82577 phy\n");
+       /* Page 800 works differently than the rest so it has its own func */
+       if (page == BM_WUC_PAGE) {
+               ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
+                                                        true, false);
+               goto release;
+       }
 
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
+       hw->phy.addr = 1;
 
-               if (!link)
-                       DEBUGOUT("Link taking longer than expected.\n");
+       if (offset > MAX_PHY_MULTI_PAGE_REG) {
+               /* Page is shifted left, PHY expects (page x 32) */
+               ret_val = e1000_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,
+                                                  page);
 
-               /* Try once more */
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
                if (ret_val)
-                       goto out;
+                       goto release;
        }
 
-out:
+       ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
+                                         data);
+release:
+       hw->phy.ops.release(hw);
        return ret_val;
 }
 
 /**
- *  e1000_get_phy_info_82577 - Retrieve I82577 PHY information
+ *  e1000_write_phy_reg_bm2 - Write BM PHY register
  *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
  *
- *  Read PHY status to determine if link is up.  If link is up, then
- *  set/determine 10base-T extended distance and polarity correction.  Read
- *  PHY port status to determine MDI/MDIx and speed.  Based on the speed,
- *  determine on the cable length, local and remote receiver.
+ *  Acquires semaphore, if necessary, then writes the data to PHY register
+ *  at the offset.  Release any acquired semaphores before exiting.
  **/
-s32 e1000_get_phy_info_82577(struct e1000_hw *hw)
+s32 e1000_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       struct e1000_phy_info *phy = &hw->phy;
        s32 ret_val;
-       u16 data;
-       bool link;
+       u16 page = (u16)(offset >> IGP_PAGE_SHIFT);
 
-       DEBUGFUNC("e1000_get_phy_info_82577");
+       DEBUGFUNC("e1000_write_phy_reg_bm2");
 
-       ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
+       ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
-               goto out;
+               return ret_val;
 
-       if (!link) {
-               DEBUGOUT("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
+       /* Page 800 works differently than the rest so it has its own func */
+       if (page == BM_WUC_PAGE) {
+               ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
+                                                        false, false);
+               goto release;
        }
 
-       phy->polarity_correction = TRUE;
+       hw->phy.addr = 1;
 
-       ret_val = e1000_check_polarity_82577(hw);
-       if (ret_val)
-               goto out;
+       if (offset > MAX_PHY_MULTI_PAGE_REG) {
+               /* Page is shifted left, PHY expects (page x 32) */
+               ret_val = e1000_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,
+                                                  page);
 
-       ret_val = phy->ops.read_reg(hw, I82577_PHY_STATUS_2, &data);
-       if (ret_val)
-               goto out;
+               if (ret_val)
+                       goto release;
+       }
 
-       phy->is_mdix = (data & I82577_PHY_STATUS2_MDIX) ? TRUE : FALSE;
+       ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
+                                          data);
 
-       if ((data & I82577_PHY_STATUS2_SPEED_MASK) ==
-           I82577_PHY_STATUS2_SPEED_1000MBPS) {
-               ret_val = hw->phy.ops.get_cable_length(hw);
-               if (ret_val)
-                       goto out;
+release:
+       hw->phy.ops.release(hw);
+       return ret_val;
+}
 
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &data);
-               if (ret_val)
-                       goto out;
+/**
+ *  e1000_enable_phy_wakeup_reg_access_bm - enable access to BM wakeup registers
+ *  @hw: pointer to the HW structure
+ *  @phy_reg: pointer to store original contents of BM_WUC_ENABLE_REG
+ *
+ *  Assumes semaphore already acquired and phy_reg points to a valid memory
+ *  address to store contents of the BM_WUC_ENABLE_REG register.
+ **/
+s32 e1000_enable_phy_wakeup_reg_access_bm(struct e1000_hw *hw, u16 *phy_reg)
+{
+       s32 ret_val;
+       u16 temp;
 
-               phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
+       DEBUGFUNC("e1000_enable_phy_wakeup_reg_access_bm");
 
-               phy->remote_rx = (data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
-       } else {
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
+       if (!phy_reg)
+               return -E1000_ERR_PARAM;
+
+       /* All page select, port ctrl and wakeup registers use phy address 1 */
+       hw->phy.addr = 1;
+
+       /* Select Port Control Registers page */
+       ret_val = e1000_set_page_igp(hw, (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
+       if (ret_val) {
+               DEBUGOUT("Could not set Port Control page\n");
+               return ret_val;
        }
 
-out:
-       return ret_val;
+       ret_val = e1000_read_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, phy_reg);
+       if (ret_val) {
+               DEBUGOUT2("Could not read PHY register %d.%d\n",
+                         BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
+               return ret_val;
+       }
+
+       /* Enable both PHY wakeup mode and Wakeup register page writes.
+        * Prevent a power state change by disabling ME and Host PHY wakeup.
+        */
+       temp = *phy_reg;
+       temp |= BM_WUC_ENABLE_BIT;
+       temp &= ~(BM_WUC_ME_WU_BIT | BM_WUC_HOST_WU_BIT);
+
+       ret_val = e1000_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, temp);
+       if (ret_val) {
+               DEBUGOUT2("Could not write PHY register %d.%d\n",
+                         BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
+               return ret_val;
+       }
+
+       /* Select Host Wakeup Registers page - caller now able to write
+        * registers on the Wakeup registers page
+        */
+       return e1000_set_page_igp(hw, (BM_WUC_PAGE << IGP_PAGE_SHIFT));
 }
 
 /**
- *  e1000_get_cable_length_82577 - Determine cable length for 82577 PHY
+ *  e1000_disable_phy_wakeup_reg_access_bm - disable access to BM wakeup regs
  *  @hw: pointer to the HW structure
+ *  @phy_reg: pointer to original contents of BM_WUC_ENABLE_REG
  *
- * Reads the diagnostic status register and verifies result is valid before
- * placing it in the phy_cable_length field.
+ *  Restore BM_WUC_ENABLE_REG to its original value.
+ *
+ *  Assumes semaphore already acquired and *phy_reg is the contents of the
+ *  BM_WUC_ENABLE_REG before register(s) on BM_WUC_PAGE were accessed by
+ *  caller.
  **/
-s32 e1000_get_cable_length_82577(struct e1000_hw *hw)
+s32 e1000_disable_phy_wakeup_reg_access_bm(struct e1000_hw *hw, u16 *phy_reg)
 {
-       struct e1000_phy_info *phy = &hw->phy;
        s32 ret_val;
-       u16 phy_data, length;
-
-       DEBUGFUNC("e1000_get_cable_length_82577");
 
-       ret_val = phy->ops.read_reg(hw, I82577_PHY_DIAG_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
+       DEBUGFUNC("e1000_disable_phy_wakeup_reg_access_bm");
 
-       length = (phy_data & I82577_DSTATUS_CABLE_LENGTH) >>
-                I82577_DSTATUS_CABLE_LENGTH_SHIFT;
+       if (!phy_reg)
+               return -E1000_ERR_PARAM;
 
-       if (length == E1000_CABLE_LENGTH_UNDEFINED)
-               ret_val = -E1000_ERR_PHY;
+       /* Select Port Control Registers page */
+       ret_val = e1000_set_page_igp(hw, (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
+       if (ret_val) {
+               DEBUGOUT("Could not set Port Control page\n");
+               return ret_val;
+       }
 
-       phy->cable_length = length;
+       /* Restore 769.17 to its original value */
+       ret_val = e1000_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, *phy_reg);
+       if (ret_val)
+               DEBUGOUT2("Could not restore PHY register %d.%d\n",
+                         BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
 
-out:
        return ret_val;
 }
+
+/**
+ *  e1000_access_phy_wakeup_reg_bm - Read/write BM PHY wakeup register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to be read or written
+ *  @data: pointer to the data to read or write
+ *  @read: determines if operation is read or write
+ *  @page_set: BM_WUC_PAGE already set and access enabled
+ *
+ *  Read the PHY register at offset and store the retrieved information in
+ *  data, or write data to PHY register at offset.  Note the procedure to
+ *  access the PHY wakeup registers is different than reading the other PHY
+ *  registers. It works as such:
+ *  1) Set 769.17.2 (page 769, register 17, bit 2) = 1
+ *  2) Set page to 800 for host (801 if we were manageability)
+ *  3) Write the address using the address opcode (0x11)
+ *  4) Read or write the data using the data opcode (0x12)
+ *  5) Restore 769.17.2 to its original value
+ *
+ *  Steps 1 and 2 are done by e1000_enable_phy_wakeup_reg_access_bm() and
+ *  step 5 is done by e1000_disable_phy_wakeup_reg_access_bm().
+ *
+ *  Assumes semaphore is already acquired.  When page_set==true, assumes
+ *  the PHY page is set to BM_WUC_PAGE (i.e. a function in the call stack
+ *  is responsible for calls to e1000_[enable|disable]_phy_wakeup_reg_bm()).
+ **/
+STATIC s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
+                                         u16 *data, bool read, bool page_set)
+{
+       s32 ret_val;
+       u16 reg = BM_PHY_REG_NUM(offset);
+       u16 page = BM_PHY_REG_PAGE(offset);
+       u16 phy_reg = 0;
+
+       DEBUGFUNC("e1000_access_phy_wakeup_reg_bm");
+
+       /* Gig must be disabled for MDIO accesses to Host Wakeup reg page */
+       if ((hw->mac.type == e1000_pchlan) &&
+          (!(E1000_READ_REG(hw, E1000_PHY_CTRL) & E1000_PHY_CTRL_GBE_DISABLE)))
+               DEBUGOUT1("Attempting to access page %d while gig enabled.\n",
+                         page);
+
+       if (!page_set) {
+               /* Enable access to PHY wakeup registers */
+               ret_val = e1000_enable_phy_wakeup_reg_access_bm(hw, &phy_reg);
+               if (ret_val) {
+                       DEBUGOUT("Could not enable PHY wakeup reg access\n");
+                       return ret_val;
+               }
+       }
+
+       DEBUGOUT2("Accessing PHY page %d reg 0x%x\n", page, reg);
+
+       /* Write the Wakeup register page offset value using opcode 0x11 */
+       ret_val = e1000_write_phy_reg_mdic(hw, BM_WUC_ADDRESS_OPCODE, reg);
+       if (ret_val) {
+               DEBUGOUT1("Could not write address opcode to page %d\n", page);
+               return ret_val;
+       }
+
+       if (read) {
+               /* Read the Wakeup register page value using opcode 0x12 */
+               ret_val = e1000_read_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
+                                                 data);
+       } else {
+               /* Write the Wakeup register page value using opcode 0x12 */
+               ret_val = e1000_write_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
+                                                  *data);
+       }
+
+       if (ret_val) {
+               DEBUGOUT2("Could not access PHY reg %d.%d\n", page, reg);
+               return ret_val;
+       }
+
+       if (!page_set)
+               ret_val = e1000_disable_phy_wakeup_reg_access_bm(hw, &phy_reg);
+
+       return ret_val;
+}
+
+/**
+ * e1000_power_up_phy_copper - Restore copper link in case of PHY power down
+ * @hw: pointer to the HW structure
+ *
+ * In the case of a PHY power down to save power, or to turn off link during a
+ * driver unload, or wake on lan is not enabled, restore the link to previous
+ * settings.
+ **/
+void e1000_power_up_phy_copper(struct e1000_hw *hw)
+{
+       u16 mii_reg = 0;
+       u16 power_reg = 0;
+
+       /* The PHY will retain its settings across a power down/up cycle */
+       hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
+       mii_reg &= ~MII_CR_POWER_DOWN;
+       if (hw->phy.type == e1000_phy_i210) {
+               hw->phy.ops.read_reg(hw, GS40G_COPPER_SPEC, &power_reg);
+               power_reg &= ~GS40G_CS_POWER_DOWN;
+               hw->phy.ops.write_reg(hw, GS40G_COPPER_SPEC, power_reg);
+       }
+       hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
+}
+
+/**
+ * e1000_power_down_phy_copper - Restore copper link in case of PHY power down
+ * @hw: pointer to the HW structure
+ *
+ * In the case of a PHY power down to save power, or to turn off link during a
+ * driver unload, or wake on lan is not enabled, restore the link to previous
+ * settings.
+ **/
+void e1000_power_down_phy_copper(struct e1000_hw *hw)
+{
+       u16 mii_reg = 0;
+       u16 power_reg = 0;
+
+       /* The PHY will retain its settings across a power down/up cycle */
+       hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
+       mii_reg |= MII_CR_POWER_DOWN;
+       /* i210 Phy requires an additional bit for power up/down */
+       if (hw->phy.type == e1000_phy_i210) {
+               hw->phy.ops.read_reg(hw, GS40G_COPPER_SPEC, &power_reg);
+               power_reg |= GS40G_CS_POWER_DOWN;
+               hw->phy.ops.write_reg(hw, GS40G_COPPER_SPEC, power_reg);
+       }
+       hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
+       msec_delay(1);
+}
+
+/**
+ *  __e1000_read_phy_reg_hv -  Read HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to be read
+ *  @data: pointer to the read data
+ *  @locked: semaphore has already been acquired or not
+ *
+ *  Acquires semaphore, if necessary, then reads the PHY register at offset
+ *  and stores the retrieved information in data.  Release any acquired
+ *  semaphore before exiting.
+ **/
+static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
+                                  bool locked, bool page_set)
+{
+       s32 ret_val;
+       u16 page = BM_PHY_REG_PAGE(offset);
+       u16 reg = BM_PHY_REG_NUM(offset);
+       u32 phy_addr = hw->phy.addr = e1000_get_phy_addr_for_hv_page(page);
+
+       DEBUGFUNC("__e1000_read_phy_reg_hv");
+
+       if (!locked) {
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       /* Page 800 works differently than the rest so it has its own func */
+       if (page == BM_WUC_PAGE) {
+               ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
+                                                        true, page_set);
+               goto out;
+       }
+
+       if (page > 0 && page < HV_INTC_FC_PAGE_START) {
+               ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
+                                                        data, true);
+               goto out;
+       }
+
+       if (!page_set) {
+               if (page == HV_INTC_FC_PAGE_START)
+                       page = 0;
+
+               if (reg > MAX_PHY_MULTI_PAGE_REG) {
+                       /* Page is shifted left, PHY expects (page x 32) */
+                       ret_val = e1000_set_page_igp(hw,
+                                                    (page << IGP_PAGE_SHIFT));
+
+                       hw->phy.addr = phy_addr;
+
+                       if (ret_val)
+                               goto out;
+               }
+       }
+
+       DEBUGOUT3("reading PHY page %d (or 0x%x shifted) reg 0x%x\n", page,
+                 page << IGP_PAGE_SHIFT, reg);
+
+       ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
+                                         data);
+out:
+       if (!locked)
+               hw->phy.ops.release(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_read_phy_reg_hv -  Read HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to be read
+ *  @data: pointer to the read data
+ *
+ *  Acquires semaphore then reads the PHY register at offset and stores
+ *  the retrieved information in data.  Release the acquired semaphore
+ *  before exiting.
+ **/
+s32 e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       return __e1000_read_phy_reg_hv(hw, offset, data, false, false);
+}
+
+/**
+ *  e1000_read_phy_reg_hv_locked -  Read HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to be read
+ *  @data: pointer to the read data
+ *
+ *  Reads the PHY register at offset and stores the retrieved information
+ *  in data.  Assumes semaphore already acquired.
+ **/
+s32 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       return __e1000_read_phy_reg_hv(hw, offset, data, true, false);
+}
+
+/**
+ *  e1000_read_phy_reg_page_hv - Read HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
+ *
+ *  Reads the PHY register at offset and stores the retrieved information
+ *  in data.  Assumes semaphore already acquired and page already set.
+ **/
+s32 e1000_read_phy_reg_page_hv(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       return __e1000_read_phy_reg_hv(hw, offset, data, true, true);
+}
+
+/**
+ *  __e1000_write_phy_reg_hv - Write HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
+ *  @locked: semaphore has already been acquired or not
+ *
+ *  Acquires semaphore, if necessary, then writes the data to PHY register
+ *  at the offset.  Release any acquired semaphores before exiting.
+ **/
+static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
+                                   bool locked, bool page_set)
+{
+       s32 ret_val;
+       u16 page = BM_PHY_REG_PAGE(offset);
+       u16 reg = BM_PHY_REG_NUM(offset);
+       u32 phy_addr = hw->phy.addr = e1000_get_phy_addr_for_hv_page(page);
+
+       DEBUGFUNC("__e1000_write_phy_reg_hv");
+
+       if (!locked) {
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       /* Page 800 works differently than the rest so it has its own func */
+       if (page == BM_WUC_PAGE) {
+               ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
+                                                        false, page_set);
+               goto out;
+       }
+
+       if (page > 0 && page < HV_INTC_FC_PAGE_START) {
+               ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
+                                                        &data, false);
+               goto out;
+       }
+
+       if (!page_set) {
+               if (page == HV_INTC_FC_PAGE_START)
+                       page = 0;
+
+               /* Workaround MDIO accesses being disabled after entering IEEE
+                * Power Down (when bit 11 of the PHY Control register is set)
+                */
+               if ((hw->phy.type == e1000_phy_82578) &&
+                   (hw->phy.revision >= 1) &&
+                   (hw->phy.addr == 2) &&
+                   !(MAX_PHY_REG_ADDRESS & reg) &&
+                   (data & (1 << 11))) {
+                       u16 data2 = 0x7EFF;
+                       ret_val = e1000_access_phy_debug_regs_hv(hw,
+                                                                (1 << 6) | 0x3,
+                                                                &data2, false);
+                       if (ret_val)
+                               goto out;
+               }
+
+               if (reg > MAX_PHY_MULTI_PAGE_REG) {
+                       /* Page is shifted left, PHY expects (page x 32) */
+                       ret_val = e1000_set_page_igp(hw,
+                                                    (page << IGP_PAGE_SHIFT));
+
+                       hw->phy.addr = phy_addr;
+
+                       if (ret_val)
+                               goto out;
+               }
+       }
+
+       DEBUGOUT3("writing PHY page %d (or 0x%x shifted) reg 0x%x\n", page,
+                 page << IGP_PAGE_SHIFT, reg);
+
+       ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
+                                          data);
+
+out:
+       if (!locked)
+               hw->phy.ops.release(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_write_phy_reg_hv - Write HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
+ *
+ *  Acquires semaphore then writes the data to PHY register at the offset.
+ *  Release the acquired semaphores before exiting.
+ **/
+s32 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       return __e1000_write_phy_reg_hv(hw, offset, data, false, false);
+}
+
+/**
+ *  e1000_write_phy_reg_hv_locked - Write HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
+ *
+ *  Writes the data to PHY register at the offset.  Assumes semaphore
+ *  already acquired.
+ **/
+s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       return __e1000_write_phy_reg_hv(hw, offset, data, true, false);
+}
+
+/**
+ *  e1000_write_phy_reg_page_hv - Write HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
+ *
+ *  Writes the data to PHY register at the offset.  Assumes semaphore
+ *  already acquired and page already set.
+ **/
+s32 e1000_write_phy_reg_page_hv(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       return __e1000_write_phy_reg_hv(hw, offset, data, true, true);
+}
+
+/**
+ *  e1000_get_phy_addr_for_hv_page - Get PHY adrress based on page
+ *  @page: page to be accessed
+ **/
+STATIC u32 e1000_get_phy_addr_for_hv_page(u32 page)
+{
+       u32 phy_addr = 2;
+
+       if (page >= HV_INTC_FC_PAGE_START)
+               phy_addr = 1;
+
+       return phy_addr;
+}
+
+/**
+ *  e1000_access_phy_debug_regs_hv - Read HV PHY vendor specific high registers
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to be read or written
+ *  @data: pointer to the data to be read or written
+ *  @read: determines if operation is read or write
+ *
+ *  Reads the PHY register at offset and stores the retreived information
+ *  in data.  Assumes semaphore already acquired.  Note that the procedure
+ *  to access these regs uses the address port and data port to read/write.
+ *  These accesses done with PHY address 2 and without using pages.
+ **/
+STATIC s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
+                                         u16 *data, bool read)
+{
+       s32 ret_val;
+       u32 addr_reg;
+       u32 data_reg;
+
+       DEBUGFUNC("e1000_access_phy_debug_regs_hv");
+
+       /* This takes care of the difference with desktop vs mobile phy */
+       addr_reg = ((hw->phy.type == e1000_phy_82578) ?
+                   I82578_ADDR_REG : I82577_ADDR_REG);
+       data_reg = addr_reg + 1;
+
+       /* All operations in this function are phy address 2 */
+       hw->phy.addr = 2;
+
+       /* masking with 0x3F to remove the page from offset */
+       ret_val = e1000_write_phy_reg_mdic(hw, addr_reg, (u16)offset & 0x3F);
+       if (ret_val) {
+               DEBUGOUT("Could not write the Address Offset port register\n");
+               return ret_val;
+       }
+
+       /* Read or write the data value next */
+       if (read)
+               ret_val = e1000_read_phy_reg_mdic(hw, data_reg, data);
+       else
+               ret_val = e1000_write_phy_reg_mdic(hw, data_reg, *data);
+
+       if (ret_val)
+               DEBUGOUT("Could not access the Data port register\n");
+
+       return ret_val;
+}
+
+/**
+ *  e1000_link_stall_workaround_hv - Si workaround
+ *  @hw: pointer to the HW structure
+ *
+ *  This function works around a Si bug where the link partner can get
+ *  a link up indication before the PHY does.  If small packets are sent
+ *  by the link partner they can be placed in the packet buffer without
+ *  being properly accounted for by the PHY and will stall preventing
+ *  further packets from being received.  The workaround is to clear the
+ *  packet buffer after the PHY detects link up.
+ **/
+s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
+{
+       s32 ret_val = E1000_SUCCESS;
+       u16 data;
+
+       DEBUGFUNC("e1000_link_stall_workaround_hv");
+
+       if (hw->phy.type != e1000_phy_82578)
+               return E1000_SUCCESS;
+
+       /* Do not apply workaround if in PHY loopback bit 14 set */
+       hw->phy.ops.read_reg(hw, PHY_CONTROL, &data);
+       if (data & PHY_CONTROL_LB)
+               return E1000_SUCCESS;
+
+       /* check if link is up and at 1Gbps */
+       ret_val = hw->phy.ops.read_reg(hw, BM_CS_STATUS, &data);
+       if (ret_val)
+               return ret_val;
+
+       data &= (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
+                BM_CS_STATUS_SPEED_MASK);
+
+       if (data != (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
+                    BM_CS_STATUS_SPEED_1000))
+               return E1000_SUCCESS;
+
+       msec_delay(200);
+
+       /* flush the packets in the fifo buffer */
+       ret_val = hw->phy.ops.write_reg(hw, HV_MUX_DATA_CTRL,
+                                       (HV_MUX_DATA_CTRL_GEN_TO_MAC |
+                                        HV_MUX_DATA_CTRL_FORCE_SPEED));
+       if (ret_val)
+               return ret_val;
+
+       return hw->phy.ops.write_reg(hw, HV_MUX_DATA_CTRL,
+                                    HV_MUX_DATA_CTRL_GEN_TO_MAC);
+}
+
+/**
+ *  e1000_check_polarity_82577 - Checks the polarity.
+ *  @hw: pointer to the HW structure
+ *
+ *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
+ *
+ *  Polarity is determined based on the PHY specific status register.
+ **/
+s32 e1000_check_polarity_82577(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 data;
+
+       DEBUGFUNC("e1000_check_polarity_82577");
+
+       ret_val = phy->ops.read_reg(hw, I82577_PHY_STATUS_2, &data);
+
+       if (!ret_val)
+               phy->cable_polarity = ((data & I82577_PHY_STATUS2_REV_POLARITY)
+                                      ? e1000_rev_polarity_reversed
+                                      : e1000_rev_polarity_normal);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_phy_force_speed_duplex_82577 - Force speed/duplex for I82577 PHY
+ *  @hw: pointer to the HW structure
+ *
+ *  Calls the PHY setup function to force speed and duplex.
+ **/
+s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 phy_data;
+       bool link;
+
+       DEBUGFUNC("e1000_phy_force_speed_duplex_82577");
+
+       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       e1000_phy_force_speed_duplex_setup(hw, &phy_data);
+
+       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       usec_delay(1);
+
+       if (phy->autoneg_wait_to_complete) {
+               DEBUGOUT("Waiting for forced speed/duplex link on 82577 phy\n");
+
+               ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                    100000, &link);
+               if (ret_val)
+                       return ret_val;
+
+               if (!link)
+                       DEBUGOUT("Link taking longer than expected.\n");
+
+               /* Try once more */
+               ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                    100000, &link);
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_get_phy_info_82577 - Retrieve I82577 PHY information
+ *  @hw: pointer to the HW structure
+ *
+ *  Read PHY status to determine if link is up.  If link is up, then
+ *  set/determine 10base-T extended distance and polarity correction.  Read
+ *  PHY port status to determine MDI/MDIx and speed.  Based on the speed,
+ *  determine on the cable length, local and remote receiver.
+ **/
+s32 e1000_get_phy_info_82577(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 data;
+       bool link;
+
+       DEBUGFUNC("e1000_get_phy_info_82577");
+
+       ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
+       if (ret_val)
+               return ret_val;
+
+       if (!link) {
+               DEBUGOUT("Phy info is only valid if link is up\n");
+               return -E1000_ERR_CONFIG;
+       }
+
+       phy->polarity_correction = true;
+
+       ret_val = e1000_check_polarity_82577(hw);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = phy->ops.read_reg(hw, I82577_PHY_STATUS_2, &data);
+       if (ret_val)
+               return ret_val;
+
+       phy->is_mdix = !!(data & I82577_PHY_STATUS2_MDIX);
+
+       if ((data & I82577_PHY_STATUS2_SPEED_MASK) ==
+           I82577_PHY_STATUS2_SPEED_1000MBPS) {
+               ret_val = hw->phy.ops.get_cable_length(hw);
+               if (ret_val)
+                       return ret_val;
+
+               ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &data);
+               if (ret_val)
+                       return ret_val;
+
+               phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
+                               ? e1000_1000t_rx_status_ok
+                               : e1000_1000t_rx_status_not_ok;
+
+               phy->remote_rx = (data & SR_1000T_REMOTE_RX_STATUS)
+                                ? e1000_1000t_rx_status_ok
+                                : e1000_1000t_rx_status_not_ok;
+       } else {
+               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
+               phy->local_rx = e1000_1000t_rx_status_undefined;
+               phy->remote_rx = e1000_1000t_rx_status_undefined;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_get_cable_length_82577 - Determine cable length for 82577 PHY
+ *  @hw: pointer to the HW structure
+ *
+ * Reads the diagnostic status register and verifies result is valid before
+ * placing it in the phy_cable_length field.
+ **/
+s32 e1000_get_cable_length_82577(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 phy_data, length;
+
+       DEBUGFUNC("e1000_get_cable_length_82577");
+
+       ret_val = phy->ops.read_reg(hw, I82577_PHY_DIAG_STATUS, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       length = ((phy_data & I82577_DSTATUS_CABLE_LENGTH) >>
+                 I82577_DSTATUS_CABLE_LENGTH_SHIFT);
+
+       if (length == E1000_CABLE_LENGTH_UNDEFINED)
+               return -E1000_ERR_PHY;
+
+       phy->cable_length = length;
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_write_phy_reg_gs40g - Write GS40G  PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
+ *
+ *  Acquires semaphore, if necessary, then writes the data to PHY register
+ *  at the offset.  Release any acquired semaphores before exiting.
+ **/
+s32 e1000_write_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       s32 ret_val;
+       u16 page = offset >> GS40G_PAGE_SHIFT;
+
+       DEBUGFUNC("e1000_write_phy_reg_gs40g");
+
+       offset = offset & GS40G_OFFSET_MASK;
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_write_phy_reg_mdic(hw, GS40G_PAGE_SELECT, page);
+       if (ret_val)
+               goto release;
+       ret_val = e1000_write_phy_reg_mdic(hw, offset, data);
+
+release:
+       hw->phy.ops.release(hw);
+       return ret_val;
+}
+
+/**
+ *  e1000_read_phy_reg_gs40g - Read GS40G  PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: lower half is register offset to read to
+ *     upper half is page to use.
+ *  @data: data to read at register offset
+ *
+ *  Acquires semaphore, if necessary, then reads the data in the PHY register
+ *  at the offset.  Release any acquired semaphores before exiting.
+ **/
+s32 e1000_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       s32 ret_val;
+       u16 page = offset >> GS40G_PAGE_SHIFT;
+
+       DEBUGFUNC("e1000_read_phy_reg_gs40g");
+
+       offset = offset & GS40G_OFFSET_MASK;
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_write_phy_reg_mdic(hw, GS40G_PAGE_SELECT, page);
+       if (ret_val)
+               goto release;
+       ret_val = e1000_read_phy_reg_mdic(hw, offset, data);
+
+release:
+       hw->phy.ops.release(hw);
+       return ret_val;
+}
+
+/**
+ *  e1000_read_phy_reg_mphy - Read mPHY control register
+ *  @hw: pointer to the HW structure
+ *  @address: address to be read
+ *  @data: pointer to the read data
+ *
+ *  Reads the mPHY control register in the PHY at offset and stores the
+ *  information read to data.
+ **/
+s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data)
+{
+       u32 mphy_ctrl = 0;
+       bool locked = false;
+       bool ready = false;
+
+       DEBUGFUNC("e1000_read_phy_reg_mphy");
+
+       /* Check if mPHY is ready to read/write operations */
+       ready = e1000_is_mphy_ready(hw);
+       if (!ready)
+               return -E1000_ERR_PHY;
+
+       /* Check if mPHY access is disabled and enable it if so */
+       mphy_ctrl = E1000_READ_REG(hw, E1000_MPHY_ADDR_CTRL);
+       if (mphy_ctrl & E1000_MPHY_DIS_ACCESS) {
+               locked = true;
+               ready = e1000_is_mphy_ready(hw);
+               if (!ready)
+                       return -E1000_ERR_PHY;
+               mphy_ctrl |= E1000_MPHY_ENA_ACCESS;
+               E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, mphy_ctrl);
+       }
+
+       /* Set the address that we want to read */
+       ready = e1000_is_mphy_ready(hw);
+       if (!ready)
+               return -E1000_ERR_PHY;
+
+       /* We mask address, because we want to use only current lane */
+       mphy_ctrl = (mphy_ctrl & ~E1000_MPHY_ADDRESS_MASK &
+               ~E1000_MPHY_ADDRESS_FNC_OVERRIDE) |
+               (address & E1000_MPHY_ADDRESS_MASK);
+       E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, mphy_ctrl);
+
+       /* Read data from the address */
+       ready = e1000_is_mphy_ready(hw);
+       if (!ready)
+               return -E1000_ERR_PHY;
+       *data = E1000_READ_REG(hw, E1000_MPHY_DATA);
+
+       /* Disable access to mPHY if it was originally disabled */
+       if (locked)
+               ready = e1000_is_mphy_ready(hw);
+               if (!ready)
+                       return -E1000_ERR_PHY;
+               E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
+                               E1000_MPHY_DIS_ACCESS);
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_write_phy_reg_mphy - Write mPHY control register
+ *  @hw: pointer to the HW structure
+ *  @address: address to write to
+ *  @data: data to write to register at offset
+ *  @line_override: used when we want to use different line than default one
+ *
+ *  Writes data to mPHY control register.
+ **/
+s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
+                            bool line_override)
+{
+       u32 mphy_ctrl = 0;
+       bool locked = false;
+       bool ready = false;
+
+       DEBUGFUNC("e1000_write_phy_reg_mphy");
+
+       /* Check if mPHY is ready to read/write operations */
+       ready = e1000_is_mphy_ready(hw);
+       if (!ready)
+               return -E1000_ERR_PHY;
+
+       /* Check if mPHY access is disabled and enable it if so */
+       mphy_ctrl = E1000_READ_REG(hw, E1000_MPHY_ADDR_CTRL);
+       if (mphy_ctrl & E1000_MPHY_DIS_ACCESS) {
+               locked = true;
+               ready = e1000_is_mphy_ready(hw);
+               if (!ready)
+                       return -E1000_ERR_PHY;
+               mphy_ctrl |= E1000_MPHY_ENA_ACCESS;
+               E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, mphy_ctrl);
+       }
+
+       /* Set the address that we want to read */
+       ready = e1000_is_mphy_ready(hw);
+       if (!ready)
+               return -E1000_ERR_PHY;
+
+       /* We mask address, because we want to use only current lane */
+       if (line_override)
+               mphy_ctrl |= E1000_MPHY_ADDRESS_FNC_OVERRIDE;
+       else
+               mphy_ctrl &= ~E1000_MPHY_ADDRESS_FNC_OVERRIDE;
+       mphy_ctrl = (mphy_ctrl & ~E1000_MPHY_ADDRESS_MASK) |
+               (address & E1000_MPHY_ADDRESS_MASK);
+       E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, mphy_ctrl);
+
+       /* Read data from the address */
+       ready = e1000_is_mphy_ready(hw);
+       if (!ready)
+               return -E1000_ERR_PHY;
+       E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
+
+       /* Disable access to mPHY if it was originally disabled */
+       if (locked)
+               ready = e1000_is_mphy_ready(hw);
+               if (!ready)
+                       return -E1000_ERR_PHY;
+               E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
+                               E1000_MPHY_DIS_ACCESS);
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_is_mphy_ready - Check if mPHY control register is not busy
+ *  @hw: pointer to the HW structure
+ *
+ *  Returns mPHY control register status.
+ **/
+bool e1000_is_mphy_ready(struct e1000_hw *hw)
+{
+       u16 retry_count = 0;
+       u32 mphy_ctrl = 0;
+       bool ready = false;
+
+       while (retry_count < 2) {
+               mphy_ctrl = E1000_READ_REG(hw, E1000_MPHY_ADDR_CTRL);
+               if (mphy_ctrl & E1000_MPHY_BUSY) {
+                       usec_delay(20);
+                       retry_count++;
+                       continue;
+               }
+               ready = true;
+               break;
+       }
+
+       if (!ready)
+               DEBUGOUT("ERROR READING mPHY control register, phy is busy.\n");
+
+       return ready;
+}