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 CE85E46C4D for ; Wed, 30 Jul 2025 09:13:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8CFD4025E; Wed, 30 Jul 2025 09:13:27 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2045.outbound.protection.outlook.com [40.107.95.45]) by mails.dpdk.org (Postfix) with ESMTP id 465374025E for ; Wed, 30 Jul 2025 09:13:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nJPVhxXAEzoKx0zsT+AYNaOQXeVLaoo5WTi8NqJb85t+nE13O4fcDlQ6mOcBO4ZO5czLasROaTMyo45pdggjl9aaas8YE4XiXsnCuCFmMu/BRy6D1xl7cM/TgRGVjrwwA/tGNEVMWMOc/BNOHOXmY6V5B/T6UGxwEa+ZExaQ53kS2aMr7JR4HDvv9VMxQ+HbpqLbiAHgDILv6+O4YiBa2K1K/4qfDI7YQI8VbDhC8eO36kCTiiLvv41/LU4YD8do+h4ltXa6erXeUZRYMZraPYqheB/T/x2nT1ZT8IBM0QAN3WDZAyY47MxeQCH86bkPLNZtjwkmC6GD+SHhIc2H+A== 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=VETwBHExpmZxMAjjlAIYNGdMjgwBLn7fCJI6HAeAAEE=; b=P6X8fNDuz6NRPsVFbsuSec5pNk57NLs5Db2o3CtdHEDaXFoIBUqKX/a+5+oPmx90x7IL85xuiGZV0f6ZVpfc5z3OPKq7m2GItRybmp0ppfr2B4pgYLz7dVio3Xu8gTP1yGYNsLhm4a0uCJwHpi3zgNaBnmxvJKAkFqOtiSN8zex9ZlKi+hEEVD3RKXglSGEGSJ9o25MsWV7Pz5yP2s9owp6xtb1EJyDzqkXcJDTl22Jc9AGccKFQPKoOGd90OUPD0Jv7DfQzljvNiewnLoKa0wSVQCRioWHrm/QfiN2DVsVu2f+5+o3eSCfcmze8ewPeuYazOp6L6RKrEo4tu4UeQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=trustnetic.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=VETwBHExpmZxMAjjlAIYNGdMjgwBLn7fCJI6HAeAAEE=; b=Lqoe6ekR88ypO/vl9uzY/zk0mWhKySLmuV5l8/eurEYHTiZP60g7EfKugFdpPn35NB3b8I9f5qh+u5+RmgeZjUYWGGYdS9ae7to1rIbrXzoHEeyIjaIQTSkPraCpKN6YP8Z40sN6fICfaY9S6hER4aYxWiNaN4FR0astvFhnHKfEuvCk+dVJ2adPdLUQzrAqeY3l8yDATeK5Nvbzny8dPq7KDPtJaOKIMlfUlwkSl7KEHV6eNJ6RUOCryVKaMzF/tQAzvInCkxqXWjOHpuH/seFHenCxHwWQBYtsnHtTkgNtnE1ZyO4X9/grWFbqXhrh7RTKeeXVt7iZzoG89itwkA== Received: from BY5PR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:1d0::25) by CH3PR12MB8235.namprd12.prod.outlook.com (2603:10b6:610:120::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Wed, 30 Jul 2025 07:13:24 +0000 Received: from SJ1PEPF00001CE1.namprd05.prod.outlook.com (2603:10b6:a03:1d0:cafe::b) by BY5PR04CA0015.outlook.office365.com (2603:10b6:a03:1d0::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 07:13:23 +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 SJ1PEPF00001CE1.mail.protection.outlook.com (10.167.242.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 07:13:23 +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.14; Wed, 30 Jul 2025 00:13:07 -0700 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.14; Wed, 30 Jul 2025 00:13:06 -0700 From: Xueming Li To: Jiawen Wu CC: Xueming Li , dpdk stable Subject: patch 'net/ngbe: fix MAC control frame forwarding' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:32 +0800 Message-ID: <20250730071045.136672-22-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730071045.136672-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730071045.136672-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: SJ1PEPF00001CE1:EE_|CH3PR12MB8235:EE_ X-MS-Office365-Filtering-Correlation-Id: e5d20207-13b7-4a0d-aa17-08ddcf38922e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pq6RVVOkng0QDtuKX50FgU35bPruNbk4D4NaI+bowLaCSMwlTLH5KRj8486V?= =?us-ascii?Q?330JCLAGSilHpD8vnYiwnsY2qRzQi1wuBUf3Tbmg88V/0jscy+SIvtohGarc?= =?us-ascii?Q?Cef3fuOlA6DKtBIamHiA6+MTsTeS1iwsnIcm35XKF4c3r/SnhsrjwR+N6eOH?= =?us-ascii?Q?QYkFGSZuTKH6kiH01aFcLo8K1zW3q20cVcgn9GF7xKo0hfJ7bxhxm3JboBze?= =?us-ascii?Q?EdtuiYElZeg7RZigBo9HkcTK0UWefRI4laCxm4A1NUxJsdp4TdFZxc20mXeK?= =?us-ascii?Q?cG+q8FokE0d9pxaw+JppgpJQ0ziKfkoBjFZHs0tDOO9iSoWzwntI6pz3MNZz?= =?us-ascii?Q?wpOhdbXXLdCteJ2blMkQJIJ++qETD+YWnApHm8ediovdWOg4McYYUQTNQVhd?= =?us-ascii?Q?L961OChD71oMnJn8IrW/Bym2V1mijy6npZlBdWxidDuTj6eheMu0753C8u3j?= =?us-ascii?Q?ggETQ4+E5WnKKDeBX3Mtup22nLR9udC/QTjF9qPpPFewU+RLrebrZwZvNppl?= =?us-ascii?Q?t9SAT45xPR8uvzKBVhup5dID4vViN5sIR0ld7y1EuUDSbNhELNi4vIyOcVhq?= =?us-ascii?Q?JeRG+sp6JGbtxGj1Vd0pymh5jvhzCKsTIHTnO6OaRUiDhL8g7WXyAaApBhVv?= =?us-ascii?Q?2AcqH2jC+nOXYDF1ejeaExmHkUSg4k8EVkk5JX1spz40ozjmNHliycbS4Qsb?= =?us-ascii?Q?fcq2qRCVXqMgkj1rFkDO2MnStza9ymZ9/czya4+bCR8neOUQRmFp7r+57uSt?= =?us-ascii?Q?85wH8J6JK/S8FgGQ4L0uKpHi4OEmlTzbB08h08ByuFDBnNjB5JifGWtbtVUt?= =?us-ascii?Q?aIULvDFfAPMG0BKE9ySPFSmZ54fmVAbvRYfpnBfvc6G1CVpmUyegoXINOgGw?= =?us-ascii?Q?IJpegyEZVovB+cNSyt4VtoXj573DSz90vhoG8frQJ/bR7cLuHbOwsnX6ci42?= =?us-ascii?Q?R6ADHc1OyQC4BrUqPisV9PU7BZUIAIPs7aIBtM8caQZIXZ4kHzR54qpcx0s1?= =?us-ascii?Q?slOInsRMvgEI+zcRhjEA51ywWpc+I9O+WOIbmSWs6COaXflXcDtGMQeRxXRP?= =?us-ascii?Q?Ermbm5wnQBu9qxD7wbWOit35eY4Abuu+nhK5KAYM965XMlp+BZjBkO0rDeE4?= =?us-ascii?Q?l4UD/YpxCK0Ut4DgD9uyZJAYwqw5w0RAlv8IBhp4+98LB0t2OcxgrHucsi0Q?= =?us-ascii?Q?3oL8WwoNKsU/7GcIiNbbnQP4Wu4FTPaf3z8Xe91U2eoVlxxsTAl0yzSV6gdF?= =?us-ascii?Q?AOdSpoNG28FauU3/VLhAUzq27ctiiP2Bs7A89/nkR1wjtJfkf5106UpLiJ7f?= =?us-ascii?Q?hodyeBWs5r3A4x1Im+iMCcChBNBMznwuBHJkIhThqVcvgdLqCjgUEskdluwR?= =?us-ascii?Q?lcqtcbFJpAStOn9OZWRL6e9+6ebY+5ygeWTQfEfD7G/JKuPDQ2rvuoYCdYrl?= =?us-ascii?Q?Z1u8JySrgz95VG+uVpkehBGeasLOcDbn+EwcELNKL8qDRqnhDNf9wnl3Psgs?= =?us-ascii?Q?1zbsAXWOEssjlL0tJTld8JSp7tbaSz+T+A5G?= 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)(1800799024)(82310400026)(376014)(36860700013)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:13:23.3093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5d20207-13b7-4a0d-aa17-08ddcf38922e 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: SJ1PEPF00001CE1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8235 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/10/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://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=b2a56e02dd62a594b2be1054f50d8fdb08435713 Thanks. Xueming Li --- >From b2a56e02dd62a594b2be1054f50d8fdb08435713 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:54 +0800 Subject: [PATCH] net/ngbe: fix MAC control frame forwarding Cc: Xueming Li [ upstream commit 31ae872822cdc89cd00926c3e162781ef927ca24 ] Test failure on the case "test_pause_fwd_port_stop_start", which expect MAC control frame forwarding setting still working after port stop/start. Fix the bug to pass the test case. Fixes: f40e9f0e2278 ("net/ngbe: support flow control") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_hw.c | 9 +++++++++ drivers/net/ngbe/base/ngbe_type.h | 1 + drivers/net/ngbe/ngbe_ethdev.c | 1 + 3 files changed, 11 insertions(+) diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c index 68b0a8b8ab..daed52f648 100644 --- a/drivers/net/ngbe/base/ngbe_hw.c +++ b/drivers/net/ngbe/base/ngbe_hw.c @@ -812,6 +812,15 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw) goto out; } + /* + * Reconfig mac ctrl frame fwd rule to make sure it still + * working after port stop/start. + */ + wr32m(hw, NGBE_MACRXFLT, NGBE_MACRXFLT_CTL_MASK, + (hw->fc.mac_ctrl_frame_fwd ? + NGBE_MACRXFLT_CTL_NOPS : NGBE_MACRXFLT_CTL_DROP)); + ngbe_flush(hw); + err = hw->phy.set_pause_adv(hw, reg_cu); out: diff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h index 8a7d2cd331..82ce3f5440 100644 --- a/drivers/net/ngbe/base/ngbe_type.h +++ b/drivers/net/ngbe/base/ngbe_type.h @@ -108,6 +108,7 @@ struct ngbe_fc_info { u32 high_water; /* Flow Ctrl High-water */ u32 low_water; /* Flow Ctrl Low-water */ u16 pause_time; /* Flow Control Pause timer */ + u8 mac_ctrl_frame_fwd; /* Forward MAC control frames */ bool send_xon; /* Flow control send XON */ bool strict_ieee; /* Strict IEEE mode */ bool disable_fc_autoneg; /* Do not autonegotiate FC */ diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index aca6c2aaa1..ae33bb5871 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -2395,6 +2395,7 @@ ngbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) hw->fc.low_water = fc_conf->low_water; hw->fc.send_xon = fc_conf->send_xon; hw->fc.disable_fc_autoneg = !fc_conf->autoneg; + hw->fc.mac_ctrl_frame_fwd = fc_conf->mac_ctrl_frame_fwd; err = hw->mac.fc_enable(hw); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:13.433251433 +0800 +++ 0021-net-ngbe-fix-MAC-control-frame-forwarding.patch 2025-07-30 15:02:12.819665505 +0800 @@ -1 +1 @@ -From 31ae872822cdc89cd00926c3e162781ef927ca24 Mon Sep 17 00:00:00 2001 +From b2a56e02dd62a594b2be1054f50d8fdb08435713 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 31ae872822cdc89cd00926c3e162781ef927ca24 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 6688ae6a31..bf09f8a817 100644 +index 68b0a8b8ab..daed52f648 100644 @@ -24 +26 @@ -@@ -865,6 +865,15 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw) +@@ -812,6 +812,15 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw) @@ -41 +43 @@ -index 7a3b52ffd4..fc571c7457 100644 +index 8a7d2cd331..82ce3f5440 100644 @@ -44 +46 @@ -@@ -112,6 +112,7 @@ struct ngbe_fc_info { +@@ -108,6 +108,7 @@ struct ngbe_fc_info { @@ -53 +55 @@ -index 08e87471f6..a8f847de8d 100644 +index aca6c2aaa1..ae33bb5871 100644 @@ -56 +58 @@ -@@ -2420,6 +2420,7 @@ ngbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) +@@ -2395,6 +2395,7 @@ ngbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)