patch 'common/dpaax/caamflib: fix PDCP SNOW-ZUC watchdog' has been queued to stable release 21.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.9

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

Thanks.

Kevin

---
>From 1ecb687439e02dda013cba5f83849a2aa8454db2 Mon Sep 17 00:00:00 2001
From: Varun Sethi <v.sethi at nxp.com>
Date: Tue, 6 Aug 2024 15:57:27 +0530
Subject: [PATCH] common/dpaax/caamflib: fix PDCP SNOW-ZUC watchdog

[ upstream commit 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 ]

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>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/common/dpaax/caamflib/desc/pdcp.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h
index 73af1141b6..fc2db208ac 100644
--- a/drivers/common/dpaax/caamflib/desc/pdcp.h
+++ b/drivers/common/dpaax/caamflib/desc/pdcp.h
@@ -1575,4 +1575,9 @@ pdcp_insert_cplane_snow_aes_op(struct program *p,
 			     CLRW, 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);
+
 		if (rta_sec_era <= RTA_SEC_ERA_3)
 			LOAD(p, CCTRL_RESET_CHA_ALL, CCTRL, 0, 4, IMMED);
@@ -2420,4 +2425,9 @@ pdcp_insert_cplane_zuc_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.47.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-27 17:17:38.505180782 +0000
+++ 0005-common-dpaax-caamflib-fix-PDCP-SNOW-ZUC-watchdog.patch	2024-11-27 17:17:38.156269015 +0000
@@ -1 +1 @@
-From 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 Mon Sep 17 00:00:00 2001
+From 1ecb687439e02dda013cba5f83849a2aa8454db2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index bc35114cf4..9ada3905c5 100644
+index 73af1141b6..fc2db208ac 100644
@@ -23,2 +24,2 @@
-@@ -1221,4 +1221,9 @@ pdcp_insert_cplane_snow_aes_op(struct program *p,
- 		MOVEB(p, CONTEXT1, 0, MATH3, 0, 4, WAITCOMP | IMMED);
+@@ -1575,4 +1575,9 @@ pdcp_insert_cplane_snow_aes_op(struct program *p,
+ 			     CLRW, 0, 4, IMMED);
@@ -31,3 +32,3 @@
- 		LOAD(p, CLRW_RESET_CLS1_CHA |
- 		     CLRW_CLR_C1KEY |
-@@ -1922,4 +1927,9 @@ pdcp_insert_cplane_zuc_aes_op(struct program *p,
+ 		if (rta_sec_era <= RTA_SEC_ERA_3)
+ 			LOAD(p, CCTRL_RESET_CHA_ALL, CCTRL, 0, 4, IMMED);
+@@ -2420,4 +2425,9 @@ pdcp_insert_cplane_zuc_aes_op(struct program *p,