[dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 e60d1157ced8462de2da5a8c38e0228fc0b210cf Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun at intel.com>
Date: Thu, 9 Jul 2020 08:00:30 +0000
Subject: [PATCH] net/ixgbe/base: fix x550em 10G NIC link status

[ upstream commit fb03b51da940f1d56d701776fd85a0dfc1ace098 ]

With the NVM image for x550em XFI will not report
the auto-negotiation feature correctly. The auto-negotiation
should be "No" for supports and advertised items.
At the same time update speed makes it support 1G and 10G.

Fixes: 833df43399e7 ("net/ixgbe/base: add SGMII link for X550")

Signed-off-by: Piotr Skajewski <piotrx.skajewski at intel.com>
Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
Reviewed-by: Wei Zhao <wei.zhao1 at intel.com>
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 3de406fd3..9fa999e01 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1891,7 +1891,14 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 		else
 			*speed = IXGBE_LINK_SPEED_10GB_FULL;
 	} else {
+		*autoneg = true;
+
 		switch (hw->phy.type) {
+		case ixgbe_phy_x550em_xfi:
+			*speed = IXGBE_LINK_SPEED_1GB_FULL |
+				 IXGBE_LINK_SPEED_10GB_FULL;
+			*autoneg = false;
+			break;
 		case ixgbe_phy_ext_1g_t:
 #ifdef PREBOOT_SUPPORT
 			*speed = IXGBE_LINK_SPEED_1GB_FULL;
@@ -1925,7 +1932,6 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 				 IXGBE_LINK_SPEED_1GB_FULL;
 			break;
 		}
-		*autoneg = true;
 	}
 
 	return IXGBE_SUCCESS;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.734845671 +0100
+++ 0135-net-ixgbe-base-fix-x550em-10G-NIC-link-status.patch	2020-07-24 12:53:48.435009217 +0100
@@ -1,15 +1,16 @@
-From fb03b51da940f1d56d701776fd85a0dfc1ace098 Mon Sep 17 00:00:00 2001
+From e60d1157ced8462de2da5a8c38e0228fc0b210cf Mon Sep 17 00:00:00 2001
 From: Guinan Sun <guinanx.sun at intel.com>
 Date: Thu, 9 Jul 2020 08:00:30 +0000
 Subject: [PATCH] net/ixgbe/base: fix x550em 10G NIC link status
 
+[ upstream commit fb03b51da940f1d56d701776fd85a0dfc1ace098 ]
+
 With the NVM image for x550em XFI will not report
 the auto-negotiation feature correctly. The auto-negotiation
 should be "No" for supports and advertised items.
 At the same time update speed makes it support 1G and 10G.
 
 Fixes: 833df43399e7 ("net/ixgbe/base: add SGMII link for X550")
-Cc: stable at dpdk.org
 
 Signed-off-by: Piotr Skajewski <piotrx.skajewski at intel.com>
 Signed-off-by: Guinan Sun <guinanx.sun at intel.com>