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 9B43DA051C for ; Tue, 11 Feb 2020 12:28:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 921CC2B9C; Tue, 11 Feb 2020 12:28:16 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 3BD3F1BE9E for ; Tue, 11 Feb 2020 12:28:15 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id c84so3065060wme.4 for ; Tue, 11 Feb 2020 03:28:15 -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=u6GFUZbASKOLvXlTV4K8bAezoivvnhdt9oPY+EJgQSE=; b=fbf7+eoGNFI+Mm4Wecs5TnxQYFBwiM4HMX0bH5+HQIFusZ8AvTH9A45y/EjHrYrU4P YVt19b14YbJPUFUYXJVcqY2NKlqYfyDrmgDmuqjwlZw2yvN7lqFJ9lqCuPKQZfoFohIL wfrIpmnyhXR1FpWnf1rNYSCDZGN9D6wQUh3nhRToe/SiO4rS02WdZEG0HJMiNT1bomFZ g89Hjhq/BY9Tt8NE9MRxtLBTGKQE3v7PkJVGrf9Wwpq8qF+dB4XoJnx8NJlMHfZ/RlZP ExxJBFFxG4XZUAzhoP6VU/tEYjYl+W/cQwaaK510dpecuDOswlnqv+wMgrNIzEhvfGI/ TXbQ== 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=u6GFUZbASKOLvXlTV4K8bAezoivvnhdt9oPY+EJgQSE=; b=gAIgHwvwzKHuWNhC0MvnzrVVM5mNLqZm2uMATetGsvPR64WxKeeksb+ERd3XTRZDED IJ+rFeI/2oyWaH0Zz6X3ByRg+t/AtsZuwBA02B92uuwPsFvqzHnHSt1EXkmre9JS9WNf vXO2PNEzEgJHcRVEINUAi2f3uQj/toH7clmpNBJWsf94kYuIN9Ksr1bzlJ/DtwkKlV7M 8gqF7Ibi0FtgU8/T5r9ufljH+0EiEGMJBrniXabuRfOjSKpzmoluEi616pe4uqgbVotK EtgMBODZRR/VcsFgZNsLqT01URaliv/B/vlDwtb4NvmZRaVtcJQdx3QkgdWLLEmmdCRl aUFw== X-Gm-Message-State: APjAAAWMpeinpcxdxL5YbQhNhf5vXax77ZlX/n7m4+48F9rAYnPdbCjD gcviVCSgPk6DB+oA2Z/14s8= X-Google-Smtp-Source: APXvYqyH3fYrd07HanOT6mDlhfvJeBxjcqI+raeICMhrKBNOqw2IBMTmNqnpHDg5MEr5hUbLm8djoA== X-Received: by 2002:a05:600c:20f:: with SMTP id 15mr5083130wmi.128.1581420494932; Tue, 11 Feb 2020 03:28:14 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x11sm3340286wmg.46.2020.02.11.03.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:28:14 -0800 (PST) From: luca.boccassi@gmail.com To: Xiaolong Ye Cc: Jaroslaw Gawin , Qi Zhang , Beilei Xing , dpdk stable Date: Tue, 11 Feb 2020 11:20:18 +0000 Message-Id: <20200211112216.3929-72-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e/base: fix display of FEC settings' has been queued to stable release 19.11.1 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 stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. 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 c5ca0d7c74c90542bb481597b6d8abb2f3dd4294 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 13 Jan 2020 10:39:39 +0800 Subject: [PATCH] net/i40e/base: fix display of FEC settings [ upstream commit b330a1c5c639d636c5eb08226af1385b1ec9c13b ] Fix display of FEC settings for ethtool. This patch change variable 'phy.link_info.req_fec_info' sent to ethtool. Without this patch wrong FEC settings can be shown. Fixes: 1216fb9f0c8c ("net/i40e/base: store the requested FEC information") Signed-off-by: Jaroslaw Gawin Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_common.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 95b96f70f6..9c6609bfc0 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -2886,9 +2886,16 @@ enum i40e_status_code i40e_update_link_info(struct i40e_hw *hw) if (status) return status; - hw->phy.link_info.req_fec_info = - abilities.fec_cfg_curr_mod_ext_info & - (I40E_AQ_REQUEST_FEC_KR | I40E_AQ_REQUEST_FEC_RS); + if (abilities.fec_cfg_curr_mod_ext_info & + I40E_AQ_ENABLE_FEC_AUTO) + hw->phy.link_info.req_fec_info = + (I40E_AQ_REQUEST_FEC_KR | + I40E_AQ_REQUEST_FEC_RS); + else + hw->phy.link_info.req_fec_info = + abilities.fec_cfg_curr_mod_ext_info & + (I40E_AQ_REQUEST_FEC_KR | + I40E_AQ_REQUEST_FEC_RS); i40e_memcpy(hw->phy.link_info.module_type, &abilities.module_type, sizeof(hw->phy.link_info.module_type), I40E_NONDMA_TO_NONDMA); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:41.499396291 +0000 +++ 0072-net-i40e-base-fix-display-of-FEC-settings.patch 2020-02-11 11:17:38.488002993 +0000 @@ -1,8 +1,10 @@ -From b330a1c5c639d636c5eb08226af1385b1ec9c13b Mon Sep 17 00:00:00 2001 +From c5ca0d7c74c90542bb481597b6d8abb2f3dd4294 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 13 Jan 2020 10:39:39 +0800 Subject: [PATCH] net/i40e/base: fix display of FEC settings +[ upstream commit b330a1c5c639d636c5eb08226af1385b1ec9c13b ] + Fix display of FEC settings for ethtool. This patch change variable 'phy.link_info.req_fec_info' sent to ethtool. Without this patch wrong FEC settings can be shown. @@ -18,10 +20,10 @@ 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c -index a37e70599d..9ad0dd654b 100644 +index 95b96f70f6..9c6609bfc0 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c -@@ -2911,9 +2911,16 @@ enum i40e_status_code i40e_update_link_info(struct i40e_hw *hw) +@@ -2886,9 +2886,16 @@ enum i40e_status_code i40e_update_link_info(struct i40e_hw *hw) if (status) return status;