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 9FDF343E57 for ; Sat, 13 Apr 2024 15:01:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 99C0E40E32; Sat, 13 Apr 2024 15:01:12 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2068.outbound.protection.outlook.com [40.107.223.68]) by mails.dpdk.org (Postfix) with ESMTP id 38DB8400D6 for ; Sat, 13 Apr 2024 15:01:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GRM4LFgFqqGUOfXDviCJfGymU3t1e9ZvNly242u8mK931rqxzyt33BBmVt8xwRwFzYt5Bu1OQfKVSbsOXn+aZMHdV4CfO071VSvBiPcXitNYbYFRAQbs2A6LLUUavz1W3q8XMyBRxV5hR07Rt6UC2ZH+gZKOGjYGZs75rDvolSYbupIrSbVkD/e/KqTq1EfUG4yhbbc/rLhqZ2unIzV8cGKeacSvpqNNr3urcWPeSuHabf/Tjg7WtB/DDhvE/QhZkYlqHLaATo7ideF9L8+6XEUJ+IjRv/pA3lxL+CgZ381M+U12PIC2/+lF2tDhbImBmeYxC9lzW5EbKm251kBrqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=0yrFItIrHX+XNQEDHvRONqQ/EUtGg2wECP0hmb38MuM=; b=XCfdy4y+r4+IlQDslnscywpSvFEcn3+vi6iGojCj7r+GW4FYK9x1ExoeQge7jnyyEWUe0e8pq64t2egynGAO3Nz37U3KfQjW2zuixZQU1DKPHHGWCZ3RpcCvD2R2XOsTTeP0RH0n8EIq5IOpvjfML+HJc8bCZJbRMkzRbjA4f29k7G+AqBGwHKK07/8QLcH91F6TviWm7Pgf+AzPaCObQXn259uTLRAfa1Kv/RRZrYR4TsV1a/swW4wCsib6ej8TZyljebvm9zAWMQ+jdWKsPCaxO401gcH/1rcPs1xkLpd2PHSMeNVGox43Ufxsfw88nHb892ACiKdmmdgYpWZf6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=0yrFItIrHX+XNQEDHvRONqQ/EUtGg2wECP0hmb38MuM=; b=pnERVnFTrSdAECbISOUEzI+/LhFb+bIz8HIYHLZ5lIH8Uhy7U6hFkMyOaOUO42VJ3tFcxRGjPzbNGuPRYR+8xfAF3Y7g+qhhOaR34ERCL0AcR1lvvQKagbRCd/7ekgZvDlCkm8I/L1gmnBaOD92ifiL8yaAu1IYT2kUEpYDcukN7o/an5rS1Cdugcs9VVcmhUzrecg+NJ4Ui0z/iGJ4ZjwOq4Xyur4TcIxjYTkD2zWvGcGfSX/eajl5mpnRuRbGPUSWnWm3WBQmvgyzLHOUiGp+tYq14n07Aa2uCaZnDkDQwoqIbQWi3csV3yx9ngHpA7lUNTeFT0/A9NsCoACpWkw== Received: from MW4PR04CA0169.namprd04.prod.outlook.com (2603:10b6:303:85::24) by CH2PR12MB4136.namprd12.prod.outlook.com (2603:10b6:610:a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 13:01:08 +0000 Received: from MWH0EPF000989E6.namprd02.prod.outlook.com (2603:10b6:303:85:cafe::94) by MW4PR04CA0169.outlook.office365.com (2603:10b6:303:85::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.31 via Frontend Transport; Sat, 13 Apr 2024 13:01:08 +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.7452.22 via Frontend Transport; Sat, 13 Apr 2024 13:01:08 +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.986.41; Sat, 13 Apr 2024 06:00:45 -0700 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.1258.12; Sat, 13 Apr 2024 06:00:43 -0700 From: Xueming Li To: Wenwu Ma CC: Tingting Liao , dpdk stable Subject: patch 'net/igc: fix timesync disable' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:56 +0800 Message-ID: <20240413125005.725659-116-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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_|CH2PR12MB4136:EE_ X-MS-Office365-Filtering-Correlation-Id: be8b2e7b-b619-433c-d731-08dc5bb9c938 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SoG7ZXCvA8UgahfOPP9IRQMsyB0IqS4QQAHXAUdEfdWYyTPDgLv4VwJ/XDJAd9ZaMRKLedCI5rQXoDfL6exviX6au/4AjOFFRzLzD8KxI7sxODFZQL+SMceTeca75Moek+eRnLYuTjIZSUOHynrXqJn5jYITWIYgLNnG22D7tlmLt31mgseLg9Z9N68G2JSQeZhlqMkMGLXzbzHODNi+/B2ju7TnMQ4EXODynoDIBHB3kZDRH34eWgumJHcIRtB/7lheopxczmc0ZJJzWiAxMe9uCLbkLXNg0oY+VEN9vBWZ6Qq4o4VzoRzhb4/SsjQeohHvEkVFHJon5WPC6ly5o5x0LswHnEOrSTzpwlhcXk7TqP0qukVnsBwKtosK+Bf4cDcYIq9SOqpC8psqNlPuFHSTLYgluIzl+JbtaR1EFMs8uZ6eI2ynZ32RIeWBOk12m74TMc/3sjm3LtsD0oVWTDUmAnotnl+fQIj3WiiPITE/0ZLbhfOpgmJ5XeC+mVUKDl9hDQ0Glwb7wJFolpoQ+jOlExh2cMXX/q/gQjYv8UQvh/2ZBy3/8h88eNMpzDtbYJW8iyzxT4rwYjohPAXKdelz/M12iB/9K1aHLbaIYhoX83UYdyIWMi80FIt1u2L598reVnqA3nZHlqVbY3ktWw4L4TGJy4hlXUOVZK6N7JYApQJn+vcFuz2ywSqFdMyHQC0YovsguNWUivWJon+4FTk0o2sxYzieSrnj7yzm0nz3PryNByA2RN7fLRTPIpbu 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:(13230031)(36860700004)(1800799015)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 13:01:08.1853 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be8b2e7b-b619-433c-d731-08dc5bb9c938 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: CH2PR12MB4136 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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=0291a1f49edd9b9cecdc41f2989200a7e061d9c9 Thanks. Xueming Li --- >From 0291a1f49edd9b9cecdc41f2989200a7e061d9c9 Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Fri, 15 Mar 2024 09:06:31 +0800 Subject: [PATCH] net/igc: fix timesync disable Cc: Xueming Li [ upstream commit 6e4b297c22baad9c347fbf00dc7589a0a077dd00 ] When disabling timesync, we should clear the IGC_RXPBS_CFG_TS_EN bit of IGC_RXPBS, the patch fixes this. Fixes: 4f6fbbf6f17d ("net/igc: support IEEE 1588 PTP") Signed-off-by: Wenwu Ma Tested-by: Tingting Liao --- .mailmap | 1 + drivers/net/igc/igc_ethdev.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 69ef5145a9..24c4ad3b85 100644 --- a/.mailmap +++ b/.mailmap @@ -1434,6 +1434,7 @@ Timothy Redaelli Tim Shearer Ting-Kai Ku Ting Xu +Tingting Liao Tiwei Bie Todd Fujinaka Tomasz Cel diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index 58c4f80927..690736b6d1 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -2853,7 +2853,7 @@ eth_igc_timesync_disable(struct rte_eth_dev *dev) IGC_WRITE_REG(hw, IGC_TSYNCRXCTL, 0); val = IGC_READ_REG(hw, IGC_RXPBS); - val &= IGC_RXPBS_CFG_TS_EN; + val &= ~IGC_RXPBS_CFG_TS_EN; IGC_WRITE_REG(hw, IGC_RXPBS, val); val = IGC_READ_REG(hw, IGC_SRRCTL(0)); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:08.586245344 +0800 +++ 0116-net-igc-fix-timesync-disable.patch 2024-04-13 20:43:05.147753736 +0800 @@ -1 +1 @@ -From 6e4b297c22baad9c347fbf00dc7589a0a077dd00 Mon Sep 17 00:00:00 2001 +From 0291a1f49edd9b9cecdc41f2989200a7e061d9c9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6e4b297c22baad9c347fbf00dc7589a0a077dd00 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 491af1f6ff..f53fb59513 100644 +index 69ef5145a9..24c4ad3b85 100644 @@ -23 +25 @@ -@@ -1446,6 +1446,7 @@ Timothy Redaelli +@@ -1434,6 +1434,7 @@ Timothy Redaelli @@ -32 +34 @@ -index 08e9e16ae5..87d7f7caa0 100644 +index 58c4f80927..690736b6d1 100644 @@ -35 +37 @@ -@@ -2855,7 +2855,7 @@ eth_igc_timesync_disable(struct rte_eth_dev *dev) +@@ -2853,7 +2853,7 @@ eth_igc_timesync_disable(struct rte_eth_dev *dev)