patch 'common/dpaax/caamflib: fix PDCP AES-AES watchdog error' has been queued to stable release 21.11.8

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.8

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

Thanks.

Kevin

---
>From b9e0305984199d12350f93c408f8391f12e85df0 Mon Sep 17 00:00:00 2001
From: Varun Sethi <v.sethi at nxp.com>
Date: Wed, 3 Jul 2024 15:56:40 +0530
Subject: [PATCH] common/dpaax/caamflib: fix PDCP AES-AES watchdog error

[ upstream commit ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 ]

Adding a Jump instruction with CALM flag to ensure
previous processing has been completed.

Fixes: 8827d94398f1 ("crypto/dpaa2_sec/hw: support AES-AES 18-bit PDCP")

Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
Signed-off-by: Varun Sethi <v.sethi at nxp.com>
---
 .mailmap                                  |  1 +
 drivers/common/dpaax/caamflib/desc/pdcp.h | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/.mailmap b/.mailmap
index ed99e606d5..82e0e35a7d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1419,4 +1419,5 @@ Vakul Garg <vakul.garg at nxp.com>
 Vamsi Attunuru <vattunuru at marvell.com>
 Vanshika Shukla <vanshika.shukla at nxp.com>
+Varun Sethi <v.sethi at nxp.com>
 Vasily Philipov <vasilyf at mellanox.com>
 Veerasenareddy Burru <vburru at marvell.com>
diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h
index 2c9c631cfd..73af1141b6 100644
--- a/drivers/common/dpaax/caamflib/desc/pdcp.h
+++ b/drivers/common/dpaax/caamflib/desc/pdcp.h
@@ -1304,4 +1304,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p,
 		MOVEB(p, CONTEXT1, 0, MATH3, 0, 4, WAITCOMP | IMMED);
 
+		/* conditional jump with calm added to ensure that the
+		 * previous processing has been completed
+		 */
+		JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM);
+
 		LOAD(p, CLRW_RESET_CLS1_CHA |
 		     CLRW_CLR_C1KEY |
@@ -1351,4 +1356,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p,
 		MOVEB(p, OFIFO, 0, MATH3, 0, 4, IMMED);
 
+		/* conditional jump with calm added to ensure that the
+		 * previous processing has been completed
+		 */
+		JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM);
+
 		LOAD(p, CLRW_RESET_CLS1_CHA |
 		     CLRW_CLR_C1KEY |
-- 
2.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:11.821700511 +0100
+++ 0067-common-dpaax-caamflib-fix-PDCP-AES-AES-watchdog-erro.patch	2024-08-23 17:18:09.742430182 +0100
@@ -1 +1 @@
-From ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 Mon Sep 17 00:00:00 2001
+From b9e0305984199d12350f93c408f8391f12e85df0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 502791e0bc..74739ec9be 100644
+index ed99e606d5..82e0e35a7d 100644
@@ -23,2 +24,2 @@
-@@ -1504,4 +1504,5 @@ Vamsi Attunuru <vattunuru at marvell.com>
- Vamsi Krishna Atluri <vamsi.atluri at amd.com>
+@@ -1419,4 +1419,5 @@ Vakul Garg <vakul.garg at nxp.com>
+ Vamsi Attunuru <vattunuru at marvell.com>
@@ -30 +31 @@
-index 7d16c66d79..0ed9eec816 100644
+index 2c9c631cfd..73af1141b6 100644
@@ -33 +34 @@
-@@ -1024,4 +1024,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p,
+@@ -1304,4 +1304,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p,
@@ -43 +44 @@
-@@ -1071,4 +1076,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p,
+@@ -1351,4 +1356,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p,