From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E17FF48B69 for ; Fri, 21 Nov 2025 12:24:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA764402E0; Fri, 21 Nov 2025 12:24:23 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 781224026F for ; Fri, 21 Nov 2025 12:24:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7wqk6kbI6PXjx8rbnzgmPoOeebiLZcJP9lrKV8KLqig=; b=cqnfoyJMSWqT2s9ovZE6PvefjLbIAePXuWrYpOe1A99LLe66EpEV50uLhCMkv8odZFa6pd wgbtz432XYXndejlXuKFyHSwZ5D8szb6ahno6XGoJABvHXXKxoRIENTHona63ap0UQ6bnX WP98ezoHaseE+5G13aQd5q/kNq0GynE= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-694-ktV8DWohMQKegoy5tYKXug-1; Fri, 21 Nov 2025 06:24:18 -0500 X-MC-Unique: ktV8DWohMQKegoy5tYKXug-1 X-Mimecast-MFC-AGG-ID: ktV8DWohMQKegoy5tYKXug_1763724257 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 20A011956059; Fri, 21 Nov 2025 11:24:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EFF0030044DB; Fri, 21 Nov 2025 11:24:15 +0000 (UTC) From: Kevin Traynor To: Aarnav JP Cc: dpdk stable Subject: patch 'common/cnxk: fix NIX Rx inject enabling' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:21:02 +0000 Message-ID: <20251121112128.485623-78-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: zO7CbFXJUebHtbklv3sUj4u-ZqXHgZ1lgC0UgztFuJA_1763724257 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 --- 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@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)