[dpdk-stable] patch 'net/i40e/base: fix missing link modes' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

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 70fb846ac96dd44b3ef57fdb80d560dc2c493fd9 Mon Sep 17 00:00:00 2001
From: Xiaolong Ye <xiaolong.ye at intel.com>
Date: Mon, 13 Jan 2020 10:39:26 +0800
Subject: [PATCH] net/i40e/base: fix missing link modes

[ upstream commit 1da546c397055a4e6b93f3868f345a6ee6c07e71 ]

Fix for missing "Supported link modes" and "Advertised link modes"
info in ethtool after changed speed on X722 devices with BASE-T PHY
with FW API version >= 1.7.
The same FW API version on X710 and X722 does not mean the same
feature set so the change was needed as mac type of the device
should also be checked instead of FW API version only.

Fixes: e8228f1a16b7 ("net/i40e/base: report supported link modes")

Signed-off-by: Martyna Szapar <martyna.szapar at intel.com>
Signed-off-by: Xiaolong Ye <xiaolong.ye at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/base/i40e_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index 356c2da581..9d4330f35e 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -2025,8 +2025,8 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw,
 	     hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE)
 		hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU;
 
-	if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&
-	    hw->aq.api_min_ver >= 7) {
+	if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE &&
+	    hw->mac.type != I40E_MAC_X722) {
 		__le32 tmp;
 
 		i40e_memcpy(&tmp, resp->link_type, sizeof(tmp),
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:41.403425897 +0000
+++ 0069-net-i40e-base-fix-missing-link-modes.patch	2020-02-11 11:17:38.472002693 +0000
@@ -1,8 +1,10 @@
-From 1da546c397055a4e6b93f3868f345a6ee6c07e71 Mon Sep 17 00:00:00 2001
+From 70fb846ac96dd44b3ef57fdb80d560dc2c493fd9 Mon Sep 17 00:00:00 2001
 From: Xiaolong Ye <xiaolong.ye at intel.com>
 Date: Mon, 13 Jan 2020 10:39:26 +0800
 Subject: [PATCH] net/i40e/base: fix missing link modes
 
+[ upstream commit 1da546c397055a4e6b93f3868f345a6ee6c07e71 ]
+
 Fix for missing "Supported link modes" and "Advertised link modes"
 info in ethtool after changed speed on X722 devices with BASE-T PHY
 with FW API version >= 1.7.
@@ -21,10 +23,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
-index f256651d70..e0028ac4dc 100644
+index 356c2da581..9d4330f35e 100644
 --- a/drivers/net/i40e/base/i40e_common.c
 +++ b/drivers/net/i40e/base/i40e_common.c
-@@ -2043,8 +2043,8 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw,
+@@ -2025,8 +2025,8 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw,
  	     hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE)
  		hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU;