patch 'common/dpaax: fix PDCP key command race condition' has been queued to stable release 24.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.3

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

Thanks.

Kevin

---
>From 12cf9a6edfd0173beada2311f912e303702cedeb Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh at nxp.com>
Date: Wed, 21 May 2025 12:26:50 +0530
Subject: [PATCH] common/dpaax: fix PDCP key command race condition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 684faacc0fde7110c31c640669381dbf19f447f8 ]

A race condition between loading the key into CAAM’s internal
memory and initiating cryptographic operations can cause SEC
errors in PDCP AES algorithm combinations.

To mitigate this, the CALM instruction is added for the
12-bit SN case, and the older version of the descriptor
is used for the 18-bit SN case.

Fixes: 6127fff842a7 ("common/dpaax: remove outdated caamflib code")

Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
---
 drivers/common/dpaax/caamflib/desc/pdcp.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h
index 9ada3905c5..f4379ede2c 100644
--- a/drivers/common/dpaax/caamflib/desc/pdcp.h
+++ b/drivers/common/dpaax/caamflib/desc/pdcp.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+
  * Copyright 2008-2013 Freescale Semiconductor, Inc.
- * Copyright 2019-2023 NXP
+ * Copyright 2019-2025 NXP
  */
 
@@ -1982,6 +1982,5 @@ pdcp_insert_uplane_no_int_op(struct program *p,
 	    cipherdata->keylen, INLINE_KEY(cipherdata));
 
-	if ((sn_size == PDCP_SN_SIZE_15) ||
-			(rta_sec_era >= RTA_SEC_ERA_10)) {
+	if (sn_size == PDCP_SN_SIZE_15) {
 		PROTOCOL(p, dir, OP_PCLID_LTE_PDCP_USER,
 			 (uint16_t)cipherdata->algtype);
@@ -2748,4 +2747,5 @@ cnstr_shdsc_pdcp_u_plane_encap(uint32_t *descbuf,
 			    INLINE_KEY(cipherdata));
 
+			JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM);
 			if (authdata)
 				PROTOCOL(p, OP_TYPE_ENCAP_PROTOCOL,
-- 
2.50.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-18 20:29:13.747249309 +0100
+++ 0078-common-dpaax-fix-PDCP-key-command-race-condition.patch	2025-07-18 20:29:10.982907490 +0100
@@ -1 +1 @@
-From 684faacc0fde7110c31c640669381dbf19f447f8 Mon Sep 17 00:00:00 2001
+From 12cf9a6edfd0173beada2311f912e303702cedeb Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 684faacc0fde7110c31c640669381dbf19f447f8 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org