[dpdk-stable] patch 'net/i40e/base: correct global reset timeout calculation' has been queued to LTS release 16.11.9

[Luca Boccassi <bluca@debian.org>]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/17/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From d2f863a3f2f76e384454085fd2cc32e2a06b24b8 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang@intel.com>
Date: Tue, 25 Sep 2018 10:34:33 +0800
Subject: [PATCH] net/i40e/base: correct global reset timeout calculation

[ upstream commit 92451d9039ddddeddf59208a988393a6d44b2b9b ]

The wait time for Global Reset Ready steady state is calculated based on
the GLGEN_RSTCTL.GRSTDEL value. However, current impelementation multiplied
that value by 20 as a workaround for an issue in SOC platforms.
This resulted in the maximum GLGEN_RSTCTL.GRSTDEL timeout of 6.5 seconds
becoming 130 seconds, which is so long that the VMkernel watchdog thinks
the kernel is frozen and triggers a PSOD.

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/i40e/base/i40e_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index 1bfda0866d..8ba75c738d 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1348,7 +1348,7 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw)
 			I40E_GLGEN_RSTCTL_GRSTDEL_MASK) >>
 			I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT;
 
-	grst_del = grst_del * 20;
+	grst_del = min(grst_del * 20, 160U);
 
 	for (cnt = 0; cnt < grst_del; cnt++) {
 		reg = rd32(hw, I40E_GLGEN_RSTAT);
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-15 12:48:34.743212124 +0100
+++ 0005-net-i40e-base-correct-global-reset-timeout-calculati.patch	2018-10-15 12:48:34.509096018 +0100
@@ -1,8 +1,10 @@
-From 92451d9039ddddeddf59208a988393a6d44b2b9b Mon Sep 17 00:00:00 2001
+From d2f863a3f2f76e384454085fd2cc32e2a06b24b8 Mon Sep 17 00:00:00 2001
 From: Qi Zhang <qi.z.zhang@intel.com>
 Date: Tue, 25 Sep 2018 10:34:33 +0800
 Subject: [PATCH] net/i40e/base: correct global reset timeout calculation
 
+[ upstream commit 92451d9039ddddeddf59208a988393a6d44b2b9b ]
+
 The wait time for Global Reset Ready steady state is calculated based on
 the GLGEN_RSTCTL.GRSTDEL value. However, current impelementation multiplied
 that value by 20 as a workaround for an issue in SOC platforms.
@@ -10,8 +12,6 @@
 becoming 130 seconds, which is so long that the VMkernel watchdog thinks
 the kernel is frozen and triggers a PSOD.
 
-Cc: stable@dpdk.org
-
 Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
 Acked-by: Beilei Xing <beilei.xing@intel.com>
 ---
@@ -19,10 +19,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
-index 0affa98ac9..0eb369ff6c 100644
+index 1bfda0866d..8ba75c738d 100644
 --- a/drivers/net/i40e/base/i40e_common.c
 +++ b/drivers/net/i40e/base/i40e_common.c
-@@ -1342,7 +1342,7 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw)
+@@ -1348,7 +1348,7 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw)
  			I40E_GLGEN_RSTCTL_GRSTDEL_MASK) >>
  			I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT;