[dpdk-stable] patch 'net/dpaa2: fix congestion ID for multiple traffic classes' 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 eeaa4c42b347a19845b43b0a42e36b90fe79adf3 Mon Sep 17 00:00:00 2001
From: Jun Yang <jun.yang at nxp.com>
Date: Fri, 8 May 2020 18:32:09 +0530
Subject: [PATCH] net/dpaa2: fix congestion ID for multiple traffic classes

[ upstream commit 7a3a9d5660303971acb487d016613ce52105ac01 ]

When using a single TC, flow id is same as congestion group id.
However in case of multiple traffic classes, same flow id values
are used within each traffic class, which causes incorrect
traffic behavior e.g. halting of traffic.
This patches changes to use the cgid as the index which works
for single as well as multiple traffic classes.

Fixes: 13b856ac02a8 ("net/dpaa2: support taildrop on frame count basis")

Signed-off-by: Jun Yang <jun.yang at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 4fc550a885..19196cbb65 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -660,7 +660,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
 						DPNI_CP_CONGESTION_GROUP,
 						DPNI_QUEUE_RX,
 						dpaa2_q->tc_index,
-						flow_id, &taildrop);
+						dpaa2_q->cgid, &taildrop);
 		} else {
 			/*enabling per rx queue congestion control */
 			taildrop.threshold = CONG_THRESHOLD_RX_BYTES_Q;
@@ -687,7 +687,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
 			ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token,
 					DPNI_CP_CONGESTION_GROUP, DPNI_QUEUE_RX,
 					dpaa2_q->tc_index,
-					flow_id, &taildrop);
+					dpaa2_q->cgid, &taildrop);
 		} else {
 			ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token,
 					DPNI_CP_QUEUE, DPNI_QUEUE_RX,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:52.761946721 +0100
+++ 0200-net-dpaa2-fix-congestion-ID-for-multiple-traffic-cla.patch	2020-05-19 14:04:44.576654898 +0100
@@ -1,8 +1,10 @@
-From 7a3a9d5660303971acb487d016613ce52105ac01 Mon Sep 17 00:00:00 2001
+From eeaa4c42b347a19845b43b0a42e36b90fe79adf3 Mon Sep 17 00:00:00 2001
 From: Jun Yang <jun.yang at nxp.com>
 Date: Fri, 8 May 2020 18:32:09 +0530
 Subject: [PATCH] net/dpaa2: fix congestion ID for multiple traffic classes
 
+[ upstream commit 7a3a9d5660303971acb487d016613ce52105ac01 ]
+
 When using a single TC, flow id is same as congestion group id.
 However in case of multiple traffic classes, same flow id values
 are used within each traffic class, which causes incorrect
@@ -11,7 +13,6 @@
 for single as well as multiple traffic classes.
 
 Fixes: 13b856ac02a8 ("net/dpaa2: support taildrop on frame count basis")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jun Yang <jun.yang at nxp.com>
 Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
@@ -20,10 +21,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
-index 08f9832eb8..d9960b01f7 100644
+index 4fc550a885..19196cbb65 100644
 --- a/drivers/net/dpaa2/dpaa2_ethdev.c
 +++ b/drivers/net/dpaa2/dpaa2_ethdev.c
-@@ -669,7 +669,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -660,7 +660,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
  						DPNI_CP_CONGESTION_GROUP,
  						DPNI_QUEUE_RX,
  						dpaa2_q->tc_index,
@@ -32,7 +33,7 @@
  		} else {
  			/*enabling per rx queue congestion control */
  			taildrop.threshold = CONG_THRESHOLD_RX_BYTES_Q;
-@@ -696,7 +696,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -687,7 +687,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
  			ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token,
  					DPNI_CP_CONGESTION_GROUP, DPNI_QUEUE_RX,
  					dpaa2_q->tc_index,