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

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.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 08/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=b977583692a9b52073c56141dd8f93c31922b34a

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From b977583692a9b52073c56141dd8f93c31922b34a 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 8827687e19..8e5ee34a2f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1480,6 +1480,7 @@ Vadim Suraev <vadim.suraev at gmail.com>
 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>
 Venkata Suresh Kumar P <venkata.suresh.kumar.p at intel.com>
diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h
index 7d16c66d79..0ed9eec816 100644
--- a/drivers/common/dpaax/caamflib/desc/pdcp.h
+++ b/drivers/common/dpaax/caamflib/desc/pdcp.h
@@ -1023,6 +1023,11 @@ pdcp_insert_uplane_aes_aes_op(struct program *p,
 		SEQFIFOLOAD(p, MSG1, 0, VLF | LAST1 | FLUSH1);
 		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 |
 		     CLRW_CLR_C1CTX |
@@ -1070,6 +1075,11 @@ 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 |
 		     CLRW_CLR_C1CTX |
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-12 20:44:03.519236419 +0800
+++ 0030-common-dpaax-caamflib-fix-PDCP-AES-AES-watchdog-erro.patch	2024-08-12 20:44:01.975069271 +0800
@@ -1 +1 @@
-From ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 Mon Sep 17 00:00:00 2001
+From b977583692a9b52073c56141dd8f93c31922b34a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 502791e0bc..74739ec9be 100644
+index 8827687e19..8e5ee34a2f 100644
@@ -23 +25,2 @@
-@@ -1503,6 +1503,7 @@ Vakul Garg <vakul.garg at nxp.com>
+@@ -1480,6 +1480,7 @@ Vadim Suraev <vadim.suraev at gmail.com>
+ Vakul Garg <vakul.garg at nxp.com>
@@ -25 +27,0 @@
- Vamsi Krishna Atluri <vamsi.atluri at amd.com>