Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1effb45c authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: extend EEE LPI timer to prevent dropped link 



The link can be unexpectedly dropped when the timer for entering EEE low-
power-idle quiet state expires too soon.  The timer needs to be extended
from 196usec to 200usec after every LCD (PHY) reset to prevent this from
happening.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5661aeb0

drivers/net/e1000e/ich8lan.c

+24 −5
Original line number Original line Diff line number Diff line
@@ -140,6 +140,11 @@ 
#define I82579_LPI_CTRL			PHY_REG(772, 20)

#define I82579_LPI_CTRL			PHY_REG(772, 20)

#define I82579_LPI_CTRL_ENABLE_MASK	0x6000

#define I82579_LPI_CTRL_ENABLE_MASK	0x6000





/* EMI Registers */

#define I82579_EMI_ADDR         0x10

#define I82579_EMI_DATA         0x11

#define I82579_LPI_UPDATE_TIMER 0x4805	/* in 40ns units + 40 ns base value */



/* Strapping Option Register - RO */

/* Strapping Option Register - RO */

#define E1000_STRAP                     0x0000C

#define E1000_STRAP                     0x0000C

#define E1000_STRAP_SMBUS_ADDRESS_MASK  0x00FE0000

#define E1000_STRAP_SMBUS_ADDRESS_MASK  0x00FE0000
@@ -1723,13 +1728,27 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw) 
	/* Configure the LCD with the OEM bits in NVM */

	/* Configure the LCD with the OEM bits in NVM */

	ret_val = e1000_oem_bits_config_ich8lan(hw, true);

	ret_val = e1000_oem_bits_config_ich8lan(hw, true);





	if (hw->mac.type == e1000_pch2lan) {

		/* Ungate automatic PHY configuration on non-managed 82579 */

		/* Ungate automatic PHY configuration on non-managed 82579 */

	if ((hw->mac.type == e1000_pch2lan) &&

		if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {

	    !(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {

			msleep(10);

			msleep(10);

			e1000_gate_hw_phy_config_ich8lan(hw, false);

			e1000_gate_hw_phy_config_ich8lan(hw, false);

		}

		}





		/* Set EEE LPI Update Timer to 200usec */

		ret_val = hw->phy.ops.acquire(hw);

		if (ret_val)

			goto out;

		ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,

						       I82579_LPI_UPDATE_TIMER);

		if (ret_val)

			goto release;

		ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA,

						       0x1387);

release:

		hw->phy.ops.release(hw);

	}



out:

out:

	return ret_val;

	return ret_val;

}

}