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 6E5C54625C for ; Tue, 18 Feb 2025 13:42:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 647A2402C4; Tue, 18 Feb 2025 13:42:37 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2046.outbound.protection.outlook.com [40.107.92.46]) by mails.dpdk.org (Postfix) with ESMTP id C68A3402A0 for ; Tue, 18 Feb 2025 13:42:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OurOVZLxNqkkcPkt+lmvEpsRdEgTZCa0zsecaDHqA1UX3Vzr3UtMH4k+7l0idzZfBJ6wpa6LEk4GzLbTTqq9xQS+62o+61rfZxork5ObmQuMpRuvPs27uKIQsjfxoei1dp9bukdcjdksTYQ0+uLL6EElyJkcqIki7T3Lm1VksMvWSd/6gsiR1LI8ppTMxXz8iw8H5YAsCp0GN/iJSpmeRWauRo/BlO7OZJQEdilvRLhJrfidOzVCmNu0E97I5X//ai89NDQul+1DDlcSJMXpiOylewK9mq10ToLg4ATxtz0yHfjVT2TgTE2JAYdERLCoDEu3gTZRvAWWXLD4yHIHnw== 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=limzCTy/KlFQyu9C7QLGXqC5S5eypijIozIjKaw7hLs=; b=CsorOgCZqXewlbduhwz29JpQ2d4Apw169GyWDPh2i6SrtFHywhyAjF6XoCwIn217c873GKTPa9XahEZWHpAAJXJe2m+DLAbBVPhHpMFg/fLsc6CgKmnAQ9BdftBIg7iH7FNVo2cKv6rpesuZ4Up2nqZmF1RvRXwZsytV7P+zgpr1BnNAoS7vJVBQocW8ffMn+tChkbnxaQzU++fCEbpFVpCcBmA/0XLt6LemJ5aLW6fp2RfZN8x/pDtoLcZRXtkt6sg7O8jWOIC0ncZ+8RbnoduqLx/53VvMtgs9leTqPG9qi/g4cJMCGc2pgPDnkNO4NfbLg1BHTWOGqJytphZkOA== 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=limzCTy/KlFQyu9C7QLGXqC5S5eypijIozIjKaw7hLs=; b=Owt7FZX3e9tCS8ZjCE/6SdazVR9GJv5cida0la++XQMNZewg3RhbyteATew/PXPbGZPBX4w5bwKx3aruCgiwvMbIYdu/V71myZWfJX8ZmdJfbFWTqFdYQzntqRn0rJh2wkcIj7iw+qVFYU8b+LfLTO4TulrqASuH730dLDbgQKEFuPBxRfjLEmKmJDhZ5sRUu4Zg8NROKLOb8umhrEGCO2kAh89aUV+xkWMjEmsmAqIrzI6pykkw7w8+GUdM44ISebNOUstx2PZL4glUOpW4FQywQ2p4Jh8MKIhj2J3lTbe/uMX0iYdhl7NvfCuF62mvymmJKd9SudVYVnWlCyJ/PA== Received: from SJ0PR03CA0095.namprd03.prod.outlook.com (2603:10b6:a03:333::10) by MW3PR12MB4444.namprd12.prod.outlook.com (2603:10b6:303:5c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:42:32 +0000 Received: from SJ1PEPF00002321.namprd03.prod.outlook.com (2603:10b6:a03:333:cafe::db) by SJ0PR03CA0095.outlook.office365.com (2603:10b6:a03:333::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.20 via Frontend Transport; Tue, 18 Feb 2025 12:42:32 +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:32 +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:23 -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:21 -0800 From: Xueming Li To: Barbara Skobiej CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/e1000/base: fix reset for 82580' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:01 +0800 Message-ID: <20250218123523.36836-67-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_|MW3PR12MB4444:EE_ X-MS-Office365-Filtering-Correlation-Id: ea1334a3-9d29-46dc-9df0-08dd5019b682 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YF1jUx1ly5/8vOgKlIkC0dD3tP3YMy4GzZRZfAJrA0+Ab0B1KOZqd6bakMiQ?= =?us-ascii?Q?l4n1jM8RyBS9Npn58SaVL0+32Ret+U8oXshP9eipxrh3wRMXckimLKIDk3oh?= =?us-ascii?Q?k18tMQBAmtoC2AjLEi9mCVhperWa8cdAgrHFo+VYaESXaar2jtwrfg5zpmWL?= =?us-ascii?Q?SYhsOuTD1F+5CLRX0ianUNPnDgZ6ihXOusbTGrNiAJxvmAiGmgGS+VcY/R+7?= =?us-ascii?Q?2JMeoJEZvqvTLlYs7rm3ZqlqByLxM1ZSEI83YoyhgwPGUFLCkYS60K0AkMl6?= =?us-ascii?Q?SWeuoce3RknuR2dS2U//RFcSJWI40bkSCHoZaX5bYS2OLkhmYNty7lHAm/UP?= =?us-ascii?Q?YCwZj0ANzSmI+b4SIFATyAc1y2ZjzkpioVephnmk5vwOa1MJDr1m01muNUO+?= =?us-ascii?Q?mzIHV3UEkwLUhWFB0SoMS3xGAiOg+NyIGqcRoluyNpuizC20eQ4iRIbsGQCK?= =?us-ascii?Q?QqGmfu657Ovp82I5ihRPpbcX1wdC7rt4am1xpeOjaK5SpdjtoFid5PDd/Yqn?= =?us-ascii?Q?sGS+L0u02j8ycawJOaMWxXNOlk8HlJDmbyvmrQRyqfjC7B52LSZ8rOgEMFvq?= =?us-ascii?Q?Q902tEQTpCvjkpAq77AtXay+ylOElzY7ifidpF7trbN9ojUXdm90dbORakoS?= =?us-ascii?Q?WtHQdvLd2Npa16IcHZyzV5k9CdI4V/TyfffcWTfK0cEZbKXWrK0yHDC5zMtF?= =?us-ascii?Q?mlkY6eVqk5aSsSC3BPc7kVBaDSTOs8aujySjz7mQ1iZL5vD2o252U6uE0+aR?= =?us-ascii?Q?3sIdEzEjMAgVLH/MqT0tQIU3SPDZ9TCf1V8dQJH5UR6n9/kJJmXwtVmZmjQM?= =?us-ascii?Q?qwFyaTiIbyVaOalE3Nsd5Gto1fuFP95H0hrpIhCTb6wTVejZjN90S0PXiD5z?= =?us-ascii?Q?lVsAfrWOtOQAISgEeYiZHKDYTl3IihqirUZAqaaeTOP4xT6DT8le25tQBuEn?= =?us-ascii?Q?Cy6HLWW2lUFOLQpv74Xn7iJH7raleqUdLNuU3U2HM2h3cfQ1XWSAFjxPDRJJ?= =?us-ascii?Q?8KJqIlUI9IDRFOBL8sbGhBC6nbfzmR8cQHj8bFvhKUOzV8i/Qa5qAMFys3Fr?= =?us-ascii?Q?G3fvsccL48vlfHTCJUjeAt8xX2fvB/XXPwkaPDAdNb5324M9C5+DZlUV8tNJ?= =?us-ascii?Q?rNTWQkPcKJRhi5kMq8FVrnKs0tjeWt7MX7d8AeTPn24DoZprei0a+xHCm5gO?= =?us-ascii?Q?bDtdJu7SLmZkKgLSTexdIMzOr9SykV2XKqny94c17jkUvm547SK/HcHUvE0d?= =?us-ascii?Q?3haKE1sclu6yPPE805Eqa+gpe4Dyubx/Tsx/dQSMOdGePPTDaTOfFeBGc3y4?= =?us-ascii?Q?za/zVDESso5RztzFJNp1zXv5Jn2YYEi1nf6UBtu1S2crZmDPxeYXzrUPNtVk?= =?us-ascii?Q?zZ5gTEz9fN1az2/cB4MFw7zbv/ZY0r1GssSZXG2CBpwEyrDe5KligANZLpfB?= =?us-ascii?Q?64UApZlDJ7ubGuvLulqF/qIBJLoXVQDyKq8MOkYEs1nvglghMv2hZWovppKz?= =?us-ascii?Q?O+7aeeioJtNwLsw=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)(376014)(1800799024)(36860700013)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:42:32.2583 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea1334a3-9d29-46dc-9df0-08dd5019b682 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: MW3PR12MB4444 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=c1bf1797d4abd42b94ae697d0436bc452cdf42bc Thanks. Xueming Li --- >From c1bf1797d4abd42b94ae697d0436bc452cdf42bc Mon Sep 17 00:00:00 2001 From: Barbara Skobiej Date: Thu, 6 Feb 2025 16:08:45 +0000 Subject: [PATCH] net/e1000/base: fix reset for 82580 Cc: Xueming Li [ upstream commit 88a1eb79ef08d309af58ad4921db7200fa7c5073 ] Fix setting device reset status bit in e1000_reset_hw_82580() function for 82580 by first reading the register value, and then setting the device reset bit. Fixes: af75078fece3 ("first public release") Signed-off-by: Barbara Skobiej Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_82575.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c index 53900cf8f1..948c80f2fa 100644 --- a/drivers/net/e1000/base/e1000_82575.c +++ b/drivers/net/e1000/base/e1000_82575.c @@ -2280,7 +2280,7 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw) s32 ret_val = E1000_SUCCESS; /* BH SW mailbox bit in SW_FW_SYNC */ u16 swmbsw_mask = E1000_SW_SYNCH_MB; - u32 ctrl; + u32 ctrl, status; bool global_device_reset = hw->dev_spec._82575.global_device_reset; DEBUGFUNC("e1000_reset_hw_82580"); @@ -2345,7 +2345,8 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw) } /* clear global device reset status bit */ - E1000_WRITE_REG(hw, E1000_STATUS, E1000_STAT_DEV_RST_SET); + status = E1000_READ_REG(hw, E1000_STATUS); + E1000_WRITE_REG(hw, E1000_STATUS, status | E1000_STAT_DEV_RST_SET); /* Clear any pending interrupt events. */ E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.026714635 +0800 +++ 0066-net-e1000-base-fix-reset-for-82580.patch 2025-02-18 19:39:00.678244039 +0800 @@ -1 +1 @@ -From 88a1eb79ef08d309af58ad4921db7200fa7c5073 Mon Sep 17 00:00:00 2001 +From c1bf1797d4abd42b94ae697d0436bc452cdf42bc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 88a1eb79ef08d309af58ad4921db7200fa7c5073 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ - drivers/net/intel/e1000/base/e1000_82575.c | 5 +++-- + drivers/net/e1000/base/e1000_82575.c | 5 +++-- @@ -20 +22 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_82575.c b/drivers/net/intel/e1000/base/e1000_82575.c +diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c @@ -22,2 +24,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_82575.c -+++ b/drivers/net/intel/e1000/base/e1000_82575.c +--- a/drivers/net/e1000/base/e1000_82575.c ++++ b/drivers/net/e1000/base/e1000_82575.c