From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id E2156201 for ; Mon, 15 Oct 2018 13:52:00 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id g15-v6so20954067wru.9 for ; Mon, 15 Oct 2018 04:52:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NccqcJBfh3vYaDP7lxAdRbhrcgF8Fiz3aUzPWWsqV70=; b=mhksJv4z5RxkEOYy+hlcb9bwr3ZmNX1RgzHKz0yurHagMrNnG6TrmMyvHhbK77r9UR 4KfDHflRbpMNXlTMwoHWpIPQaiAAX/sjrpJLewoSr1/bWA210+4mtZCNgE0AkTT9hL7z /00PNJCga82AIcHDzUQFxR2UeULV62tAKS5mCaPpGyfyDsga6++zT4A1v75Cp38WWJYi 9Xg/HNxHf1EQ7mYHxGjLdjAAVZXhCUD4YzlhqOSFKu54ebGF9Ktm9gVzTr9jiYknrCpO AscJIUP6PWKKaQIUvrCJ+yYcuCcRbcMg6aDb1gcn1FkyXMW1ZSpanmB8laxLCrkqRJgd Kifg== X-Gm-Message-State: ABuFfojxqYijQuGJJdORzn3jwdtZnSMqrmR0R6lfgu9e66l5vNMoP4eW MzIp3NbuiYr9tt5Bo7V5Q/cpViJP X-Google-Smtp-Source: ACcGV61wxTwj8GbRuBTPMt+kdzdKCZGGJcFRD1Fwjplj2T0ng9dSQUKFXmOq+BbFvxwCFDz/0jnxOA== X-Received: by 2002:adf:da43:: with SMTP id r3-v6mr14495982wrl.221.1539604320579; Mon, 15 Oct 2018 04:52:00 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id i6-v6sm8469918wrq.4.2018.10.15.04.51.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 04:51:59 -0700 (PDT) From: Luca Boccassi To: Matthew Smith Cc: Qi Zhang , dpdk stable Date: Mon, 15 Oct 2018 12:51:26 +0100 Message-Id: <20181015115144.27626-6-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181015115144.27626-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181015115144.27626-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: wait longer for link after fiber MAC setup' has been queued to LTS release 16.11.9 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: Mon, 15 Oct 2018 11:52:01 -0000 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 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 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 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 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. */