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 BF91C4625C for ; Tue, 18 Feb 2025 13:42:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9EFE402E5; Tue, 18 Feb 2025 13:42:41 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2080.outbound.protection.outlook.com [40.107.92.80]) by mails.dpdk.org (Postfix) with ESMTP id 4858C402E5 for ; Tue, 18 Feb 2025 13:42:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gQuwWbbDhfy3GWWPaDlggFhQ58oVHMrgVWPi+l0fpW1FcOfEGYEtgyOi5IzQdcExTf7dd/Ym5qAeH9pO3/LHsMuAYufPSlRLrR8gS/ICalYMe1S2D78Dp6MpFkzGLU8Da+4WGKcCbBnv7JaFg+ouGU2nURKLB7kHQcRQsS+EX+bmhZxkAX5ZJsFXb23G9I9U4dzkCIz7r1hid9LiSeTu7lVba18HmH8AwnyPBDZE/B1+YEMxe2Ja32wCi6cR7YBJbBrtd+UsOK+CDVTV5tnaNqvl3uQu9fSufx+kTv2RY/qHJYH6aXwQs1KqUR8jSguSLWjfJtYsVzsSywnKEcVCcQ== 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=3d0ooMVginw22rgnDc+rbmiAADgkuWtAvgF2ck/yhK4=; b=Tir335Pe58S35c7Hof1F9Q0L8GJWsWi1U46gB4cpS7GK06Z12TSrLLUkpouLWTCLy9jr/9jRzijBqQlr03mdFhz5K3Z1Yk1ar3kAbEhRpx5F8WaP62SD/WyRZHAYnmWDxYh4QqnKql8jvLqbw+XoKoZ7dOQYnlyR5FGjkxk0bKIZOmbS4d9VC9TqdBoPpL+mJC0AtHIw3/bFJqnyoTggWUhcp/8szmlXDVAHkGg7o0+KBRA/6R1e68Fx6prTLhy7dRKOTmz4dmxIZPjKQhDeIKE9PIEFo6ZFp9DXQZbrbyFjhfJXZ044cTzdNcUjsPA4KNidOQk7FNhseI7OGUQQJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=3d0ooMVginw22rgnDc+rbmiAADgkuWtAvgF2ck/yhK4=; b=ndRDmB6PbSugB+IT8C5gx/ni3SE3xrg0X/1EWS1cszRxJi56GRcsCesI57mV9jx78ouvJCMviH9cbWXcp0X0z2tO2DHIuKVxudcngWD4RpTZCJsIa7bCQj6oV8SM4363ZxLtUz5ttj4iRQfnIkef/98qJQii2wozJDrYNuOQGijtk7C8cs+hcLqA7Ms9xJ9kKAHor52HzGdZFx1w6Sj5+6+lV2dhIijInxonUZQICH3Ko+MPYWDBxIAzWjCMm+D4gmaf1yaqhHxGlVedzDwfBZhabPbmhv98rYvc9YZ3/dytOE9w81TnR9yChxCwYwKRJzUBtiIOSPqBTse0HD6xGw== Received: from SJ0PR03CA0107.namprd03.prod.outlook.com (2603:10b6:a03:333::22) by DM4PR12MB8572.namprd12.prod.outlook.com (2603:10b6:8:17d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 12:42:36 +0000 Received: from SJ1PEPF00002321.namprd03.prod.outlook.com (2603:10b6:a03:333:cafe::1b) by SJ0PR03CA0107.outlook.office365.com (2603:10b6:a03:333::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.16 via Frontend Transport; Tue, 18 Feb 2025 12:42:36 +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 SJ1PEPF00002321.mail.protection.outlook.com (10.167.242.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:42:36 +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; Tue, 18 Feb 2025 04:42:28 -0800 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.1544.14; Tue, 18 Feb 2025 04:42:26 -0800 From: Xueming Li To: Carolyn Wyborny CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/e1000/base: skip management check for 82575' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:03 +0800 Message-ID: <20250218123523.36836-69-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: SJ1PEPF00002321:EE_|DM4PR12MB8572:EE_ X-MS-Office365-Filtering-Correlation-Id: fe11a874-b3ac-42db-0afb-08dd5019b8f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0TTdCH9V20JhwSvrH696EaNt79bKlo7NuG4dZMA8yqE3YyFlqHSZH7zcxyrR?= =?us-ascii?Q?mhnPNrGt7JGkAID2eT9TrXTXhYhdui+2hV7cLAqY6NG+TSLPLCxqAxW7LKDM?= =?us-ascii?Q?i1DAsSJPujRKP2jt+HqpqKCleKIvXWomYvCPP+xzCBKScfRApI8orQ8q6dQk?= =?us-ascii?Q?z6k86Y68/mPPHPcJkPRK5XirLJL9LwAT4LWsMWMN+wy4E626sqNeQCpwVbxP?= =?us-ascii?Q?ISXlWCb+AY4umwrOBOlS6WqJHAsm909XFXLN2SKo74w9v9bspJWeFCJunBpb?= =?us-ascii?Q?Qs5FqxBw1a2eQ9rnk6x8wKBOjJWcBmhFQpeOmw+K3krQwXkWJqqiVnxRDwTi?= =?us-ascii?Q?uX2AFvYZvT6/g2HDM/MnHF05vAQ64Mr08mU1RhEUmJH6oo7c3FRWSNv37osC?= =?us-ascii?Q?ymRnCH5NykbVC2U/mGSd/e29wPkrKYSjtsGINqDxpmvyhSMsmzXWhwczEKqD?= =?us-ascii?Q?x1R2dkt+vScP4jX6zc37Jeu8HlfJtTmxkw+N3/C0JqPWQ2WWccgeXD+pV2AS?= =?us-ascii?Q?vtZzTXinwDGj52GdMvLcSkxxJgarI1zrj4ru5k6HhSXHCw2oPMsZJIO7+rtJ?= =?us-ascii?Q?88iL0iaPwCBFMJXf6pPp/REL7eWRAoL2m5UVa8p7hyeC1PCPoi2vjTR8xb+d?= =?us-ascii?Q?c7ETiKWlCTj/WaAJGONAF0w85x+VBy2lZQMA9ngWk31ExOIZtfHrOsaAQVqp?= =?us-ascii?Q?+zuk6Sn/i4gk/+6OlvQ/u+AxwwcTcV7RnvotMQa0Vn8izxgGti0jFn3vxyUN?= =?us-ascii?Q?Kx0mMWB52JmHTAsQZ1K2w7qTDxwY8jQdUq/B/svO2xV2EhHSRf8/XVC1cP+b?= =?us-ascii?Q?bopi+5o0DQpP4KJvjTtPZ4ch9RIzuz6M8Hav4MiL5tc3iYivgQTLdXmTRvLR?= =?us-ascii?Q?qJBtp2XyrI395hj265aftnl0Ee4+YnTAI3EmNXCGQJBIeX/0I/p/oCg9uN/I?= =?us-ascii?Q?13SFMB3FvzaEYeI0mps6ch7ljw1IQQWcRV+hbpsP0gyyrVMRpRXWmFFAOOaM?= =?us-ascii?Q?aI/hZB8t8GmuK8F6A70YUwwaGAIHrkFi4iWImZzwqkeJnOjchF+Q1cztZvy+?= =?us-ascii?Q?E8JqxO281d2BIZRgfAqb56HrAOasL0bFTmPXvkMmAQ9D6TSRQvrJ1f+smYFl?= =?us-ascii?Q?C7UEHRmYORXO7dCkk+oiG3qZF0BTqbJ3mBpjuNFtofFEsP1IjmrFDvYoG2CT?= =?us-ascii?Q?B8+C52PNvP8bS6Sti6TIh7Y1VEQf4WGM8z7pMPsXv/Mm1sF8h5l/l+TSYrF3?= =?us-ascii?Q?M3FdikAcz2nBBiQZRW4Sd7lusxyDyH8WpvGhqAovKbaUfHx8NHkeiSNG7Av8?= =?us-ascii?Q?DvK2zFeW1zU/AkTVq8VAWMVBgEEBjdSkHk1ZIb9ytZ+EV8wTIvkwEgXSIPNL?= =?us-ascii?Q?IKvsmbGsDlT+y7HrU/oJnDB5fq1y57ymWeFTb9Sm3Wt1Dh3x2oHzysAN0TDh?= =?us-ascii?Q?pSyfAl6etpIEBaYG1bPrhSopqUco6OlpDABcPIw5WXpqkNz4RxBarom7rXCz?= =?us-ascii?Q?RZRNMNQvk+um6lc=3D?= 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)(82310400026)(36860700013)(376014)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:42:36.3833 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe11a874-b3ac-42db-0afb-08dd5019b8f8 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: SJ1PEPF00002321.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8572 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=79196f75abaa248cadbe9dee500bd12dd78acb50 Thanks. Xueming Li --- >From 79196f75abaa248cadbe9dee500bd12dd78acb50 Mon Sep 17 00:00:00 2001 From: Carolyn Wyborny Date: Thu, 6 Feb 2025 16:08:47 +0000 Subject: [PATCH] net/e1000/base: skip management check for 82575 Cc: Xueming Li [ upstream commit d107a23f60c6a8b9543c386ecc48abc4f92f50d3 ] On 82575, driver is not supposed to check if management control is enabled, and flush the Rx FIFO unconditionally. Fixes: 44dddd14059f ("net/e1000/base: remove duplicated codes") Signed-off-by: Carolyn Wyborny Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/e1000/base/e1000_base.c b/drivers/net/e1000/base/e1000_base.c index 3ec32e7240..e10bc6907a 100644 --- a/drivers/net/e1000/base/e1000_base.c +++ b/drivers/net/e1000/base/e1000_base.c @@ -132,7 +132,8 @@ void e1000_rx_fifo_flush_base(struct e1000_hw *hw) rfctl |= E1000_RFCTL_IPV6_EX_DIS; E1000_WRITE_REG(hw, E1000_RFCTL, rfctl); - if (!(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN)) + if (hw->mac.type != e1000_82575 || + !(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN)) return; /* Disable all Rx queues */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.091666723 +0800 +++ 0068-net-e1000-base-skip-management-check-for-82575.patch 2025-02-18 19:39:00.678244039 +0800 @@ -1 +1 @@ -From d107a23f60c6a8b9543c386ecc48abc4f92f50d3 Mon Sep 17 00:00:00 2001 +From 79196f75abaa248cadbe9dee500bd12dd78acb50 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d107a23f60c6a8b9543c386ecc48abc4f92f50d3 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +18 @@ - drivers/net/intel/e1000/base/e1000_base.c | 3 ++- + drivers/net/e1000/base/e1000_base.c | 3 ++- @@ -19 +21 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_base.c b/drivers/net/intel/e1000/base/e1000_base.c +diff --git a/drivers/net/e1000/base/e1000_base.c b/drivers/net/e1000/base/e1000_base.c @@ -21,2 +23,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_base.c -+++ b/drivers/net/intel/e1000/base/e1000_base.c +--- a/drivers/net/e1000/base/e1000_base.c ++++ b/drivers/net/e1000/base/e1000_base.c