From: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Date: Wed, 26 Aug 2015 19:14:07 +0000 (-0400)
Subject: i40e: Increase the amount of time we wait for reset to be done
X-Git-Tag: v4.1.12-92~189^2~341
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1ff3426e5d6e0e2635e27803927f06c353af769e;p=users%2Fjedix%2Flinux-maple.git

i40e: Increase the amount of time we wait for reset to be done

Orabug: 22342532

In some rare cases the reset can take longer to complete so increase the
amount of time we wait.

Change-ID: Ib5628ec54b526a811ee33d1214fe763226406671
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 22e05bd6f7949d3e638c9f4697a2198a19fff312)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 683371763293c..1e81f4e3b2053 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -1256,7 +1256,7 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw)
 	grst_del = (rd32(hw, I40E_GLGEN_RSTCTL) &
 		    I40E_GLGEN_RSTCTL_GRSTDEL_MASK) >>
 		    I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT;
-	for (cnt = 0; cnt < grst_del + 2; cnt++) {
+	for (cnt = 0; cnt < grst_del + 10; cnt++) {
 		reg = rd32(hw, I40E_GLGEN_RSTAT);
 		if (!(reg & I40E_GLGEN_RSTAT_DEVSTATE_MASK))
 			break;