[dpdk-stable] patch 'net/octeontx2: fix Tx flow control for HIGIG' 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 b72c6c1c1860a61a42c7ff45bb9bc3d8b408dfc0 Mon Sep 17 00:00:00 2001
From: Kiran Kumar K <kirankumark at marvell.com>
Date: Thu, 30 Jan 2020 21:53:24 +0530
Subject: [PATCH] net/octeontx2: fix Tx flow control for HIGIG

[ upstream commit 184a3235735a2fae78bcc019c6cd9973426da3f1 ]

Tx flow controlled is disabled in the Ax silicon version due to an errata.
This errata is not applicable for HIGIG Tx flow control, therefore
not enabling in HIGIG case.

Fixes: 602009ee2dfb ("net/octeontx2: support HIGIG2")

Signed-off-by: Kiran Kumar K <kirankumark at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/octeontx2/otx2_flow_ctrl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/octeontx2/otx2_flow_ctrl.c b/drivers/net/octeontx2/otx2_flow_ctrl.c
index c6d7b1971a..1c6929e764 100644
--- a/drivers/net/octeontx2/otx2_flow_ctrl.c
+++ b/drivers/net/octeontx2/otx2_flow_ctrl.c
@@ -213,6 +213,7 @@ otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev)
 
 	/* To avoid Link credit deadlock on Ax, disable Tx FC if it's enabled */
 	if (otx2_dev_is_Ax(dev) &&
+	    (dev->npc_flow.switch_header_type != OTX2_PRIV_FLAGS_HIGIG) &&
 	    (fc_conf.mode == RTE_FC_FULL || fc_conf.mode == RTE_FC_RX_PAUSE)) {
 		fc_conf.mode =
 				(fc_conf.mode == RTE_FC_FULL ||
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:44.472191938 +0000
+++ 0169-net-octeontx2-fix-Tx-flow-control-for-HIGIG.patch	2020-02-11 11:17:38.804008901 +0000
@@ -1,14 +1,15 @@
-From 184a3235735a2fae78bcc019c6cd9973426da3f1 Mon Sep 17 00:00:00 2001
+From b72c6c1c1860a61a42c7ff45bb9bc3d8b408dfc0 Mon Sep 17 00:00:00 2001
 From: Kiran Kumar K <kirankumark at marvell.com>
 Date: Thu, 30 Jan 2020 21:53:24 +0530
 Subject: [PATCH] net/octeontx2: fix Tx flow control for HIGIG
 
+[ upstream commit 184a3235735a2fae78bcc019c6cd9973426da3f1 ]
+
 Tx flow controlled is disabled in the Ax silicon version due to an errata.
 This errata is not applicable for HIGIG Tx flow control, therefore
 not enabling in HIGIG case.
 
 Fixes: 602009ee2dfb ("net/octeontx2: support HIGIG2")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kiran Kumar K <kirankumark at marvell.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>