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 7464E45CE3 for ; Mon, 11 Nov 2024 07:39:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69C704067A; Mon, 11 Nov 2024 07:39:21 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2059.outbound.protection.outlook.com [40.107.236.59]) by mails.dpdk.org (Postfix) with ESMTP id ACAAB4067A for ; Mon, 11 Nov 2024 07:39:20 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Sgglbh53k0TgzH7C41E9Q2HaU4HHw7yNhW6geh5B9otKqpMWCh6iEFQZlvbbkZx6xup9xnB3eKNZyPu2xWG+rJ2IYa4gwJNQj/bJNQSM05zJpckWOKySVKM2I+kvdVe+A6oj+XwopRqx08bbJBOyh7xKhWkSA1lRip3zB9+t/z3JK8HJ/eykKnanndtVWSy/YzNJRxyGFCJmlSScpKlmglq2IhC5iFQpW8Hj0abowz0lezytQ4VCI8JyRdvfyDWhufBHeVg4fIDln7PM+A//9zt6U+IlZdojWufrtRkbXKQM0HnfoIWmCSbyZ9uZbI2JeIaf3Q2l2R9Qz9syCoATog== 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=/csyLLlzB4+KjqHov7JRjUyIVXED6rCiPbkyHPbOYl8=; b=t0UVP/2Sxs4abKy12IOWoktEGJnW10LgS1U63xaQdwdEfkIQt3/wcNlFa8X7XoEkp1avVFB503ZvEU4JS4xv0+SNF/MePV8F7ru97uELD9J/y3alWTcGWwHSSD+s9RX+xQIdzLfiGEAw4CFEYcTK1OnX4N3Pu88RqhRgTWbuWaHUUDrQGuHIIvzlySiPBgQ+skrIcs+6LO6W7X/aPAZGhHjBAcMiWunoUES97mepEJB+UsfZqjeRCCKx5lz+++NgR26LhyExi4pvjoRKAEVaAzOtOReSEGwxGn5sWROvo3ksvVDSHhqYfTbCYOwJ5VBlR/EOsENm6MZNFaAvD7hNQg== 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=/csyLLlzB4+KjqHov7JRjUyIVXED6rCiPbkyHPbOYl8=; b=q8GGlMwVy1N7mC02FkE7bqtzfiNE2uHP9+ydjG0qxJB56tDg1Vc7myH8AI1M+LjP3DcfZOXjLNnsz3e+otv/HH80P3PJdYkB3NTF2/tZ5CjTICVRuaWrlz7LR+fa7uzWPnxP50pjNpWnA6YALXGuz0RYDP8+XCaGGqAAXOSajGJrwtiqxzEs0Vs81kBFKFOzlhAgcJEeOFqrW5Fd5Plp2O49OraOnVfjsSxvewrlxAxbWtXpWwzJVdA6wteMh2tJLsxWWfxTn4NOh2Lt33C+idX8BY4ohm9qA58kmwnKN5DOX5FzJ0irDqgf/Sg4WagLChEVNZ1ytyKFHWcol2fgIw== Received: from SN4PR0501CA0107.namprd05.prod.outlook.com (2603:10b6:803:42::24) by SJ2PR12MB9191.namprd12.prod.outlook.com (2603:10b6:a03:55a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.26; Mon, 11 Nov 2024 06:39:17 +0000 Received: from SN1PEPF0002636C.namprd02.prod.outlook.com (2603:10b6:803:42:cafe::1) by SN4PR0501CA0107.outlook.office365.com (2603:10b6:803:42::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.14 via Frontend Transport; Mon, 11 Nov 2024 06:39:17 +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 SN1PEPF0002636C.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:39:17 +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; Sun, 10 Nov 2024 22:39:03 -0800 Received: from nvidia.com (10.126.231.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.4; Sun, 10 Nov 2024 22:39:00 -0800 From: Xueming Li To: Chaoyong He CC: , Long Wu , Peng Zhang , Stephen Hemminger , dpdk stable Subject: patch 'net/nfp: fix pause frame setting check' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:25 +0800 Message-ID: <20241111062847.216344-100-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636C:EE_|SJ2PR12MB9191:EE_ X-MS-Office365-Filtering-Correlation-Id: 1075a8e3-24f7-42d5-bd71-08dd021b90de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0ntZkO275U90WhqT6dLTBXk8B1c1CInLmzF7RKXT9vmNMMNqN5eeGWEdEWjB?= =?us-ascii?Q?8cfzUDh49l7+XfxsS1sepODs1/fVHoOud2UaqkZgbyypei7WS+rYGYGqAUeU?= =?us-ascii?Q?ROU8vRc34ERGr5Gr5JbBpKJUeI9ybyYzFTPR8G69/Cxh1q1HjDWDow2p0IWA?= =?us-ascii?Q?MhbHUxnZk3MBM9OEu9WwugNAkKglN6GamMJd/3jtcc07oAjXkUWVPxdhw30M?= =?us-ascii?Q?SlTfrIxijTbbW8qgFHn4vjZsqrAXzMW+eGthuuIOiu1IoIlHU1BXBfmsIVGa?= =?us-ascii?Q?iBixPZ/eitAKBstfL+632Ev2guzeEZtCDL7mU0xNd/RzLo+zgtN8qJC6s9CS?= =?us-ascii?Q?K2uFMM5XVwIResuZv+M44IAQKWy4ah1DTv+kWIje4khJuoOjunXR/1tLYhCB?= =?us-ascii?Q?NtEdauT9W3MwwyATw3QJcQHUKRzOe2FodDjc5ziMLdwKqi0OJgK+zWkF30w8?= =?us-ascii?Q?UK/9EoOSxvSVp56Pm3INePv1+WkCYe0q/fIkPYcCmN2z0d77no1zmdOLi3p/?= =?us-ascii?Q?ati/R5x+ce+bDmJ3DO9KL/LRa5Q68jj2JDh3DE0U/+r3OZOETvXNMblMYMnB?= =?us-ascii?Q?PikQbD21N7C8aH2MeMrXuKuNmMhqOF3CRuITBNczTxDOy7PSiDoO+lZCVbxr?= =?us-ascii?Q?R0ccDAoq+6+DsSa3mQR+AQW2E3jZ0FOatYEOp+YH2Mbi37ivm2JxCtKnF7TW?= =?us-ascii?Q?WHS52ozmLPPPk65Akfmn2MygfvvcH+5y0ecICdREzmfu8XIhA+2ZKCMd/1h5?= =?us-ascii?Q?qpsjrhva2mNdAvwCKk7rAM2er7nbEgbynl7aAA4QGLDWYM7BuF8GI0K/CDCg?= =?us-ascii?Q?qdXhhE2c0RAOqZun15B3jc+V3FqPfWmAhd5QS+c+0YBV7DfqKsOiSBMqhLgx?= =?us-ascii?Q?yXEpP4IIMUCpOH2haVu1PRqFDOi9ZX1j6ZJ5ckIYZ23D3hF8ekpsc/COEkAs?= =?us-ascii?Q?yxLfyFi/mTktfuJ8q3MYc9xyc4A5xQi3mNVmy8gy34qjLIKmXhOQWw4PQqxU?= =?us-ascii?Q?oOimwcc2E9uH+H7+u5c2Sg3+a0ZbXg+AKApOxvBjLoroyhZ3bokpeoqLM14N?= =?us-ascii?Q?QzjbASyKlqMfz6Xv3GXIQYMQInyFx1vUpB3FaBPP7ZunQGp8sItxN1he5CqT?= =?us-ascii?Q?sNMOTHEg3ajKhpHhtKa8PNNwJrVMNfP5BQXzme6YJr5SkJWmUjD+dhPLnib8?= =?us-ascii?Q?Hdcq44wo1Q8wBGq0vix5BiAoXBtMetDvWwZC+/jk3cOrQtZjSlm/ABuJSA9Z?= =?us-ascii?Q?hCg201mvR5IqmzqMOrLXqjsMQlfotkrnZ0PJhcMeJMa4qAbYQixYKoeP5JQu?= =?us-ascii?Q?rLdkL3TnaIKbtlg9sz0d7iwatJValq5UYm7e1Fa6cZK22uvhtohy/vbJnIbh?= =?us-ascii?Q?SiJdOv6jvJZsd+MitvtKtPtfVDSUftiqeRp/aJQ7bIj8F0uHKQ=3D=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)(82310400026)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:39:17.3273 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1075a8e3-24f7-42d5-bd71-08dd021b90de 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: SN1PEPF0002636C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB9191 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.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 11/30/24. 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://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=bffff80bf5f8d18afac9d8bb62cd32aa4f5d14b5 Thanks. Xueming Li --- >From bffff80bf5f8d18afac9d8bb62cd32aa4f5d14b5 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Sat, 12 Oct 2024 10:41:04 +0800 Subject: [PATCH] net/nfp: fix pause frame setting check Cc: Xueming Li [ upstream commit 4bb6de512fbc361e16d5a7a38b704735c831540d ] The return value of 'nfp_eth_config_commit_end()' is three ways, the original logic considered it as two ways wrongly. Fixes: 68aa35373a94 ("net/nfp: support setting pause frame switch mode") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang Acked-by: Stephen Hemminger --- drivers/net/nfp/nfp_net_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 08cb5f7d3b..134a9b807e 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -2218,7 +2218,7 @@ nfp_net_pause_frame_set(struct nfp_net_hw *net_hw, } err = nfp_eth_config_commit_end(nsp); - if (err != 0) { + if (err < 0) { PMD_DRV_LOG(ERR, "Failed to configure pause frame."); return err; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:09.591013149 +0800 +++ 0099-net-nfp-fix-pause-frame-setting-check.patch 2024-11-11 14:23:05.262192837 +0800 @@ -1 +1 @@ -From 4bb6de512fbc361e16d5a7a38b704735c831540d Mon Sep 17 00:00:00 2001 +From bffff80bf5f8d18afac9d8bb62cd32aa4f5d14b5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4bb6de512fbc361e16d5a7a38b704735c831540d ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 80d60515d8..5c3a9a7ae7 100644 +index 08cb5f7d3b..134a9b807e 100644 @@ -24 +26 @@ -@@ -2520,7 +2520,7 @@ nfp_net_pause_frame_set(struct nfp_net_hw_priv *hw_priv, +@@ -2218,7 +2218,7 @@ nfp_net_pause_frame_set(struct nfp_net_hw *net_hw,