patch 'event/cnxk: fix QoS parameter handling' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/27/22. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/93b1138ccde149c0bfab0b0bbb806cd7b416cb08

Thanks.

Kevin

---
>From 93b1138ccde149c0bfab0b0bbb806cd7b416cb08 Mon Sep 17 00:00:00 2001
From: Shijith Thotton <sthotton at marvell.com>
Date: Fri, 20 May 2022 12:41:05 +0530
Subject: [PATCH] event/cnxk: fix QoS parameter handling

[ upstream commit 448e2400fa8a2dd6169b6cb40a98b18d4e28fca9 ]

Fixed QoS parameters getting over written and IAQ/TAQ threshold
calculation.

Fixes: 910da32c53a9 ("event/cnxk: add device start")

Signed-off-by: Shijith Thotton <sthotton at marvell.com>
---
 drivers/common/cnxk/roc_sso.c      | 4 ++--
 drivers/event/cnxk/cnxk_eventdev.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/common/cnxk/roc_sso.c b/drivers/common/cnxk/roc_sso.c
index 45ff16ca0e..ede0a8a3bb 100644
--- a/drivers/common/cnxk/roc_sso.c
+++ b/drivers/common/cnxk/roc_sso.c
@@ -379,8 +379,8 @@ roc_sso_hwgrp_qos_config(struct roc_sso *roc_sso, struct roc_sso_hwgrp_qos *qos,
 		req->grp = qos[i].hwgrp;
 		req->xaq_limit = (nb_xaq * (xaq_prcnt ? xaq_prcnt : 100)) / 100;
-		req->taq_thr = (SSO_HWGRP_IAQ_MAX_THR_MASK *
+		req->iaq_thr = (SSO_HWGRP_IAQ_MAX_THR_MASK *
 				(iaq_prcnt ? iaq_prcnt : 100)) /
 			       100;
-		req->iaq_thr = (SSO_HWGRP_TAQ_MAX_THR_MASK *
+		req->taq_thr = (SSO_HWGRP_TAQ_MAX_THR_MASK *
 				(taq_prcnt ? taq_prcnt : 100)) /
 			       100;
diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c
index 6ad4e23e2b..46a788ef4e 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -418,8 +418,8 @@ cnxk_sso_start(struct rte_eventdev *event_dev, cnxk_sso_hws_reset_t reset_fn,
 	plt_sso_dbg();
 	for (i = 0; i < dev->qos_queue_cnt; i++) {
-		qos->hwgrp = dev->qos_parse_data[i].queue;
-		qos->iaq_prcnt = dev->qos_parse_data[i].iaq_prcnt;
-		qos->taq_prcnt = dev->qos_parse_data[i].taq_prcnt;
-		qos->xaq_prcnt = dev->qos_parse_data[i].xaq_prcnt;
+		qos[i].hwgrp = dev->qos_parse_data[i].queue;
+		qos[i].iaq_prcnt = dev->qos_parse_data[i].iaq_prcnt;
+		qos[i].taq_prcnt = dev->qos_parse_data[i].taq_prcnt;
+		qos[i].xaq_prcnt = dev->qos_parse_data[i].xaq_prcnt;
 	}
 	rc = roc_sso_hwgrp_qos_config(&dev->sso, qos, dev->qos_queue_cnt,
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-24 15:51:09.626865145 +0100
+++ 0025-event-cnxk-fix-QoS-parameter-handling.patch	2022-06-24 15:51:08.892984138 +0100
@@ -1 +1 @@
-From 448e2400fa8a2dd6169b6cb40a98b18d4e28fca9 Mon Sep 17 00:00:00 2001
+From 93b1138ccde149c0bfab0b0bbb806cd7b416cb08 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 448e2400fa8a2dd6169b6cb40a98b18d4e28fca9 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index d986abe573..7c86474809 100644
+index 45ff16ca0e..ede0a8a3bb 100644
@@ -22 +23 @@
-@@ -407,8 +407,8 @@ roc_sso_hwgrp_qos_config(struct roc_sso *roc_sso, struct roc_sso_hwgrp_qos *qos,
+@@ -379,8 +379,8 @@ roc_sso_hwgrp_qos_config(struct roc_sso *roc_sso, struct roc_sso_hwgrp_qos *qos,
@@ -34 +35 @@
-index a9e4201ed8..97dcf7b66e 100644
+index 6ad4e23e2b..46a788ef4e 100644
@@ -37 +38 @@
-@@ -541,8 +541,8 @@ cnxk_sso_start(struct rte_eventdev *event_dev, cnxk_sso_hws_reset_t reset_fn,
+@@ -418,8 +418,8 @@ cnxk_sso_start(struct rte_eventdev *event_dev, cnxk_sso_hws_reset_t reset_fn,