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 3566A45E41 for ; Sat, 7 Dec 2024 09:04:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B2AC40E5E; Sat, 7 Dec 2024 09:04:39 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) by mails.dpdk.org (Postfix) with ESMTP id 66D6D40DD7 for ; Sat, 7 Dec 2024 09:04:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zLE1lmGGjtnbBmRuFh4dAAZkIu/OUvX8L9xmbF2Yv9y3NVGdWYgYwjNUFF90pIRidsFwkqThPPwRPD29SlAdUbfkDCgETsVc/9xNdowFDUqa0E8OPCJ5Y7lpyHefaGDFDwNuZGjR9vPtRdni6yvP7TwHKehP1bnuVB8ktxH31PnrstZM0aGL0uoGpG8pp2QYrZSoPEovTvjkAU6w9hHI/7isiFz75SB8PkwpPda1SIH3RptPZcfPJxG3TS1E/o2H+W9lhmd9s8b6kdq7XkMck33OtAlNxPrRSIPYIln7kAcWTg6fCcrDIA3JMJ+CZJS3/sZnfyYpTI1/0OxuFlDBcA== 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=WUXMzaQywxWaNfwyt8h2GxbNMEJuctB3ZLQftRDqfjQ=; b=rFiGBIr5WyixHRFZ1fz1TBnfS8uLGxel76jTqAxvH86C1364FfvvyGIqF4UfMHGqHLXymHJ8IFhsa6d946nS/yG1m4kTiJJpwWHY8Eo5QcO3dDbMWLAeKiqc3gliY98XQ+Yo/S80rARxwokF9KIMtqN/2SXtAGjiOEMJXwHTmHkWd+4+7o01BGwEBPIO5MqdMhqFq3OF/waM+/ze1ThJM6fBSxLjIpbi/KZYRSu+mrRRB69yb0kT58CwTQRA6MbLs4DxQzGSv7nv/SkKLnoNkMj3GKUzArBHBc6Ixi3VqCkk4H4QceT/qsByZgrDDpIqXybHNfcwBpUvWoPEo8jiTA== 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=WUXMzaQywxWaNfwyt8h2GxbNMEJuctB3ZLQftRDqfjQ=; b=HWclWeJA2jXf8JRDeyvIH0ZOTfaIgYOTlrnIogSRE9Li/qQn8T6n5ZFvg/WMho7mHNvY2pygJSgnTEzCZkAmRGsG9nWxdfD4aX0BHLlib+TmJiTGfk3gIpjhnIvD1CjCD2ICuWEST90MoixEounkpcjElbw2IuR2UmuZ9E9UwFqiT/FL/WzYaypFF2EBsrlpzGioJqifzgf10D/j+wqfPgDlHIDMTyASVkeqCc/2qu4CkAIVM3eyElTWVcZOV3y1Xv3NROh54OrWVJjk76PsP+UyAP0K9+uVK8EhCokVGjmYZlV2VyliaNPTUGOMFZ0iXc6qVp/W5hcqi0ZmT1ozww== Received: from SJ0PR05CA0200.namprd05.prod.outlook.com (2603:10b6:a03:330::25) by SN7PR12MB8132.namprd12.prod.outlook.com (2603:10b6:806:321::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.18; Sat, 7 Dec 2024 08:04:33 +0000 Received: from SJ1PEPF00001CDC.namprd05.prod.outlook.com (2603:10b6:a03:330:cafe::bd) by SJ0PR05CA0200.outlook.office365.com (2603:10b6:a03:330::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8251.9 via Frontend Transport; Sat, 7 Dec 2024 08:04:33 +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 SJ1PEPF00001CDC.mail.protection.outlook.com (10.167.242.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:04:33 +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; Sat, 7 Dec 2024 00:04:29 -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; Sat, 7 Dec 2024 00:04:28 -0800 From: Xueming Li To: Jiawen Wu CC: Xueming Li , dpdk stable Subject: patch 'net/ngbe: reconfigure more MAC Rx registers' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:54 +0800 Message-ID: <20241207080055.488538-37-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: 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: SJ1PEPF00001CDC:EE_|SN7PR12MB8132:EE_ X-MS-Office365-Filtering-Correlation-Id: bee4fd8b-007e-4b65-22a0-08dd1695c8f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CZ8iDRI3UemAxZyz6JziDXkh+sYrqRscyljXFq9hQJ8kVSM+a2c9LsvmknsF?= =?us-ascii?Q?PL2HtGllToOjK632rLPYha5I0G9yNc6LcTZ4pJ2oMx+ARx1yHD+Vx/pqT5o4?= =?us-ascii?Q?sMqW+3JzT5+rrSFSxxj58nTfRsAaJ+rj8s9EbfRf3+xB826td0EAGwOj/p26?= =?us-ascii?Q?GEfhH3dMO94t7lgp5r7fPI0QcSoyjhbe0Upyb6nEoxJs2mPJzvItD2GoHjHG?= =?us-ascii?Q?SCDCKKDFKIatE/oN1zQJyh77T/4cZqMLg0shncHGPOuLKlVkNfNjzi/Xp8v3?= =?us-ascii?Q?uOxIxgMN86xWJcpCnZqtJSlNduW+DKNSLErGgB59jab/Rdw+JY//dj/uN1oX?= =?us-ascii?Q?XvqYYLVU5lmj6SYN8goW/nrfoNKsfUUo22X27cqPkVlGNlWbYy2JU4Or6AbK?= =?us-ascii?Q?zk6vA7pvHBDj8KT2x5ehMRk0gT90yWiJnUBQUnYLJ0XReY7sXn2439+4uG/0?= =?us-ascii?Q?4a3qIsib3BCQufGPKBqcgr4P+tNQGd/NoWJm/59vfjCAKQ4JkaqR5gX6DMMp?= =?us-ascii?Q?37umxxNMJbPireX4iOWUIzjadqRat6lRYii6IOzi2yo3kwo3832hio+rrhs1?= =?us-ascii?Q?7a64unJTGitFLLHVgqpVlERDn/xiOt5PHXbseaAxVJKd5ZMXfC9UUsuI/nLJ?= =?us-ascii?Q?453SykN3BZNnosVb2fOD+8Vn6/4qxKxuBeaHPz8fDPbnWJJb2h7lORV89IF4?= =?us-ascii?Q?k4RYujCYUda9e6BratOwfOR0/+9QDFHK5Nfjk9CqD/J/rCOYkvw3CzbsM8NJ?= =?us-ascii?Q?NeDOCKdRlhNFxH/0cBEMirxpXQS9WjvBMVNJTslkE12Dflys/RLBX+5P9xPW?= =?us-ascii?Q?DdCS8KwQRnskznR6gtSp9eBrYAqfga7kLIgT+IMgcVycXcwSFC0lbdIoeVKb?= =?us-ascii?Q?/6J748X+ddCXYpMVRfrLXACj4K/glTuH3+uWUWVupXzlsow0GUYCoExpg7bC?= =?us-ascii?Q?+g4nUhakSD83gKL4nsyQPtvh9VgROX2UN+7Om6QkbAbW0a4tdnjNWDGN78nk?= =?us-ascii?Q?ei4/mqkGS8mI1inIe3bKx/XvaAr4OkTkCnfiKndemOw9fssRXOkvzdgypZnQ?= =?us-ascii?Q?9CzXCrIV12yWyxvMh4DWTv5c+8qT+G84oPCN5kwa7BEJAWxBnZUfJC9eFvWa?= =?us-ascii?Q?RNIBdJvio1PQKDiYJy8Sw6QMV8Et0tuon9Fgdlf/6+F/miC5nC2e4z4j/rJO?= =?us-ascii?Q?n9qC2g+t8Vpvo6QIwscOsdc/HZtEw6Lg867mgvJ+fFXdivRKlahgH2NdzOqd?= =?us-ascii?Q?rDh66GQL5tMRX089MUgOPogAg/6O9gMmEjNMndrwa/G0Ea/JOFPDqebG6k/L?= =?us-ascii?Q?2CHuuaaQjHTL6kpYMuMV/iokJ5WKVzowgsiPu4dsnnODBjqN4YK6cEWBKNYQ?= =?us-ascii?Q?dK3bYxrsqPLG5wWzqKkrA2/MLezvi/hCUpAF2cAffH2bXCq/5XlInYcvPd/M?= =?us-ascii?Q?StZ1vLhRLZ268dLcfgP/R9fdk+0m74xX?= 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)(376014)(36860700013)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:04:33.2740 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bee4fd8b-007e-4b65-22a0-08dd1695c8f6 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: SJ1PEPF00001CDC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8132 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 12/10/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=5247bd2c4fb7430fb9a80adcd1f6a4fc42331190 Thanks. Xueming Li --- >From 5247bd2c4fb7430fb9a80adcd1f6a4fc42331190 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 4 Nov 2024 10:30:05 +0800 Subject: [PATCH] net/ngbe: reconfigure more MAC Rx registers Cc: Xueming Li [ upstream commit b8d52e1084a17c7ef83624f3bbd11a090e7b2267 ] When link status changes, there is a probability that no more packets can be received on the port, due to hardware defects. These MAC Rx registers should be reconfigured to fix this problem. Fixes: b9246b8fa280 ("net/ngbe: support link update") Fixes: a7c5f95ed9c2 ("net/ngbe: reconfigure MAC Rx when link update") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_regs.h | 2 ++ drivers/net/ngbe/ngbe_ethdev.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/net/ngbe/base/ngbe_regs.h b/drivers/net/ngbe/base/ngbe_regs.h index c0e79a2ba7..0d820f4079 100644 --- a/drivers/net/ngbe/base/ngbe_regs.h +++ b/drivers/net/ngbe/base/ngbe_regs.h @@ -712,6 +712,8 @@ enum ngbe_5tuple_protocol { #define NGBE_MACRXFLT_CTL_PASS LS(3, 6, 0x3) #define NGBE_MACRXFLT_RXALL MS(31, 0x1) +#define NGBE_MAC_WDG_TIMEOUT 0x01100C + /****************************************************************************** * Statistic Registers ******************************************************************************/ diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 48b58284a6..e3772a7396 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -1916,6 +1916,7 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, bool link_up; int err; int wait = 1; + u32 reg; memset(&link, 0, sizeof(link)); link.link_status = RTE_ETH_LINK_DOWN; @@ -1973,8 +1974,13 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, wr32m(hw, NGBE_MACTXCFG, NGBE_MACTXCFG_SPEED_MASK, NGBE_MACTXCFG_SPEED_1G | NGBE_MACTXCFG_TE); } + /* Re configure MAC RX */ + reg = rd32(hw, NGBE_MACRXCFG); + wr32(hw, NGBE_MACRXCFG, reg); wr32m(hw, NGBE_MACRXFLT, NGBE_MACRXFLT_PROMISC, NGBE_MACRXFLT_PROMISC); + reg = rd32(hw, NGBE_MAC_WDG_TIMEOUT); + wr32(hw, NGBE_MAC_WDG_TIMEOUT, reg); } return rte_eth_linkstatus_set(dev, &link); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:45.310797812 +0800 +++ 0036-net-ngbe-reconfigure-more-MAC-Rx-registers.patch 2024-12-06 23:26:43.933044828 +0800 @@ -1 +1 @@ -From b8d52e1084a17c7ef83624f3bbd11a090e7b2267 Mon Sep 17 00:00:00 2001 +From 5247bd2c4fb7430fb9a80adcd1f6a4fc42331190 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b8d52e1084a17c7ef83624f3bbd11a090e7b2267 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 8a6776b0e6..b1295280a7 100644 +index c0e79a2ba7..0d820f4079 100644 @@ -34 +36 @@ -index 238533f2b8..c372fd928c 100644 +index 48b58284a6..e3772a7396 100644 @@ -37 +39 @@ -@@ -1941,6 +1941,7 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, +@@ -1916,6 +1916,7 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, @@ -45 +47 @@ -@@ -1998,8 +1999,13 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, +@@ -1973,8 +1974,13 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev,