patch 'common/cnxk: fix shift offset for TL3 length disable' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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/26/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/5deff57b9dcc77f043ef1b784be3b0d5b83de954

Thanks.

Kevin

---
>From 5deff57b9dcc77f043ef1b784be3b0d5b83de954 Mon Sep 17 00:00:00 2001
From: Nithin Dabilpuram <ndabilpuram at marvell.com>
Date: Fri, 21 Jan 2022 17:34:15 +0530
Subject: [PATCH] common/cnxk: fix shift offset for TL3 length disable

[ upstream commit 132dac7536e9bb2be9d9edabc1752dca7b25279a ]

Fix shift offset for length disable flag in NIXX_AF_TL3X_SHAPE
register to be 24 instead of zero similar to other level SHAPE
registers. Also mask unused bits in adjust value.

Fixes: 0885429c3028 ("common/cnxk: add NIX TM hierarchy enable/disable")

Signed-off-by: Nithin Dabilpuram <ndabilpuram at marvell.com>
Signed-off-by: Satha Rao <skoteshwar at marvell.com>
---
 drivers/common/cnxk/roc_nix_tm_utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/common/cnxk/roc_nix_tm_utils.c b/drivers/common/cnxk/roc_nix_tm_utils.c
index 543adf9e56..9e80c2a5fe 100644
--- a/drivers/common/cnxk/roc_nix_tm_utils.c
+++ b/drivers/common/cnxk/roc_nix_tm_utils.c
@@ -643,4 +643,5 @@ nix_tm_shaper_reg_prep(struct nix_tm_node *node,
 		adjust = profile->pkt_len_adj;
 
+	adjust &= 0x1FF;
 	plt_tm_dbg("Shaper config node %s(%u) lvl %u id %u, "
 		   "pir %" PRIu64 "(%" PRIu64 "B),"
@@ -709,5 +710,5 @@ nix_tm_shaper_reg_prep(struct nix_tm_node *node,
 		reg[k] = NIX_AF_TL3X_SHAPE(schq);
 		regval[k] = (adjust | (uint64_t)node->red_algo << 9 |
-			     (uint64_t)node->pkt_mode);
+			     (uint64_t)node->pkt_mode << 24);
 		k++;
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:46.417349619 +0000
+++ 0082-common-cnxk-fix-shift-offset-for-TL3-length-disable.patch	2022-02-21 15:22:44.173704310 +0000
@@ -1 +1 @@
-From 132dac7536e9bb2be9d9edabc1752dca7b25279a Mon Sep 17 00:00:00 2001
+From 5deff57b9dcc77f043ef1b784be3b0d5b83de954 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 132dac7536e9bb2be9d9edabc1752dca7b25279a ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org