patch 'common/cnxk: fix NIX Rx inject enabling' has been queued to stable release 24.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.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 11/26/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/0fc620bca137d63e775a53da37867dd103baf74c

Thanks.

Kevin

---
>From 0fc620bca137d63e775a53da37867dd103baf74c Mon Sep 17 00:00:00 2001
From: Aarnav JP <ajp at marvell.com>
Date: Thu, 13 Nov 2025 10:08:06 +0530
Subject: [PATCH] common/cnxk: fix NIX Rx inject enabling

[ upstream commit 9396a93a0d848edf0f32a4950418a8083e04924c ]

Rx inject can only be supported with roc_nix.

Fixes: 4b8eb5bd6627 ("common/cnxk: reserve CPT LF for Rx inject")

Signed-off-by: Aarnav JP <ajp at marvell.com>
---
 drivers/common/cnxk/roc_nix_inl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c
index 5b79bc2266..172055ce88 100644
--- a/drivers/common/cnxk/roc_nix_inl.c
+++ b/drivers/common/cnxk/roc_nix_inl.c
@@ -564,10 +564,10 @@ roc_nix_inl_inb_rx_inject_enable(struct roc_nix *roc_nix, bool inb_inl_dev)
 	if (inb_inl_dev) {
 		inl_dev = idev->nix_inl_dev;
-		if (inl_dev && inl_dev->attach_cptlf && inl_dev->rx_inj_ena &&
+		if (inl_dev && inl_dev->attach_cptlf && inl_dev->rx_inj_ena && roc_nix &&
 		    roc_nix->rx_inj_ena)
 			return true;
 	}
 
-	return roc_nix->rx_inj_ena;
+	return roc_nix ? roc_nix->rx_inj_ena : 0;
 }
 
-- 
2.51.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-11-21 11:05:11.988329166 +0000
+++ 0078-common-cnxk-fix-NIX-Rx-inject-enabling.patch	2025-11-21 11:05:09.559201579 +0000
@@ -1 +1 @@
-From 9396a93a0d848edf0f32a4950418a8083e04924c Mon Sep 17 00:00:00 2001
+From 0fc620bca137d63e775a53da37867dd103baf74c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9396a93a0d848edf0f32a4950418a8083e04924c ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
-index 780f4cbbfc..f8be98efd5 100644
+index 5b79bc2266..172055ce88 100644
@@ -20 +21 @@
-@@ -850,10 +850,10 @@ roc_nix_inl_inb_rx_inject_enable(struct roc_nix *roc_nix, bool inb_inl_dev)
+@@ -564,10 +564,10 @@ roc_nix_inl_inb_rx_inject_enable(struct roc_nix *roc_nix, bool inb_inl_dev)