From: Raanan Avargil <raanan.avargil@intel.com>
Date: Thu, 15 Oct 2015 12:59:49 +0000 (+0300)
Subject: e1000e: Increase timeout of polling bit RSPCIPHY
X-Git-Tag: v4.14-rc1~3609^2~493^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d17c7868b2f8e329dcee4ecd2f5d16cfc9b26ac8;p=platform%2Fkernel%2Flinux-rpi.git

e1000e: Increase timeout of polling bit RSPCIPHY

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>
---

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 91a5a0a..64c1f36 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -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;
 }