From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 682DE322C for ; Fri, 30 Nov 2018 00:13:51 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:40 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW7h032075; Fri, 30 Nov 2018 01:13:45 +0200 From: Yongseok Koh To: Matthew Smith Cc: Qi Zhang , dpdk stable Date: Thu, 29 Nov 2018 15:10:37 -0800 Message-Id: <20181129231202.30436-43-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/ixgbe: wait longer for link after fiber MAC setup' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 23:13:51 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/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. Yongseok --- >>From 6c6e6b58d18352d4c1de1660367b083ea018ad1e Mon Sep 17 00:00:00 2001 From: Matthew Smith 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 Acked-by: Qi Zhang --- 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 5e6ad9526..4fd954116 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -5150,7 +5150,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.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:47.140986409 -0800 +++ 0043-net-ixgbe-wait-longer-for-link-after-fiber-MAC-setup.patch 2018-11-29 15:01:45.087959000 -0800 @@ -1,8 +1,10 @@ -From 64f1c8539c8ce99214b9eb1fb728a2c6745f3300 Mon Sep 17 00:00:00 2001 +From 6c6e6b58d18352d4c1de1660367b083ea018ad1e Mon Sep 17 00:00:00 2001 From: Matthew Smith 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 Acked-by: Qi Zhang @@ -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 b4a0d7003..21f973e5e 100644 +index 5e6ad9526..4fd954116 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, +@@ -5150,7 +5150,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. */