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 A1D5F4625C for ; Tue, 18 Feb 2025 13:41:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C15F402E1; Tue, 18 Feb 2025 13:41:43 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2049.outbound.protection.outlook.com [40.107.237.49]) by mails.dpdk.org (Postfix) with ESMTP id 103CE402A0 for ; Tue, 18 Feb 2025 13:41:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o+9wM6p/rogelhVnAh1dn6EjBcvr9M23I1aJnjhrpZLYcK3p+a8uI1rVlzT3l1kJRtZSDn5or1WHasr+BYmbIbKNkAWbNB17xUEjy6MDiArAtDVL3sCkDZUA6zoQNLVmq1Ijqhzao2d7yvAUrqTEDiXTGNCb8ZckAVvPBIFyKmdGhf6ZlEHM9MBoJaqyr+CJNBjJJ85jn04m8rnYHLWtxKbRa6ZK3mF2jQhIbl01j+2mwJhDwRw69vWS1bu5HR9/x63Iji/9ugZDdNKRyJLWcBL01/Y4boDjBoHfIftNMlVwsw9HNR7zWIRRzNTz33W17PjSkY84L4ghTOosPnXGmw== 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=sEb929mkbJCi3IQPnUXZ+lzZ846M6NDyUvzKQ91C3UM=; b=fnYeexDXe5CWclbEt0vAvu5ZvKeeMWKU58VsDLZmoCRgsZyHb0+O+XiHebtYQLv4zSAzbahd7LOXUOcNh9oBkXT4DTiJxG0lecRWInc1Tsz0KySFYl25SF2Z7hz0YXtmVxWK30FZlIllIyuWqbSJkgGMzjEj6+rasuk/9tba5Kq0s2nj6YWzzJ0FP8qQwI2RoquRm4VtvzlbJJG5iEsF36xPEtABxwP0AY5BfyhMArZrdDtjZ/+vr10IOI5cLAJBGXbGHehNu8oqN0jV9g2A8uQ+T7NqmFEsIr+tA+Y9VenUV5+rSAjMPpFQJHFFIZehu4Y9POfQr2fbwabJkbnpkg== 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=sEb929mkbJCi3IQPnUXZ+lzZ846M6NDyUvzKQ91C3UM=; b=i/mvC0XRLtK61ZRsJkxd7rygWq1v6uJZlBlKPNow07ig3gQHQpnO0w0EeGP6VZrc1AGtzlzNKi4PmaIvoQe4DKJilIKDJ15WEH77Bs9k1MHP2ZZjEZSD1DoVhlyPgRxg/XHLz2pBgwxZ4ekAt2e3J93A+3jKLiOevJ+fi9TeJ8rftEOl1e8ee5nPQBXkiFNCx5c0+e7FFKAYHOyh2nzs4q/QefXEuCqFkhRNwQxEwX5IjG4uXwi95apH+qvyvGmjrfu3fXXFyqPiwCcHMaXnoePRXi3h8o9U8VRWwBIx9oc3hRAYSXU4On73RMLn9Ez4qlx0K+leyYkvmkTQKyq/ug== Received: from PH8PR02CA0038.namprd02.prod.outlook.com (2603:10b6:510:2da::10) by DM4PR12MB5915.namprd12.prod.outlook.com (2603:10b6:8:68::12) 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:41:38 +0000 Received: from SA2PEPF000015CC.namprd03.prod.outlook.com (2603:10b6:510:2da:cafe::b7) by PH8PR02CA0038.outlook.office365.com (2603:10b6:510:2da::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.19 via Frontend Transport; Tue, 18 Feb 2025 12:41:37 +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 SA2PEPF000015CC.mail.protection.outlook.com (10.167.241.202) 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:41:37 +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; Tue, 18 Feb 2025 04:41:24 -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:41:22 -0800 From: Xueming Li To: Pawel Malinowski CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/e1000/base: fix semaphore timeout value' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:53 +0800 Message-ID: <20250218123523.36836-59-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: SA2PEPF000015CC:EE_|DM4PR12MB5915:EE_ X-MS-Office365-Filtering-Correlation-Id: 7de55f07-f8a4-4f55-8685-08dd50199607 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?P45TxhphyEP/WvM5RuzjZMfCMtCxKZNonsFv1lQxNSHrs1Gf5dQrwsIa+yPC?= =?us-ascii?Q?4np6vxHVvSN+i5+xoPgeGMdfvAxSmrc3QQS5AYuBbkq94K/94zMVJ3yAYg2h?= =?us-ascii?Q?B1tnFk1wYXsJtJOSx+tjkfMSB7p4wNCS9s5SgX8lPSNSlYK8ZdcH3OERA5Gf?= =?us-ascii?Q?Qse0N9Hk+M4BgOY24behpdWXBikFDxqgOphOJ7ycP69XNDkI+UBwYew/rw7j?= =?us-ascii?Q?d0p6Tj6p4R974/m+DvQH4oeKKqJ8zpN+oLvAMSwz0YjiwsfYWVYGdYG6p5Dc?= =?us-ascii?Q?Dqwj2hn6IUlBMEl8iE+d/eoHaj4FS3x4CgB14uer6G3iWTJ+vI3u6IbEzP/R?= =?us-ascii?Q?ztsHG5vxRq5e/kxfudgpJSvRyNmjHdjiTCCnOls2+BUhD/7Kz86hSwSyARfD?= =?us-ascii?Q?eX7kl81bPpq39N6nDW6/BqbKzwlbyHT/s3zXx/XCenjsXrSCQ809WG8f/ACK?= =?us-ascii?Q?VR/D5Wa9/z2OQ9Zm4Ksuv/WOVzAKNeJqk3BZ9kl85nxJaPqkSBuhDJA0TLRJ?= =?us-ascii?Q?KjM9IXy6tJIqAlFryZWKQ2asbCYPG78/1NHCOLwpe6MYdMfuSPYpKyT+yHIJ?= =?us-ascii?Q?GOEn0jiKANYxJUamUjTV0s2u5nH0DbZluCskQwbz7/czNrz53uaTiCO7FuMM?= =?us-ascii?Q?2wAF6xktEBkt5dsiW5fJAii57f7tPsMsNgTxQsSKh2/G9J8/Si93OTZMfWCR?= =?us-ascii?Q?BBLVUR83NjOc6Q0szRZjJZITNZ5X0qZNOAOGbfQ2uwOT3P7VI3LumT35HNl/?= =?us-ascii?Q?m6yLHkkgNcBtM4LBXB/oJUcu3begkAN3vwD6dyIxU/kABd8TBpt3qxEJxEt7?= =?us-ascii?Q?XgISSsUxP6F94IcT00wm/BW3J59OyMPv95jfweAA2qIPej5ZYSZWK+PEbA1D?= =?us-ascii?Q?ITq05DQryru7oqY2zsD9eBKj2HB895yfFru8rDOL9ZlCAJNcgCxSH8YapLBe?= =?us-ascii?Q?TDyXUbgWV/YKRu7/nUu/cQndJ8HadVoM6Le8TbtHKpGoAen8qjIXvYKoH0MD?= =?us-ascii?Q?eriUoOL9BXS5Jzyou21uKywJd0uHuZ0sgnoRj1FbwC1iJRWoCsgDlvpY592B?= =?us-ascii?Q?rmwsUHfNoWfc+j1Vsl835fRoDsnqZ5sIlz4fImRmTgtyO9CbmEOsEbNZzzFD?= =?us-ascii?Q?VI60m3YZiU9Ax6Z9LRe/CF5O6gYVlyZi7Uk9dSNj2khasjrVyWHPJrHXWqqF?= =?us-ascii?Q?MNeGhMR8bQVdkdS2C75pJQPtuE4I5BGrcZ9sre++EPNqd7IHd4AnEo5P/uRb?= =?us-ascii?Q?B382GPGgryaFr5BhcM8/qUszgUf18Of3ZWvDl2//mvR0ToE07ncB3hrhS94V?= =?us-ascii?Q?vf/YNPRaRhA0VZbg01K1uKu1oy3asgrPtgsuFbTa44IxPEWScEKfu/hz97MY?= =?us-ascii?Q?b2qy3FutDlHVELAMGeOupaUSes8GbJuVrO1XWcE52o7Tr5yjRIwNUyOEmXbm?= =?us-ascii?Q?LxjdBF7+tdM7N1D53Bf9bpEuyKZ53R2ZHHLJOJbs+kI16lm4O+eC+EpmPSnq?= =?us-ascii?Q?u8Miw3hnmbVMmV4=3D?= 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)(376014)(36860700013)(82310400026)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:41:37.6552 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7de55f07-f8a4-4f55-8685-08dd50199607 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: SA2PEPF000015CC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5915 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=7379e53203fa403e448a13b26253767eba721731 Thanks. Xueming Li --- >From 7379e53203fa403e448a13b26253767eba721731 Mon Sep 17 00:00:00 2001 From: Pawel Malinowski Date: Thu, 6 Feb 2025 16:08:37 +0000 Subject: [PATCH] net/e1000/base: fix semaphore timeout value Cc: Xueming Li [ upstream commit c8bcaf0f2a02995b447c121e860fd550b9c55114 ] According to datasheet, software ownership of SWSM.SWESMBI bit should not exceed 100ms. Current implementation caused incorrect timeout counter values, where each iteration equals 50us delay. Because of that driver was allowed to wait for semaphore even for 1.5s. This might trigger DPC timeout. This implementation hardcodes value to 2000, which multiplied by 50us, gives 100ms of possible wait time. Fixes: af75078fece3 ("first public release") Signed-off-by: Pawel Malinowski Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_defines.h | 1 + drivers/net/e1000/base/e1000_mac.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/e1000/base/e1000_defines.h b/drivers/net/e1000/base/e1000_defines.h index 3fbb6c8ea4..97cc2797b2 100644 --- a/drivers/net/e1000/base/e1000_defines.h +++ b/drivers/net/e1000/base/e1000_defines.h @@ -504,6 +504,7 @@ /* SW Semaphore Register */ #define E1000_SWSM_SMBI 0x00000001 /* Driver Semaphore bit */ #define E1000_SWSM_SWESMBI 0x00000002 /* FW Semaphore bit */ +#define E1000_SWSM_TIMEOUT 2000 /* Driver Semaphore max timeout counter */ #define E1000_SWSM_DRV_LOAD 0x00000008 /* Driver Loaded Bit */ #define E1000_SWSM2_LOCK 0x00000002 /* Secondary driver semaphore bit */ diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c index d3b3a6bac9..cf0a9f21e1 100644 --- a/drivers/net/e1000/base/e1000_mac.c +++ b/drivers/net/e1000/base/e1000_mac.c @@ -1688,7 +1688,7 @@ s32 e1000_get_speed_and_duplex_fiber_serdes_generic(struct e1000_hw E1000_UNUSED s32 e1000_get_hw_semaphore_generic(struct e1000_hw *hw) { u32 swsm; - s32 timeout = hw->nvm.word_size + 1; + s32 timeout = E1000_SWSM_TIMEOUT; s32 i = 0; DEBUGFUNC("e1000_get_hw_semaphore_generic"); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.772001278 +0800 +++ 0058-net-e1000-base-fix-semaphore-timeout-value.patch 2025-02-18 19:39:00.658244042 +0800 @@ -1 +1 @@ -From c8bcaf0f2a02995b447c121e860fd550b9c55114 Mon Sep 17 00:00:00 2001 +From 7379e53203fa403e448a13b26253767eba721731 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c8bcaf0f2a02995b447c121e860fd550b9c55114 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -22,2 +24,2 @@ - drivers/net/intel/e1000/base/e1000_defines.h | 1 + - drivers/net/intel/e1000/base/e1000_mac.c | 2 +- + drivers/net/e1000/base/e1000_defines.h | 1 + + drivers/net/e1000/base/e1000_mac.c | 2 +- @@ -26 +28 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_defines.h b/drivers/net/intel/e1000/base/e1000_defines.h +diff --git a/drivers/net/e1000/base/e1000_defines.h b/drivers/net/e1000/base/e1000_defines.h @@ -28,2 +30,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_defines.h -+++ b/drivers/net/intel/e1000/base/e1000_defines.h +--- a/drivers/net/e1000/base/e1000_defines.h ++++ b/drivers/net/e1000/base/e1000_defines.h @@ -38 +40 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_mac.c b/drivers/net/intel/e1000/base/e1000_mac.c +diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c @@ -40,2 +42,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_mac.c -+++ b/drivers/net/intel/e1000/base/e1000_mac.c +--- a/drivers/net/e1000/base/e1000_mac.c ++++ b/drivers/net/e1000/base/e1000_mac.c