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

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.4

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

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

[ 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 40685d0912..1b51dab6b4 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -360,7 +360,7 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
 	/* Initialize the 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,
 					   crypto_xfrm);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-04-08 15:39:06.657228745 +0800
+++ 0022-common-cnxk-fix-inbound-IPsec-SA-setup.patch	2025-04-08 15:39:05.926436581 +0800
@@ -1 +1 @@
-From 26e8a2ac205749441971f81e5de0eff57e94ce90 Mon Sep 17 00:00:00 2001
+From f7d5fbc759dbf15aeb2a57c867087f3fdeda844d Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 26e8a2ac205749441971f81e5de0eff57e94ce90 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index 3a747ed441..a3c06c1e88 100644
+index 40685d0912..1b51dab6b4 100644
@@ -21 +23 @@
-@@ -315,7 +315,7 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
+@@ -360,7 +360,7 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
@@ -23 +25 @@
- 	roc_ot_ipsec_inb_sa_init(sa);
+ 	roc_ot_ipsec_inb_sa_init(sa, is_inline);