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 539E1457A1 for ; Mon, 12 Aug 2024 14:58:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DB17402C3; Mon, 12 Aug 2024 14:58:06 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2072.outbound.protection.outlook.com [40.107.96.72]) by mails.dpdk.org (Postfix) with ESMTP id E41DB4029C for ; Mon, 12 Aug 2024 14:58:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UbOJP8oLGnFdN9463dn51NywCpsT0yh3I+YKInoSixWttxUo6J6RJ1JsyhLxNtbDgrGwjV9V5GbJcaxtHAaqNwRIG3102Ozloi7FfNkR4/FcLTnf5mjDgyqwrujhlfNOfPjxza7IfwwOj8CDfS2psklaCXQhVV1qgxVNkTgsu9VW2jTYPqegvNv2ZASft6VmG/YLpgDHqYE5ynjgo3VV9dITy3dmBr9TXUfadQy4Rkb4KIgQxV7tmnl4iyxDHfQJF+XYc06E0FKp4Y9771eiX/7oEHU8hxT58AWTUk5/nKMWiFKDBm/ddGCrDPrc+jHAPFI9Td9e6kzjDIQLNQAw+Q== 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=CmIZa8CHkSW5ZKVeV5fhP6jCR4ygaJEv/gCjinRDdNE=; b=U/uDk7hs4b4eyAwJCoiM5kD/O7dljnXQRAAm01rm5Vu5b4PSW7AFbKIVf5jlwQt8aswA47Ugi4AhqEHviRC3ZL4nvwnHZEWPlcWYyp9obxc0+3OM6/pBwNsVqQg56W6g+2ZHR30ceMfqdivX67iUWwqiCacxSo34gqjxuy+fWI3SMwovY7HNmH0X5CmkN+tUTklV5YOYEQVLK2TgFYXZuH6ZsMtshak8jUNePLvaPQQGUDmerwoLj+tktToHE505/WZC6Uszmiq7nwG8xyV/WThQOqtOExhas1Pb94hAcgTB+EXbmeq7K2O4CNORectFeIZVBs5bnZNnA5HVzMx+8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=CmIZa8CHkSW5ZKVeV5fhP6jCR4ygaJEv/gCjinRDdNE=; b=VJWBo9oxAGb1ziRe2UUHczKBvaIVSRaPMHI7EYFHI7fNwJ9gw8PvU1U57i16tRpCL3ZXw+PbRC80XwY3mIzM5rs9Pbs6kq62OlPvkYKnG8Phwwnq6vSiF6cJypPOihVLc16/TqYOfbY7+9fy5gcN6zYToQ4xWaMpew3eGphwKaACuEyBLHv8ybmhSylM3nboS9ghRuDZOOLdz8zCq9BaewqFKNCRxsRwo+KDsykYLDxPL/RYJXuUEwBnHITSaSp3uRuTpaZbJhDX4ZgatbEdRQRz58Cn+kiP/aldGBWlTic4AXP+GVYWeoO0dLuzrJsZ9anXKTMl7NTNqBl1fgJ+vQ== Received: from MN2PR20CA0028.namprd20.prod.outlook.com (2603:10b6:208:e8::41) by SJ1PR12MB6145.namprd12.prod.outlook.com (2603:10b6:a03:45c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:58:00 +0000 Received: from BL02EPF0001A0FA.namprd03.prod.outlook.com (2603:10b6:208:e8:cafe::a3) by MN2PR20CA0028.outlook.office365.com (2603:10b6:208:e8::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:58:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A0FA.mail.protection.outlook.com (10.167.242.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:57:59 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:57:41 -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.4; Mon, 12 Aug 2024 05:57:39 -0700 From: Xueming Li To: Jiawen Wu CC: , dpdk stable Subject: patch 'net/txgbe: reconfigure more MAC Rx registers' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:11 +0800 Message-ID: <20240812125035.389667-75-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: BL02EPF0001A0FA:EE_|SJ1PR12MB6145:EE_ X-MS-Office365-Filtering-Correlation-Id: c3c4cdd8-6f5f-4429-a7a9-08dcbace64f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?q0ufRsO7MASmmWejbNhgh29QiBjuyGPRU1RQ4izB3uviK8+nYs4XyFZgg7FK?= =?us-ascii?Q?k92R7Mf64ezKeAGBZgJG6ZmKhNqiTaUp98yRp9/riLH6klu6cvwdpo1JsNiD?= =?us-ascii?Q?IvLu8cZOAyRy1gkxpJB/r4bW4qQSVD4gQcQZC6q5C4kFjoAfGETy1qAhwcz4?= =?us-ascii?Q?TCnw3rrINcU0Dlp/9DekMb7sY9BsyfFBm0qRMESDNK6cJbtEXWDOG1aE6vwj?= =?us-ascii?Q?2auHCUxS/cZBSi0B2JdA4haXkL4+BJAhR7y2oQM+9Cml6Y2Otz26F8/SIo6P?= =?us-ascii?Q?YW8s8LhSE45Uh0/HY9dKedbcIwIR4uhoocqdgn+3ttWsoMav5I3plgv07s6n?= =?us-ascii?Q?xv8dvYoBBuqt4k16NawS5VSEluSAJSStsDCmSVwCciXaRiSX6qMZJPimYZAF?= =?us-ascii?Q?XKMakYDEfov0YxOrCGDbGqhe8SHk5+YC7hriq7Ph22TyHjINqNDEvsk4lymL?= =?us-ascii?Q?i5j6lhGTOqCU0NpA4bexk24nfqck32OA0JcWBSnAPtU65zGGFew591r4IaCJ?= =?us-ascii?Q?emogxahvN39gcPDkj8AGRXKMMmsorU+hjCbkeJLKIRWOWhOjTzUS7TkIHIT2?= =?us-ascii?Q?kasTGj6SvtGXKJujSNwb4U4hF868grxnyJR7yQeE6wa6xCA6+KdBeOZy6nT2?= =?us-ascii?Q?yFIdsCagvh/3O1zGyEgjwO2k2AHW9UCCh5Agk45dMzJx1fq6yexUcKHAOJHs?= =?us-ascii?Q?Y7NZUfrUVXMD0UtrAbjkJ4nODtqS6DETvLFq8LHpA1hDry/lpO+4p3L8lZ7h?= =?us-ascii?Q?z6aTX2jSMB3An41FrmtOd6sxjumjuI90bcEHrn0YHFLrjReeOWgs/lDDiDvp?= =?us-ascii?Q?O9p6EgqQSYI7ycCjixl9dcb7Cs441Z4/Aq1PMoXDQsVL9pRi8MCdYij0QVce?= =?us-ascii?Q?bHl1J4voeTuUfZdLFsTm40WMufnd+J0UdcDt1MmXbctX5RrsTc2KOCKGj9Px?= =?us-ascii?Q?KZB18uCc5fR2DWM4CJvrrd83LNG2lzVQWjIw0CrCuLRkwpeapddu/VjfelEy?= =?us-ascii?Q?xpueqUIK6dhF4+KCV0Zbdjc8TVDp03caYYfeNGSPhKzh28cFUT7Yp6oWMCIc?= =?us-ascii?Q?T0kh4HJrjckbv3R+kMxRX2oNuvDQ+znwy8d2A/Nv6sn8tygw9nhQz3xa66q8?= =?us-ascii?Q?l9hz7x8EthYJnT/8D/EXD5RWx9iIToa8rTwnO/I6jhAJW8PWWvYHtihBdjgw?= =?us-ascii?Q?IHAjgSVFgTytihwK3YcFIWjAf7az4N3ozcz+PaFxsAxosDVnJelMTPf5fvcI?= =?us-ascii?Q?mIlmcXuOA17H/qkQfXBPNc0v7eafi7EdgzuosDbwA7dz58O7GjuzDF/pJzM+?= =?us-ascii?Q?4wpYTBa8fdrV7FeZS5s/90rxhMJ9VshK+avAyS5YYLWCiWu63DpbDL1e/HmA?= =?us-ascii?Q?F5+pUzN+jinIB7Vi2rAboiAt02LvvWIjC6qhZuJLql/2NTErpLb9d6L10sl7?= =?us-ascii?Q?DTrsXQTkmwTZqmHXynGD+40LSYE00Hj+?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:57:59.7521 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c3c4cdd8-6f5f-4429-a7a9-08dcbace64f4 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6145 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.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 08/14/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=ea62ead19d19d609512349b7650c943a062eb3b7 Thanks. Xueming Li --- >From ea62ead19d19d609512349b7650c943a062eb3b7 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:36 +0800 Subject: [PATCH] net/txgbe: reconfigure more MAC Rx registers Cc: Xueming Li [ upstream commit 3056288933f06afa72f8611ab7c4accdd01899fa ] 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: 950a6954df13 ("net/txgbe: reconfigure MAC Rx when link update") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_regs.h | 2 ++ drivers/net/txgbe/txgbe_ethdev.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/base/txgbe_regs.h b/drivers/net/txgbe/base/txgbe_regs.h index 86896d11dc..a2984f1106 100644 --- a/drivers/net/txgbe/base/txgbe_regs.h +++ b/drivers/net/txgbe/base/txgbe_regs.h @@ -1022,6 +1022,8 @@ enum txgbe_5tuple_protocol { #define TXGBE_MACRXFLT_CTL_PASS LS(3, 6, 0x3) #define TXGBE_MACRXFLT_RXALL MS(31, 0x1) +#define TXGBE_MAC_WDG_TIMEOUT 0x01100C + /****************************************************************************** * Statistic Registers ******************************************************************************/ diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index d1305b0507..52584ce60f 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -2874,6 +2874,7 @@ txgbe_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; @@ -2961,9 +2962,14 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev, } /* Re configure MAC RX */ - if (hw->mac.type == txgbe_mac_raptor) + if (hw->mac.type == txgbe_mac_raptor) { + reg = rd32(hw, TXGBE_MACRXCFG); + wr32(hw, TXGBE_MACRXCFG, reg); wr32m(hw, TXGBE_MACRXFLT, TXGBE_MACRXFLT_PROMISC, TXGBE_MACRXFLT_PROMISC); + reg = rd32(hw, TXGBE_MAC_WDG_TIMEOUT); + wr32(hw, TXGBE_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-08-12 20:44:04.958384705 +0800 +++ 0074-net-txgbe-reconfigure-more-MAC-Rx-registers.patch 2024-08-12 20:44:02.235069322 +0800 @@ -1 +1 @@ -From 3056288933f06afa72f8611ab7c4accdd01899fa Mon Sep 17 00:00:00 2001 +From ea62ead19d19d609512349b7650c943a062eb3b7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3056288933f06afa72f8611ab7c4accdd01899fa ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -33 +35 @@ -index a59d964a5b..699ff1c920 100644 +index d1305b0507..52584ce60f 100644 @@ -36 +38 @@ -@@ -2879,6 +2879,7 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev, +@@ -2874,6 +2874,7 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev, @@ -44 +46 @@ -@@ -2968,9 +2969,14 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev, +@@ -2961,9 +2962,14 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,