patch 'common/cnxk: fix atomic load in batch ops' 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 02/17/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/8ed2702aff3abf17e78b3582d220a28ea9f4641e

Thanks.

Kevin

---
>From 8ed2702aff3abf17e78b3582d220a28ea9f4641e Mon Sep 17 00:00:00 2001
From: Nawal Kishor <nkishor at marvell.com>
Date: Mon, 2 Dec 2024 22:27:39 +0530
Subject: [PATCH] common/cnxk: fix atomic load in batch ops

[ upstream commit 73d38682fddd614d95942442c20b3a1de211bb4c ]

In roc batch alloc wait code, __ATOMIC_RELAXED is changed to
__ATOMIC_ACQUIRE in order to avoid potential out of order loads.

Fixes: 50d08d3934ec ("common/cnxk: fix batch alloc completion poll logic")

Signed-off-by: Nawal Kishor <nkishor at marvell.com>
---
 .mailmap                      | 1 +
 drivers/common/cnxk/roc_npa.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 07ae8c48fc..58811dac34 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1079,4 +1079,5 @@ Nathan Brown <nathan.brown at arm.com>
 Nathan Law <nlaw at brocade.com>
 Nathan Skrzypczak <nathan.skrzypczak at gmail.com>
+Nawal Kishor <nkishor at marvell.com>
 Neel Patel <neel.patel at amd.com> <neel at pensando.io>
 Neil Horman <nhorman at tuxdriver.com>
diff --git a/drivers/common/cnxk/roc_npa.h b/drivers/common/cnxk/roc_npa.h
index f7cb4460e7..8525038810 100644
--- a/drivers/common/cnxk/roc_npa.h
+++ b/drivers/common/cnxk/roc_npa.h
@@ -256,5 +256,5 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line, unsigned int wait_us)
 	 * of the 128 byte cache line.
 	 */
-	while (((__atomic_load_n(cache_line, __ATOMIC_RELAXED) >> 5) & 0x3) ==
+	while (((__atomic_load_n(cache_line, __ATOMIC_ACQUIRE) >> 5) & 0x3) ==
 	       ALLOC_CCODE_INVAL)
 		if (wait_us && (plt_tsc_cycles() - start) >= ticks)
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-12 17:29:37.842671336 +0000
+++ 0030-common-cnxk-fix-atomic-load-in-batch-ops.patch	2025-02-12 17:29:34.296945607 +0000
@@ -1 +1 @@
-From 73d38682fddd614d95942442c20b3a1de211bb4c Mon Sep 17 00:00:00 2001
+From 8ed2702aff3abf17e78b3582d220a28ea9f4641e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 73d38682fddd614d95942442c20b3a1de211bb4c ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 1ed47e1cad..8524952d24 100644
+index 07ae8c48fc..58811dac34 100644
@@ -22 +23 @@
-@@ -1080,4 +1080,5 @@ Nathan Brown <nathan.brown at arm.com>
+@@ -1079,4 +1079,5 @@ Nathan Brown <nathan.brown at arm.com>