patch 'common/cnxk: fix inbound IPsec SA setup' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.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 03/12/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/4645bd6fb02e578386ec943306a109ae40d71c96

Thanks.

Kevin

---
>From 4645bd6fb02e578386ec943306a109ae40d71c96 Mon Sep 17 00:00:00 2001
From: Nithin Dabilpuram <ndabilpuram at marvell.com>
Date: Mon, 24 Feb 2025 15:22:37 +0530
Subject: [PATCH] common/cnxk: fix inbound IPsec SA setup

[ upstream commit 26e8a2ac205749441971f81e5de0eff57e94ce90 ]

Make sure the w2 in inbound SA is set for inline IPsec have
L3 header on errors.

Fixes: 350b7a536a51 ("common/cnxk: enable L3 header write back in SA")

Signed-off-by: Nithin Dabilpuram <ndabilpuram at marvell.com>
---
 drivers/common/cnxk/cnxk_security.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c
index c2871ad2bd..59032344bd 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -315,5 +315,5 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
 	roc_ot_ipsec_inb_sa_init(sa, is_inline);
 
-	w2.u64 = 0;
+	w2.u64 = sa->w2.u64;
 	rc = ot_ipsec_sa_common_param_fill(&w2, sa->cipher_key, sa->w8.s.salt,
 					   sa->hmac_opad_ipad, ipsec_xfrm,
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-07 11:02:58.053322500 +0000
+++ 0031-common-cnxk-fix-inbound-IPsec-SA-setup.patch	2025-03-07 11:02:56.899171657 +0000
@@ -1 +1 @@
-From 26e8a2ac205749441971f81e5de0eff57e94ce90 Mon Sep 17 00:00:00 2001
+From 4645bd6fb02e578386ec943306a109ae40d71c96 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 26e8a2ac205749441971f81e5de0eff57e94ce90 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 3a747ed441..a3c06c1e88 100644
+index c2871ad2bd..59032344bd 100644
@@ -21,2 +22,2 @@
-@@ -316,5 +316,5 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
- 	roc_ot_ipsec_inb_sa_init(sa);
+@@ -315,5 +315,5 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
+ 	roc_ot_ipsec_inb_sa_init(sa, is_inline);