patch 'bus/dpaa: fix probing on LS1043A' has been queued to stable release 25.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 25.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 08/04/26. 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/23cdeff64f084ae4d5da5f8c7437204c8d5b36a4

Thanks.

Kevin

---
>From 23cdeff64f084ae4d5da5f8c7437204c8d5b36a4 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh at nxp.com>
Date: Mon, 13 Jul 2026 15:47:37 +0530
Subject: [PATCH] bus/dpaa: fix probing on LS1043A

[ upstream commit fc8b19683c380a8c7b0f206668da81e6da74a05b ]

Remove an unintended early return in the LS1043 SoC version check
that was preventing device probing from completing successfully on
LS1043A platforms.

The early return did two things: set max_push_rxq_num = 0 and skip
the DPAA_PUSH_QUEUES_NUMBER env-var override. With the return gone,
the env-var could inadvertently re-enable push mode on LS1043A, which
must remain disabled due to the FMAN push-mode errata handled in
dpaa_rxtx.c. Guard the env-var override so it only applies to
non-LS1043A SoCs.

Fixes: 164e9e13e50f ("bus/dpaa: enhance SoC version")

Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
---
 drivers/bus/dpaa/dpaa_bus.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index d9830b68ca..5aed733009 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright 2017-2025 NXP
+ * Copyright 2017-2026 NXP
  *
  */
@@ -748,16 +748,15 @@ rte_dpaa_bus_probe(void)
 	}
 
-	/* Disabling the default push mode for LS1043A */
+	/* Disabling the default push mode for LS1043A due to errata */
 	if (rte_dpaa_bus.svr_ver == SVR_LS1043A_FAMILY) {
 		rte_dpaa_bus.max_push_rxq_num = 0;
-		return 0;
+	} else {
+		penv = getenv("DPAA_PUSH_QUEUES_NUMBER");
+		if (penv)
+			rte_dpaa_bus.max_push_rxq_num = atoi(penv);
+		if (rte_dpaa_bus.max_push_rxq_num > DPAA_MAX_PUSH_MODE_QUEUE)
+			rte_dpaa_bus.max_push_rxq_num = DPAA_MAX_PUSH_MODE_QUEUE;
 	}
 
-	penv = getenv("DPAA_PUSH_QUEUES_NUMBER");
-	if (penv)
-		rte_dpaa_bus.max_push_rxq_num = atoi(penv);
-	if (rte_dpaa_bus.max_push_rxq_num > DPAA_MAX_PUSH_MODE_QUEUE)
-		rte_dpaa_bus.max_push_rxq_num = DPAA_MAX_PUSH_MODE_QUEUE;
-
 	/* Device list creation is only done once */
 	if (!process_once) {
-- 
2.55.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-07-30 10:16:03.670449019 +0100
+++ 0077-bus-dpaa-fix-probing-on-LS1043A.patch	2026-07-30 10:16:01.505191705 +0100
@@ -1 +1 @@
-From fc8b19683c380a8c7b0f206668da81e6da74a05b Mon Sep 17 00:00:00 2001
+From 23cdeff64f084ae4d5da5f8c7437204c8d5b36a4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fc8b19683c380a8c7b0f206668da81e6da74a05b ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index 54779f82f7..368c8eeb98 100644
+index d9830b68ca..5aed733009 100644
@@ -36 +37 @@
-@@ -725,16 +725,15 @@ rte_dpaa_bus_scan(void)
+@@ -748,16 +748,15 @@ rte_dpaa_bus_probe(void)
@@ -41,2 +42,2 @@
- 	if (dpaa_bus.svr_ver == SVR_LS1043A_FAMILY) {
- 		dpaa_bus.max_push_rxq_num = 0;
+ 	if (rte_dpaa_bus.svr_ver == SVR_LS1043A_FAMILY) {
+ 		rte_dpaa_bus.max_push_rxq_num = 0;
@@ -47,3 +48,3 @@
-+			dpaa_bus.max_push_rxq_num = atoi(penv);
-+		if (dpaa_bus.max_push_rxq_num > DPAA_MAX_PUSH_MODE_QUEUE)
-+			dpaa_bus.max_push_rxq_num = DPAA_MAX_PUSH_MODE_QUEUE;
++			rte_dpaa_bus.max_push_rxq_num = atoi(penv);
++		if (rte_dpaa_bus.max_push_rxq_num > DPAA_MAX_PUSH_MODE_QUEUE)
++			rte_dpaa_bus.max_push_rxq_num = DPAA_MAX_PUSH_MODE_QUEUE;
@@ -54,3 +55,3 @@
--		dpaa_bus.max_push_rxq_num = atoi(penv);
--	if (dpaa_bus.max_push_rxq_num > DPAA_MAX_PUSH_MODE_QUEUE)
--		dpaa_bus.max_push_rxq_num = DPAA_MAX_PUSH_MODE_QUEUE;
+-		rte_dpaa_bus.max_push_rxq_num = atoi(penv);
+-	if (rte_dpaa_bus.max_push_rxq_num > DPAA_MAX_PUSH_MODE_QUEUE)
+-		rte_dpaa_bus.max_push_rxq_num = DPAA_MAX_PUSH_MODE_QUEUE;