]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
e1000e: Increase timeout of polling bit RSPCIPHY
authorRaanan Avargil <raanan.avargil@intel.com>
Thu, 15 Oct 2015 12:59:49 +0000 (15:59 +0300)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sun, 13 Dec 2015 07:14:32 +0000 (23:14 -0800)
Due to timing changes to the ME firmware in Skylake, this timer
needs to be increased to 300ms.

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>
drivers/net/ethernet/intel/e1000e/ich8lan.c

index 91a5a0ae9cd73932648492ce532b0e1260f1419c..64c1f36200333e213b8383cb8abad03f408006ec 100644 (file)
@@ -1984,7 +1984,7 @@ static s32 e1000_check_reset_block_ich8lan(struct e1000_hw *hw)
        int i = 0;
 
        while ((blocked = !(er32(FWSM) & E1000_ICH_FWSM_RSPCIPHY)) &&
-              (i++ < 10))
+              (i++ < 30))
                usleep_range(10000, 20000);
        return blocked ? E1000_BLK_PHY_RESET : 0;
 }