From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AE27AA04F0 for ; Thu, 19 Dec 2019 15:42:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A42181BF80; Thu, 19 Dec 2019 15:42:05 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 4F6551C02D for ; Thu, 19 Dec 2019 15:42:04 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id f4so7193405wmj.1 for ; Thu, 19 Dec 2019 06:42:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vevEJTPJ666pfXQyTY6EbPIcwwOfrkOdJNo9jtjelEc=; b=covap/SzqI/utqoI1HVlXxSqQg2bXaHBZbsm680mHaFh0Mg/kGcc/IoVvwtl0vpwFS bvAqg0eVnL17tjUzPGULXoDnWP+BuCtRJ72XatpWYImpHee6RMf0vJ/IBKw3j+BUtIyo 1YhHWrrmbvRRMuCpvlXHVk/Yd/mm8+J7VwcwfUqWooGU31FtK69Lms6knJN7kOwZqoT2 9guX1MMvwGYJ7EWE5UC+vO35umzACjdtt73giJbrvTXdndEhaeNytxKuQq6xJ52vGxTZ Pl4nDBBS0zvZevgMmB+8b0UZU8tg9yaufo1vD1BS/Ro2Bw0RhR33EgqHJxX12F+aPQMa JoRw== 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=vevEJTPJ666pfXQyTY6EbPIcwwOfrkOdJNo9jtjelEc=; b=qToGxoEHQMPRYvZS7A/DeuY46Niab589HxR7I1JvLBtTQL/TMfY454+XsIK3Iu5cUN fyc3cQcqONwL7mVzK2Vys4iQZudBfgDYSvSOBusLhP98cJK1OuzGbXH5hw8LP/k8xJOd OdSIEl4SBpjMhQOefJjyZyX1EbMtaERbIKbZCYk8A1X7898Jpwur5Kz7ixAj11lpSW/v pWLpa1DFkH52kE9jhm5VVFu4/1l5tElOfIn8kDpkzj5qC5dAd/vJ860X+DAmk4EsO172 whmiibdxVP1LrXMGIo9QnLuxvCaa0Nj0wa+ntxa+kVSa6wBchmOQGBqOumOuM6h1JalZ d+qA== X-Gm-Message-State: APjAAAWCFXP8IM+f1M0kzB8oEBNzyhdtFTY7qBPS9sDfpixHwt8wvmYh 3iF/AOvgdbfW1y5aNuFzuxoWIaZZ9DE= X-Google-Smtp-Source: APXvYqzYEf/Wcf0trnWUsT/JIq5uQ1olZbxzW6dyKAXRFkkWOd9rTDnpcQrKGDKCqTTCwx/zUw8QZQ== X-Received: by 2002:a7b:ca4c:: with SMTP id m12mr10025908wml.176.1576766524034; Thu, 19 Dec 2019 06:42:04 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f207sm7231398wme.9.2019.12.19.06.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:42:03 -0800 (PST) From: luca.boccassi@gmail.com To: Lunyuan Cui Cc: Wenzhuo Lu , dpdk stable Date: Thu, 19 Dec 2019 14:34:42 +0000 Message-Id: <20191219143447.21506-135-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: fix link status' has been queued to LTS release 17.11.10 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.10 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/21/19. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From e72dd787d42dd8e2473d12df1845c38aa2dcfe07 Mon Sep 17 00:00:00 2001 From: Lunyuan Cui Date: Mon, 18 Nov 2019 15:37:44 +0000 Subject: [PATCH] net/ixgbe: fix link status [ upstream commit c3f2fbff78cf5bd4f213b4f281251d401b09943f ] The link status for 82599eb got from link status register was not correct. Check the enable/disable flag of tx laser, set the link status down if tx laser disabled. Then, we can get correct status. But after port reset, tx laser register will be reset enable. Link status will always be up. So set tx laser disable when port resets. When hw->mac.autotry_restart is true, whether tx laser is disable or enable, it will be set enable in ixgbe_flap_tx_laser_multispeed_fiber(). hw->mac.autotry_restart can be set true in both port init and port start. Because we don't need this treatment before port starts, set hw->mac.autotry_restart false when port init. Fixes: 0408f47ba4d6 ("net/ixgbe: fix busy polling while fiber link update") Signed-off-by: Lunyuan Cui Acked-by: Wenzhuo Lu --- drivers/net/ixgbe/ixgbe_ethdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 8325d66f2f..0532bf620e 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1232,6 +1232,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) diag = ixgbe_bypass_init_hw(hw); #else diag = ixgbe_init_hw(hw); + hw->mac.autotry_restart = false; #endif /* RTE_LIBRTE_IXGBE_BYPASS */ /* @@ -1337,6 +1338,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) /* enable support intr */ ixgbe_enable_intr(eth_dev); + ixgbe_dev_set_link_down(eth_dev); + /* initialize filter info */ memset(filter_info, 0, sizeof(struct ixgbe_filter_info)); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:31.686443362 +0000 +++ 0135-net-ixgbe-fix-link-status.patch 2019-12-19 14:32:26.349302664 +0000 @@ -1,8 +1,10 @@ -From c3f2fbff78cf5bd4f213b4f281251d401b09943f Mon Sep 17 00:00:00 2001 +From e72dd787d42dd8e2473d12df1845c38aa2dcfe07 Mon Sep 17 00:00:00 2001 From: Lunyuan Cui Date: Mon, 18 Nov 2019 15:37:44 +0000 Subject: [PATCH] net/ixgbe: fix link status +[ upstream commit c3f2fbff78cf5bd4f213b4f281251d401b09943f ] + The link status for 82599eb got from link status register was not correct. Check the enable/disable flag of tx laser, set the link status down if tx laser disabled. Then, we can get correct status. @@ -16,7 +18,6 @@ hw->mac.autotry_restart false when port init. Fixes: 0408f47ba4d6 ("net/ixgbe: fix busy polling while fiber link update") -Cc: stable@dpdk.org Signed-off-by: Lunyuan Cui Acked-by: Wenzhuo Lu @@ -25,10 +26,10 @@ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c -index 118bc74758..2c6fd0f131 100644 +index 8325d66f2f..0532bf620e 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c -@@ -1190,6 +1190,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) +@@ -1232,6 +1232,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) diag = ixgbe_bypass_init_hw(hw); #else diag = ixgbe_init_hw(hw); @@ -36,7 +37,7 @@ #endif /* RTE_LIBRTE_IXGBE_BYPASS */ /* -@@ -1300,6 +1301,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) +@@ -1337,6 +1338,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) /* enable support intr */ ixgbe_enable_intr(eth_dev);