[dpdk-stable] patch 'net/ixgbe: wait longer for link after fiber MAC setup' 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 e45803dd5f39bd9e5397a3a5ff3c23464b2fe06c Mon Sep 17 00:00:00 2001
From: Matthew Smith <mgsmith@netgate.com>
Date: Mon, 16 Jul 2018 11:36:04 -0500
Subject: [PATCH] net/ixgbe: wait longer for link after fiber MAC setup

[ upstream commit 64f1c8539c8ce99214b9eb1fb728a2c6745f3300 ]

After setting up the link on a fiber port, the maximum wait time for
the link to come up is 500 ms in ixgbe_setup_mac_link_multispeed_fiber().
On an x550 SFP+ port, this is often not sufficiently long for the link
to come up. This can result in never being able to retrieve accurate
link status for the port using rte_eth_link_get_nowait().

Increase the maximum wait time in ixgbe_setup_mac_link_multispeed_fiber()
to 1 s.

Bugzilla ID: 69
Fixes: f3430431abaf ("ixgbe/base: add SFP+ dual-speed support")

Signed-off-by: Matthew Smith <mgsmith@netgate.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index e54fd306a3..662bff467f 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -5098,7 +5098,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
 		 * Section 73.10.2, we may have to wait up to 500ms if KR is
 		 * attempted.  82599 uses the same timing for 10g SFI.
 		 */
-		for (i = 0; i < 5; i++) {
+		for (i = 0; i < 10; i++) {
 			/* Wait for the link partner to also set speed */
 			msec_delay(100);
 
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-15 12:48:34.767168640 +0100
+++ 0006-net-ixgbe-wait-longer-for-link-after-fiber-MAC-setup.patch	2018-10-15 12:48:34.513096018 +0100
@@ -1,8 +1,10 @@
-From 64f1c8539c8ce99214b9eb1fb728a2c6745f3300 Mon Sep 17 00:00:00 2001
+From e45803dd5f39bd9e5397a3a5ff3c23464b2fe06c Mon Sep 17 00:00:00 2001
 From: Matthew Smith <mgsmith@netgate.com>
 Date: Mon, 16 Jul 2018 11:36:04 -0500
 Subject: [PATCH] net/ixgbe: wait longer for link after fiber MAC setup
 
+[ upstream commit 64f1c8539c8ce99214b9eb1fb728a2c6745f3300 ]
+
 After setting up the link on a fiber port, the maximum wait time for
 the link to come up is 500 ms in ixgbe_setup_mac_link_multispeed_fiber().
 On an x550 SFP+ port, this is often not sufficiently long for the link
@@ -14,7 +16,6 @@
 
 Bugzilla ID: 69
 Fixes: f3430431abaf ("ixgbe/base: add SFP+ dual-speed support")
-Cc: stable@dpdk.org
 
 Signed-off-by: Matthew Smith <mgsmith@netgate.com>
 Acked-by: Qi Zhang <qi.z.zhang@intel.com>
@@ -23,10 +24,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
-index b4a0d7003c..21f973e5e0 100644
+index e54fd306a3..662bff467f 100644
 --- a/drivers/net/ixgbe/base/ixgbe_common.c
 +++ b/drivers/net/ixgbe/base/ixgbe_common.c
-@@ -5262,7 +5262,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
+@@ -5098,7 +5098,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
  		 * Section 73.10.2, we may have to wait up to 500ms if KR is
  		 * attempted.  82599 uses the same timing for 10g SFI.
  		 */