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 5BBD94625C for ; Tue, 18 Feb 2025 13:38:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4F960402C4; Tue, 18 Feb 2025 13:38:44 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2085.outbound.protection.outlook.com [40.107.94.85]) by mails.dpdk.org (Postfix) with ESMTP id 6C1C7402C4 for ; Tue, 18 Feb 2025 13:38:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kCx3VmnIBZdKTChej8BGP8GPa4pZGtnxh8FyRiaNCAPFscuYv+//AZZXCnD4gLD/NFiYHzYk9tVfsSWYP77IVKD2JmtmEMYNRhYgaUriyI3gmwlwq4yr/LcxoQGahC4SYZmKXpKwYd8KMNh2y4wHozIRpbK7OVasP0J71OnWk/NwG6Sqq95dw0s85eEEFIILDE6KSoQGibDcQOMQQIpPk4trNKe3fmV8zlwpUCzPJpuom1PbGI6r949Kydgogw+zx68f2uInLk0DhLCD8ZaIlEZ/kxa//AiXVKC8wlv6oFrxRHmkE/Vyp4Cn2vFYwpEyKgSwY031rIU9dsaBYL4Wdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jdqXaWY5CujPXkKV5Oi5JfzeeR5Bcv+foKMMC4Sa8V0=; b=gB5QCKGvXxnBsMmoclCD76OpJkkpWJJCQmM6zszuhadP1vp7ZCcCa7m09lnRzMLl80ABDJsVvyZPZOK1H0mDMetxoEAXtfjHwy0rWrAZxkDoG3XsUUrmHh6QaKGdIB3C2DtUf5wD88ReofppExnst665+hsRBBzjrt+/XGIYnI5CfVWzztWvsY3g+V4RLGQ4DRCOGXn58zmnj0Gje/tIKtewMSzRXeD4UxpUOQu/akRQq4DwXFiXFpO7X5G4pW7UiyasjPMBzQIuLZkQ6bslgA0gNewr3KDGY2pXRRIuSPIN8JCH+8Cn62VOuge+ydFgExaCc0+sPom07YUvOo2vWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jdqXaWY5CujPXkKV5Oi5JfzeeR5Bcv+foKMMC4Sa8V0=; b=uMraocgYlPDtyisskFa02ePe4gY9LtkrZJ0GHDsQ6nd6FEqpk25W8ltTTZFKK9GpiPLCQMugUXPkYmHv2hlXFtVwU9HWb6aWVun46XdlhP6ci3bHy9/1zUnhEWZR60gZqDw+B2rbP1UBsJVWwiI024HlDfgi8Wx4vClEo7mwYvmjsX0McjAG6yFpjhJ+/e/PzLFKesEDw1lq6hHFofIBdbRfbqQ3ZNRRmwwEY5a2ddwAA88m1LbgCuzzYyX1RmVSkfQicHI5uqnJx21MvM1OX7umxVA7QE+rmKs9miPwi56/8rd1q7TivrMg6ZbXiFfKObckxhK4aEC4rVrsOv6Rqg== Received: from MW4PR03CA0197.namprd03.prod.outlook.com (2603:10b6:303:b8::22) by CH3PR12MB9194.namprd12.prod.outlook.com (2603:10b6:610:19f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.17; Tue, 18 Feb 2025 12:38:36 +0000 Received: from MWH0EPF000989E6.namprd02.prod.outlook.com (2603:10b6:303:b8:cafe::cd) by MW4PR03CA0197.outlook.office365.com (2603:10b6:303:b8::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.20 via Frontend Transport; Tue, 18 Feb 2025 12:38:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by MWH0EPF000989E6.mail.protection.outlook.com (10.167.241.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:38:36 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:38:25 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:38:23 -0800 From: Xueming Li To: Peng Zhang CC: , Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix multi-PF control flag' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:23 +0800 Message-ID: <20250218123523.36836-29-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E6:EE_|CH3PR12MB9194:EE_ X-MS-Office365-Filtering-Correlation-Id: d5b90e81-a489-4507-5503-08dd501929c4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?yhh/cOuwZGXXw/OJLf1aRVFeXf2/thE1ReP9rywKgO3iMW8VWWGJcMwAGP3g?= =?us-ascii?Q?yaiF3cBL7XPVOg90/ZyjnKELe4yZS0fZbRY6/35Lx2YE7oH/KbIfB37RT0Zp?= =?us-ascii?Q?2jr9yM6xZeyXe7OnbN7N7T/oyLwJQowJ6TRIYP70rGT1IkmZ2UilE6qllVDu?= =?us-ascii?Q?uK6iO+xjCgyYlV/bPVjC+G83G5UJVfXUs4p6zRYE5Ij8OknfguiPUvmHxyL6?= =?us-ascii?Q?gqX+cVbuPwi29y1SQdG/i0R1awh+ylZ4DGXXoObhIW8ESliunZUc1SSlRiWN?= =?us-ascii?Q?MAyJFZEgcHrToE+JY4y5/4G9IG7DYD9Qhco4FcAcs2QcqJe6Y0D4BznGczyR?= =?us-ascii?Q?2MGGoage8S+aVWcS93PjYQqBy/53RtAlVZafNscWf3eISTUfCzeKtDftPTcP?= =?us-ascii?Q?uOgXPO/TqM0+zhaIVRtcS7tcnM+KBsyLAa3P6ozX3qEDVarYUeiLd12WjxtT?= =?us-ascii?Q?6sGzSptQ2k4CEWolG6oYD4Ejwh1azMC1W4Q4D4N65unAPicsOgCjV6gax5fP?= =?us-ascii?Q?d060QkCYKXq5HaVW08xRmSTlw40wCliIu5C/8eGGwAZK3WSUSaWBnI+Gd2i9?= =?us-ascii?Q?P/I+jCBWbmp0ofG6WZhZeFIaV2sCN7TxYuQfb5Dpi6oGCeSI7ZNiyxkDQjV2?= =?us-ascii?Q?rsUfNgJio8wANwr5wt/l2+kMQH6dTuMtIduCEcJNGTIzoKXmcUFPDWH8h3uM?= =?us-ascii?Q?SCztRjXrpA32tK4pG44J3v2Qms2VcaO+4NENXxIM3BtNgdcQZ4KtEudcHD19?= =?us-ascii?Q?gqiw7s2JWk/zVdymMCiQEIY4HPJibsvj8cJ/HjJm8sNGRhnStUIrDVqEz8TM?= =?us-ascii?Q?OJJQot9ZQ/ZQKKbW/vJYELLM9m8GeTucBOysIGd4lPPb4EPTxU7bUZ/l4cBn?= =?us-ascii?Q?x5uwpA7beFYyHkeHEIBUzTsYZiO2E+Gtj5I2ozpWxjVd1m8NhiRJvZC1ROrh?= =?us-ascii?Q?+lBSGWYFEvQw2Lpk79O6Y1/aEpRTtpEgjvBPKJ6gq13tzkJfELxj7oe1soTp?= =?us-ascii?Q?hPTdp/JdOAK7aqaimWnX04COEBfSj3R3Afu66876Myc1zsToAjwh94AezG0d?= =?us-ascii?Q?NwvKW96y6DxtTEjgxlfsugmuoGvXei6UMFtr6tYWGPWA2V78JC3KMNaxhMCq?= =?us-ascii?Q?FuRAzL44Yxwt6B5VLnMiqDK1haC6cnR17E2T3u4/9cxTgQ69v5nDjJa3Zr7d?= =?us-ascii?Q?a8ldRkRfE70TdANXJeFlqwK4GpgYMuHqpm+RYFKz89a1tbXOgYjEZlWn1CWg?= =?us-ascii?Q?cRi2JZLm6GCqxsNKOjvmFJXh2wBTC6bQ9WezOyganaJWCofLaDv2Mz1X9X6U?= =?us-ascii?Q?OC+kDTJqeVVXZJlgU4B0750D6eYoL7kWEcKtrcIEoyFhVEg5032NCCX4Ke6h?= =?us-ascii?Q?kZzSTRdOyD5qVu5tjqBXWKks/NLWzIprQA9u8+XV16Gt3Tci+Px6oTRTOZHx?= =?us-ascii?Q?HA0QMr8JCEADkStstS1L1FKCy8Ne2nvfuImRlf921+hE7BXOpHI0gRr78yoS?= =?us-ascii?Q?GQ6YLcgjXMbdEH8=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:38:36.0678 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d5b90e81-a489-4507-5503-08dd501929c4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000989E6.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9194 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=92bddea79da424642f3c194619ccb02ff3a28898 Thanks. Xueming Li --- >From 92bddea79da424642f3c194619ccb02ff3a28898 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 Cc: Xueming Li [ 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 b27324c0b4..32f49a6613 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -150,6 +150,9 @@ nfp_net_start(struct rte_eth_dev *dev) ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP | NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP; + 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) return -EIO; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.724540359 +0800 +++ 0028-net-nfp-fix-multi-PF-control-flag.patch 2025-02-18 19:39:00.498244070 +0800 @@ -1 +1 @@ -From 02c056aaac1ba1bd16658eef19cb78457d556041 Mon Sep 17 00:00:00 2001 +From 92bddea79da424642f3c194619ccb02ff3a28898 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 02c056aaac1ba1bd16658eef19cb78457d556041 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 58a5b1d94e..ca808afdd9 100644 +index b27324c0b4..32f49a6613 100644 @@ -24,3 +26,3 @@ -@@ -472,6 +472,9 @@ nfp_net_start(struct rte_eth_dev *dev) - if ((cap_extend & NFP_NET_CFG_CTRL_FLOW_STEER) != 0) - ctrl_extend |= NFP_NET_CFG_CTRL_FLOW_STEER; +@@ -150,6 +150,9 @@ nfp_net_start(struct rte_eth_dev *dev) + ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP + | NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;