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 7FDA74625C for ; Tue, 18 Feb 2025 13:41:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7ADE0402A0; Tue, 18 Feb 2025 13:41:40 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2067.outbound.protection.outlook.com [40.107.236.67]) by mails.dpdk.org (Postfix) with ESMTP id 8674840430 for ; Tue, 18 Feb 2025 13:41:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JRR9EOl7iPBGRnA727NZ78REdz224y1d2tu7IyL0lBtA54B+AW+3VScDds//hpuy/W+Y9Xn+OfhSTOgjbcWqT5FeddcSOS4o7t48BcQn8eYS/kcJSQuHmjXC4Fi4M2eU0/wZu+FgNb1YAObBTAsRXLx2ZttF5/5agJD8YUIXu79s95hl6So5jBeWo5W3SXXFyNE3vMFaWOsxT4K76spUQz/niHtejYe4kfZjB9XzB/JNJamE9qFLvRH5V4xh7JZadxxOhnmdQsw8qbEFjmazgIG2ceIRL/kYcvyYzkmEsLzftoc5DN0JzHXZVVlT314PTRwEo4TloRNgUxjYBI7flg== 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=5qxvR6lUosfdfmTgrnUY2Sn8yFDHmg6xyjMceMHi+s8=; b=KEYlYlO4qF2B+8kofH5i2Ze5hczwEhhls3ubDzez4TIN02VLnUr8yKTpAkoRxQB7NuuTDD6qbUGjbIcE52prVfk60CGvr9WJZAF+JQjVF361L1oMcwhIkliZdpffUPcmBC5Gnk11va1qpljfjP4rZvVShAYBp2MWVePIs/J38DZvOmG14S6dSwST7M8OGUQP6QcA7kqUO7H7IbmHO9rU0jcZTYeqcF7idppyqFcebKzypJkQq7wa4G8Oe/7zRIQLYZ+DTk3Utyb3YsFNWXq8vuLPu/w45M1EmX2sBFlrBJBGYP2TgfUnYpAvWppITK1/Qla/l43qVwEBdDGfIPgG1Q== 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=5qxvR6lUosfdfmTgrnUY2Sn8yFDHmg6xyjMceMHi+s8=; b=oHqpEH88CllVz4EjAO+ClYSxp5tVioEOq4H9WvlC36w/mx7lgViWSCJ7QXWwZLiJA/aSPrfZcvEcWfgYs0OrO5t2X3HPSyRW5wg9wGUCVfopgcbZvjFWPX7L6ihDGso4cyGpiRbemlnzFZ2OcQBHX13rDblu794ow6Qp6D36VP7Sdwdhix06uckLZ/sCytsjgPijOhvwcZ85icsrvrgX8ySadjzR7fafmf9V3NXKODZtQqO8WZ8wXyPssSm9FkGcnpB8F8olwnmbjpmUAdBZGMq+RnxsJJ29vSskuyGwSqVd4rtjRmV07KVtnzWxvgZfMSid0XlyHMUAIz/F9IVcPA== Received: from SJ0PR13CA0001.namprd13.prod.outlook.com (2603:10b6:a03:2c0::6) by CYYPR12MB8702.namprd12.prod.outlook.com (2603:10b6:930:c8::13) 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:35 +0000 Received: from SJ1PEPF00002322.namprd03.prod.outlook.com (2603:10b6:a03:2c0:cafe::5b) by SJ0PR13CA0001.outlook.office365.com (2603:10b6:a03:2c0::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.12 via Frontend Transport; Tue, 18 Feb 2025 12:41:35 +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 SJ1PEPF00002322.mail.protection.outlook.com (10.167.242.84) 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:35 +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:41:26 -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:24 -0800 From: Xueming Li To: Anatoly Burakov CC: , Bruce Richardson , "dpdk stable" Subject: patch 'net/e1000/base: correct mPHY access logic' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:54 +0800 Message-ID: <20250218123523.36836-60-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: SJ1PEPF00002322:EE_|CYYPR12MB8702:EE_ X-MS-Office365-Filtering-Correlation-Id: cd37f9a5-d9db-4b44-172d-08dd501994df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?py+uYRPLFOhZLG5E1XqjmLBrsW9b29ARysklRlbkcXMImnGCztolohHVIst9?= =?us-ascii?Q?Rtbl4z2oGXP5dz/ZVlg1t5EuZP+YQWqjVGyMPIVkgw1s1npEQxfWtauozUtZ?= =?us-ascii?Q?jjOSmVMYuBd/JNFbYnNYSSlJTiChaPNbpszpOyboazfT6lmZICBUlRenhK87?= =?us-ascii?Q?C8zFB5r4vIN39Tx//wvArJOFL8KAQIKja1NXWOGGQBLE/raIVC5OZvszZ4Xa?= =?us-ascii?Q?e7ZC6pX7N5wE4XpNgRei/nylrhhE7l3nVSlphPVWxzsWKdjb9WsLGGGevKXf?= =?us-ascii?Q?9rENBJs2nEvNg7Xkp1cRo5aY9NKDGT5XtK960WUHYnfOu0HgLWckQr22J4uu?= =?us-ascii?Q?4hgXPkbAkEvja5wzw+VNcxGgMfaa9RRj4ud3pc4wBkk6f14Kix605OkptrOQ?= =?us-ascii?Q?CqE7ESu5PfoUUKfPw9mXrHu8QQlZYseG2vTuFhkJwhg3iy6X+o/JlXlaaBIv?= =?us-ascii?Q?Ci4pzE7Nday1n4bPKPeIAMHFdmGELb1X2TvxMkv2arpH+xp+tjwguBko/epf?= =?us-ascii?Q?LMvj0haxuH4l0k6G7h1kagdubncwC/tIw01SD6VIE9GWdSHz9CB+Rbl6mFSx?= =?us-ascii?Q?SmlZSVh7pnGLLKJ/ZamkbL8Ia06KWXonZVZ43jHRdM8zrEsVpR6csmClsYDb?= =?us-ascii?Q?BZmHyGbLRjrTgWrfzcn6ksi6dRcTHVhJyDRuqckhn1dP3IXvTKz9hjuRT854?= =?us-ascii?Q?At9NVFGV8SQKALe0rc4x9v3uodXJaS7USTOOSYdeJqqb+5CtG4ss0tNyRIg/?= =?us-ascii?Q?RvL/l6C8fBLLm/g62RJHlfdqngx2oGKCK8x4u+JZKDcoDV34UFR875WFJUHE?= =?us-ascii?Q?s52tEeNOKwroSpaTTnWlOHIKdDv6F8hG1fqacfCIZo4wB2kG9HIgI9xd2g8t?= =?us-ascii?Q?d3xPtSVWUCskyFih9lHDgbWVb3ksp+LWXJDIIL1x28SxExAevU41PMkfUYEr?= =?us-ascii?Q?irZnDuj6tZbJl/I4nAyyTFIS2M0wTE+RZYbSHy9px0NRWYSYPs3XKgBrteSK?= =?us-ascii?Q?I6Ow6u6dkLt38aSzSiAiudUa1cHDC11uSE/XO9Vv3RWuGWmQAK0+VCs8A2zK?= =?us-ascii?Q?S30BUjMYhsvUVxFPfCipQ6hWnp92XQrCvKTtHMmwU/OU9Tzz5h309PvoeNZ1?= =?us-ascii?Q?xRMjw50GNiyh7T+uaT4GczW5s3NbNjwdjc0cTki7xDPE1uk28t5e6UbistPd?= =?us-ascii?Q?65JNaoo42LUYHwsKD12U0v0al3bkFcQ9d+FbPRqCa3fwboPPpg4qLp1GuIOa?= =?us-ascii?Q?YBfItY4yO1hN0Jo3Tisf5wyQOdy7qG3HKFEXt18Xk1eqgsLY+E2o/j6KClQf?= =?us-ascii?Q?PzKoi2r9dcGCF9GBge3dAO/8nYz8U3ONJmvpINxyW7BisuigkuUyZb8CN9Y4?= =?us-ascii?Q?LIH0iE5z+p5oSV00eyI48sRX9eeafeOBTx+oHmxtEpQlDr3FiLW7IXU+1Pmm?= =?us-ascii?Q?2vWI21RBKs4jaMgLBUy50bNAqgt29CtGc2lmy7dVoRVr/SoKkcQUyZCwG0gf?= =?us-ascii?Q?qE3UcK30Yk1hQEA=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)(376014)(1800799024)(82310400026)(36860700013)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:41:35.7437 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd37f9a5-d9db-4b44-172d-08dd501994df 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: SJ1PEPF00002322.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8702 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=5ea60d834c1800358f8f050b34321c3df7388693 Thanks. Xueming Li --- >From 5ea60d834c1800358f8f050b34321c3df7388693 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 6 Feb 2025 16:08:38 +0000 Subject: [PATCH] net/e1000/base: correct mPHY access logic Cc: Xueming Li [ upstream commit 62adddef81d4ddb9789e9f0e5a0899b399bd5d8d ] The original code had incorrect indentation, and the fix was applied to follow the indentation, i.e. adding brackets making the indentation valid. However, the actual issue was incorrect indentation and not missing braces, so the fix was incorrect. This fix restores the original logic and corrects indentation. Fixes: d5e39d1ca460 ("net/e1000/base: fix build with gcc 6") Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_phy.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c index 62d0be5080..208fb3f81b 100644 --- a/drivers/net/e1000/base/e1000_phy.c +++ b/drivers/net/e1000/base/e1000_phy.c @@ -4134,13 +4134,12 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) *data = E1000_READ_REG(hw, E1000_MPHY_DATA); /* Disable access to mPHY if it was originally disabled */ - if (locked) { + if (locked) ready = e1000_is_mphy_ready(hw); - if (!ready) - return -E1000_ERR_PHY; - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, - E1000_MPHY_DIS_ACCESS); - } + if (!ready) + return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); return E1000_SUCCESS; } @@ -4200,13 +4199,12 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, E1000_WRITE_REG(hw, E1000_MPHY_DATA, data); /* Disable access to mPHY if it was originally disabled */ - if (locked) { + if (locked) ready = e1000_is_mphy_ready(hw); - if (!ready) - return -E1000_ERR_PHY; - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, - E1000_MPHY_DIS_ACCESS); - } + if (!ready) + return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); return E1000_SUCCESS; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.805349973 +0800 +++ 0059-net-e1000-base-correct-mPHY-access-logic.patch 2025-02-18 19:39:00.658244042 +0800 @@ -1 +1 @@ -From 62adddef81d4ddb9789e9f0e5a0899b399bd5d8d Mon Sep 17 00:00:00 2001 +From 5ea60d834c1800358f8f050b34321c3df7388693 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 62adddef81d4ddb9789e9f0e5a0899b399bd5d8d ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ - drivers/net/intel/e1000/base/e1000_phy.c | 22 ++++++++++------------ + drivers/net/e1000/base/e1000_phy.c | 22 ++++++++++------------ @@ -22 +24 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_phy.c b/drivers/net/intel/e1000/base/e1000_phy.c +diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c @@ -24,2 +26,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_phy.c -+++ b/drivers/net/intel/e1000/base/e1000_phy.c +--- a/drivers/net/e1000/base/e1000_phy.c ++++ b/drivers/net/e1000/base/e1000_phy.c