diff options
| author | Raanan Avargil <raanan.avargil@intel.com> | 2015-12-22 15:35:01 +0200 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2016-02-24 14:40:50 -0800 |
| commit | 6721e9d568741ced04b1fe6eed42f2ddf585eac4 (patch) | |
| tree | d7b7bdc79dcd7a63d3da1ed7c4f2a8909bd7f6e9 /drivers/net/ethernet/intel/e1000e | |
| parent | 5aba8186856981672447d78a634ada8155b86eb6 (diff) | |
| download | op-kernel-dev-6721e9d568741ced04b1fe6eed42f2ddf585eac4.zip op-kernel-dev-6721e9d568741ced04b1fe6eed42f2ddf585eac4.tar.gz | |
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>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 |
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 a049e30..c731465 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) ew32(H2ME, mac_reg); } - /* Poll up to 100msec for ME to clear ULP_CFG_DONE */ + /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */ while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) { - if (i++ == 10) { + if (i++ == 30) { ret_val = -E1000_ERR_PHY; goto out; } |
