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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 08/25/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/6af0060f513880664da242dd750b60682e162b92

Thanks.

Kevin.

---
>From 6af0060f513880664da242dd750b60682e162b92 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 f2c8e5425e..265b5704ee 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1892,5 +1892,12 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 			*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
@@ -1926,5 +1933,4 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 			break;
 		}
-		*autoneg = true;
 	}
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.829505854 +0100
+++ 0028-net-ixgbe-base-fix-x550em-10G-NIC-link-status.patch	2020-08-20 16:26:15.820324288 +0100
@@ -1 +1 @@
-From fb03b51da940f1d56d701776fd85a0dfc1ace098 Mon Sep 17 00:00:00 2001
+From 6af0060f513880664da242dd750b60682e162b92 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fb03b51da940f1d56d701776fd85a0dfc1ace098 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 3de406fd35..9fa999e01d 100644
+index f2c8e5425e..265b5704ee 100644