aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaanan Avargil <raanan.avargil@intel.com>2015-12-22 08:35:01 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-02-24 17:40:50 -0500
commit6721e9d568741ced04b1fe6eed42f2ddf585eac4 (patch)
treed7b7bdc79dcd7a63d3da1ed7c4f2a8909bd7f6e9
parent5aba8186856981672447d78a634ada8155b86eb6 (diff)
e1000e: Increase ULP timer
Due to system level changes introduced in Skylake, ULP exit takes significantly longer to occur. Therefore, driver must wait longer for. Signed-off-by: Raanan Avargil <raanan.avargil@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000e/ich8lan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index a049e30639a1..c731465d1999 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1252,9 +1252,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
1252 ew32(H2ME, mac_reg); 1252 ew32(H2ME, mac_reg);
1253 } 1253 }
1254 1254
1255 /* Poll up to 100msec for ME to clear ULP_CFG_DONE */ 1255 /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */
1256 while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) { 1256 while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {
1257 if (i++ == 10) { 1257 if (i++ == 30) {
1258 ret_val = -E1000_ERR_PHY; 1258 ret_val = -E1000_ERR_PHY;
1259 goto out; 1259 goto out;
1260 } 1260 }