[dpdk-stable] patch 'net/octeontx2: fix link information for loopback port' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 255066602833e35bc6552011385389d24990a82f Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashishg at marvell.com>
Date: Thu, 6 Feb 2020 18:00:58 +0530
Subject: [PATCH] net/octeontx2: fix link information for loopback port

[ upstream commit 7b1b04079174e8a6843fcb53d1de792bf09fdf03 ]

Loopback devices are exposed as ethdev device in octeontx2.
This patch fixes the link information for loopback ports.

Fixes: 38f566280abb ("net/octeontx2: add link stats operations")

Signed-off-by: Ashish Gupta <ashishg at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/octeontx2/otx2_link.c | 53 +++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/drivers/net/octeontx2/otx2_link.c b/drivers/net/octeontx2/otx2_link.c
index f5679b06e7..4128f56d90 100644
--- a/drivers/net/octeontx2/otx2_link.c
+++ b/drivers/net/octeontx2/otx2_link.c
@@ -82,31 +82,56 @@ otx2_eth_dev_link_status_update(struct otx2_dev *dev,
 	_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
-int
-otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete)
+static int
+lbk_link_update(struct rte_eth_link *link)
+{
+	link->link_status = ETH_LINK_UP;
+	link->link_speed = ETH_SPEED_NUM_100G;
+	link->link_autoneg = ETH_LINK_FIXED;
+	link->link_duplex = ETH_LINK_FULL_DUPLEX;
+	return 0;
+}
+
+static int
+cgx_link_update(struct otx2_eth_dev *dev, struct rte_eth_link *link)
 {
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
 	struct otx2_mbox *mbox = dev->mbox;
 	struct cgx_link_info_msg *rsp;
-	struct rte_eth_link link;
 	int rc;
-
-	RTE_SET_USED(wait_to_complete);
-
-	if (otx2_dev_is_lbk(dev) || otx2_dev_is_sdp(dev))
-		return 0;
-
 	otx2_mbox_alloc_msg_cgx_get_linkinfo(mbox);
 	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
 	if (rc)
 		return rc;
 
-	link.link_status = rsp->link_info.link_up;
-	link.link_speed = rsp->link_info.speed;
-	link.link_autoneg = ETH_LINK_AUTONEG;
+	link->link_status = rsp->link_info.link_up;
+	link->link_speed = rsp->link_info.speed;
+	link->link_autoneg = ETH_LINK_AUTONEG;
 
 	if (rsp->link_info.full_duplex)
-		link.link_duplex = rsp->link_info.full_duplex;
+		link->link_duplex = rsp->link_info.full_duplex;
+	return 0;
+}
+
+int
+otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete)
+{
+	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+	struct rte_eth_link link;
+	int rc;
+
+	RTE_SET_USED(wait_to_complete);
+	memset(&link, 0, sizeof(struct rte_eth_link));
+
+	if (otx2_dev_is_sdp(dev))
+		return 0;
+
+	if (otx2_dev_is_lbk(dev))
+		rc = lbk_link_update(&link);
+	else
+		rc = cgx_link_update(dev, &link);
+
+	if (rc)
+		return rc;
 
 	return rte_eth_linkstatus_set(eth_dev, &link);
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:19.527896801 +0100
+++ 0018-net-octeontx2-fix-link-information-for-loopback-port.patch	2020-05-19 13:56:18.179501099 +0100
@@ -1,13 +1,14 @@
-From 7b1b04079174e8a6843fcb53d1de792bf09fdf03 Mon Sep 17 00:00:00 2001
+From 255066602833e35bc6552011385389d24990a82f Mon Sep 17 00:00:00 2001
 From: Ashish Gupta <ashishg at marvell.com>
 Date: Thu, 6 Feb 2020 18:00:58 +0530
 Subject: [PATCH] net/octeontx2: fix link information for loopback port
 
+[ upstream commit 7b1b04079174e8a6843fcb53d1de792bf09fdf03 ]
+
 Loopback devices are exposed as ethdev device in octeontx2.
 This patch fixes the link information for loopback ports.
 
 Fixes: 38f566280abb ("net/octeontx2: add link stats operations")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ashish Gupta <ashishg at marvell.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>