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 E7E4E46211 for ; Thu, 13 Feb 2025 11:01:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0C1642EDE; Thu, 13 Feb 2025 11:01:27 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 979E042ED2 for ; Thu, 13 Feb 2025 11:01:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440885; 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=OI3kBjCjmMTHpl1EaYW/S8y435kWRo4hJLKr9FI4aAg=; b=GUNW36cn1tSp34OiiLn43S8PLf5vpvXUM0lcvrTm/kvdrQJscN4T0gHxX70irTSKnnnN0r /5wNMMAZksvOFTpqs0slStG0hjb6mJZvxgDvBZLW0ZOYqn/gwu/jHWh6Yda4YlK/xM307+ qkDSizkQkyMX7/g5/9umzt40ZYXWonY= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-481-wmLdjHu8OJ65T4gan9K1eg-1; Thu, 13 Feb 2025 05:01:21 -0500 X-MC-Unique: wmLdjHu8OJ65T4gan9K1eg-1 X-Mimecast-MFC-AGG-ID: wmLdjHu8OJ65T4gan9K1eg Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B74CE1800876; Thu, 13 Feb 2025 10:01:20 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2AE981800365; Thu, 13 Feb 2025 10:01:18 +0000 (UTC) From: Kevin Traynor To: Peng Zhang Cc: Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix multi-PF control flag' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:09 +0000 Message-ID: <20250213095933.362078-42-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: UrVdll-a1LL5RU_zc2_OZcuTDU-iLnkPTQc6eO8pgrk_1739440880 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.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/c8a72ba74a128a7bbf630c4eb789cb4b89d765a7 Thanks. Kevin --- >From c8a72ba74a128a7bbf630c4eb789cb4b89d765a7 Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Wed, 22 Jan 2025 09:39:30 +0800 Subject: [PATCH] net/nfp: fix multi-PF control flag [ upstream commit 02c056aaac1ba1bd16658eef19cb78457d556041 ] In the original logic of 'nfp_net_start()', we don't set the 'NFP_NET_CFG_CTRL_MULTI_PF' flag when using multi-pf firmware. Fix it by adding the missing logic. Fixes: 95f978efab42 ("net/nfp: enable multiple PF in application firmware") Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_ethdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index aad044a0f7..dce03ed550 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -473,4 +473,7 @@ nfp_net_start(struct rte_eth_dev *dev) ctrl_extend |= NFP_NET_CFG_CTRL_FLOW_STEER; + if ((cap_extend & NFP_NET_CFG_CTRL_MULTI_PF) != 0 && pf_dev->multi_pf.enabled) + ctrl_extend |= NFP_NET_CFG_CTRL_MULTI_PF; + update = NFP_NET_CFG_UPDATE_GEN; if (nfp_ext_reconfig(hw, ctrl_extend, update) != 0) -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:39.079266134 +0000 +++ 0042-net-nfp-fix-multi-PF-control-flag.patch 2025-02-12 17:29:34.323945769 +0000 @@ -1 +1 @@ -From 02c056aaac1ba1bd16658eef19cb78457d556041 Mon Sep 17 00:00:00 2001 +From c8a72ba74a128a7bbf630c4eb789cb4b89d765a7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 02c056aaac1ba1bd16658eef19cb78457d556041 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 58a5b1d94e..ca808afdd9 100644 +index aad044a0f7..dce03ed550 100644