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 5547D457A1 for ; Mon, 12 Aug 2024 14:58:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A2D4402C3; Mon, 12 Aug 2024 14:58:29 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2089.outbound.protection.outlook.com [40.107.223.89]) by mails.dpdk.org (Postfix) with ESMTP id 81FE4402C3 for ; Mon, 12 Aug 2024 14:58:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OpMAZoD+B0Ld4MSQnDiCTc5ZxG1JOnUkp41Y8Nt13WLLyYBxcURMEtYbUW0Iw2ZQZvPXMHfGHj76QUVRESyKswB9qPG5a4rgZWq2lMExUbqmd15NQ407lYXYZ+TYHLL/BP47nx38ZVYVioBEbjGK1rtiYhjmAl92kpdUwuKFW5jUu1LtJRLBXoSOfVN52dTZNIoqN/y2f33c88gU5aQcVjAJgIiBLkrPAdQ/mRrQ9HLjdOFWnef4f3J3qhXpp6j2+Bp4KPyGbAwu9YHmemLsEjC6lxFleS/lLCUaw5hBP+YRHyrDaByn0z24Y3qigHOsatZbfkD3UCTRs5DpBG2U6w== 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=eV1zDZFMNfzLjUJ0F8O2esHf0t4Pwc2IcWk9B2ZfC8E=; b=ul6StKXGvIfcgKcNc3IxduGNwFdjUbQvRJm6Wke8RNNKulVyISv+rgTescLRltecxEqjBkQ/HTqgpjB385rX6EEGDTqk+FSTgogtWlyRVFeI1m77N0q2bJxBN5n1hyLGhD/SJPX2+FcRiBM5zbBHsWPHObQDXEn1/+w6E+09gFLGlZOpVMQbXpDc23pbsatzYk+dtjVCtPR1c3Bt1r6U5TTmAHYAqte0+ppZKe1kl5SatyiVMOAv5gGKabobAkUDhPtNZJkJAIslI7dBhhAkNzv4xduH1UzNSrS97QedJpBiZt7LeUmugWgHsHESgwddzrbuitukX2lk5xGZcUCluw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=trustnetic.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=eV1zDZFMNfzLjUJ0F8O2esHf0t4Pwc2IcWk9B2ZfC8E=; b=lWHkKR20U5xNJ6DiHn5F8swP/3aIs0AZ/BNMOsQRWoXAwwAkxZcvvoyO2BrusrX/3eDKUIXXtlnE9r1jC1OkJ+ZUzowJTsb6auHppraLgWu9r8nVs6B6uJdQvo0PCOy8X2aNi+eDqu6yEgD1un9HGfACIo709NZgV6VBPZu5M66LC6F/IXJe2u+4gm3S0OM38Aw6iEpfayjWCcANF1PSZmBOhWujOOshQ4d5szWsmjdNBjo5dQaigUzB5PwPenHPtCa/24I012dGJeIiz4d3SYuzjdbE5rNE5sta/Gemp/JpJzMrWo7yVIBR2h3s0PwlfBZFA14Vp49s3ZVzAJ+Y1A== Received: from SJ0PR13CA0021.namprd13.prod.outlook.com (2603:10b6:a03:2c0::26) by SA1PR12MB7200.namprd12.prod.outlook.com (2603:10b6:806:2bb::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.17; Mon, 12 Aug 2024 12:58:24 +0000 Received: from CO1PEPF000042AA.namprd03.prod.outlook.com (2603:10b6:a03:2c0:cafe::41) by SJ0PR13CA0021.outlook.office365.com (2603:10b6:a03:2c0::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:58:24 +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 CO1PEPF000042AA.mail.protection.outlook.com (10.167.243.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:58:24 +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; Mon, 12 Aug 2024 05:58:04 -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.1544.4; Mon, 12 Aug 2024 05:58:02 -0700 From: Xueming Li To: Jiawen Wu CC: , dpdk stable Subject: patch 'net/ngbe: keep PHY power down while device probing' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:14 +0800 Message-ID: <20240812125035.389667-78-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: CO1PEPF000042AA:EE_|SA1PR12MB7200:EE_ X-MS-Office365-Filtering-Correlation-Id: c8e3c7b5-7432-4585-a24f-08dcbace73a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zNN7CgUT7Owpjs/qJdaWuDfbVOI/MnV8xKXLdMvCgMzGG5ADN6T3RyZHISqX?= =?us-ascii?Q?gPyDTn2iCazO6TPPIomeYfSlsdIcOAg/Lvw93pzgiBZN0/pxnMHXIbrz34wM?= =?us-ascii?Q?5bItHfmLACb4pieI8UHzSWLSOcOmkYUKyrtbgr/sLFfvJwSn3r+GKQRwRrHM?= =?us-ascii?Q?QALl0lSdiVWLDNY2vFNZYEIJ8Y4i4pPvjCdyom0SlJuq6LtnQL+5lJSZ+aCd?= =?us-ascii?Q?4GSsXzEuMtCGHyXoYFgflDtv0sA4Z3L3L9kt1nQ9Jfiw48ZXtdMgs+gfU5zA?= =?us-ascii?Q?ODnR6QxsjvHVxb8hcscacaMBumsNLXs5PPpIb6jF2+/CQr/qCDDSldzqyqM6?= =?us-ascii?Q?5J8upz7SPlrpGgXqvpfBd0vyDFbbMOv8yozbuWa8RoR/Mu5SztmnYyPxAHZ/?= =?us-ascii?Q?KPLRqkyjvU1MuGP1OW/KSxMkhRMgmDbfnHbyZDpDdACxtWi8HIRp9XrMd3xP?= =?us-ascii?Q?qJdjDYGsJxICWheSN89zmZ/bTlCPdvEBz4hW4Zd04hcc81hqFnbrzH6QMyQa?= =?us-ascii?Q?DPp8n1o7PgVMOLRyWxK8a0Mxav/HhPTGje3ZtnT7jKBnAGZRRPLPrcCioILs?= =?us-ascii?Q?iQlXT8DkIP5bN61vGdEbLiluHUQiQtwS8I2edrUjHunJ0ZFsheMar5Pbc2/D?= =?us-ascii?Q?28qG3JgcPztXXEc3o5LJYfTrpbRBdIVwvyjClcqaJhBTw0p2F1dYKu67fgw3?= =?us-ascii?Q?lUvXBzVzVuPg7653hpTPYIxUajs4gb5btZ7EXT8NwTEPQWaWuihEJk9stczy?= =?us-ascii?Q?ew6H9ZuMbzPMWVbZmcGNhahcssY2p/gGESwRzvHFNqIpfMwMWcWpzg+bZ8o+?= =?us-ascii?Q?RjxYfgOsl4GbQbbSgMZ6CkKzm0DVDkdRw78fbIefl+u9HJTmB7n+mYJBIOls?= =?us-ascii?Q?IWiLi40OrnEVf0EjdF/Ogr6ijNfX2rnsc008atgtm+f83Ultl+P8zOSAujqX?= =?us-ascii?Q?ZHzPUeb9IEhMSjCaQPXk/MMso6dnDZSNh/eiygbhPeShiewmHfAxV+OYoh5T?= =?us-ascii?Q?Exez4Q+T2LB3+n0mI0VejohBVxflo5ws9gtIy4Em7boOwyemKJi0GGazVAoy?= =?us-ascii?Q?8g4AJAmQWsW0sVrfsh27/NcGPWp3s4mLBq4KmJB4kYWja7724culFCc9f/EJ?= =?us-ascii?Q?JWbHb8uMAiOrwVk1I9iXyzl3+WpZ7JOnLtFnYa//qpQWRZW40VfUkTXWV/Lm?= =?us-ascii?Q?V/qwY9MHagVgHT8/7WNdBuPVIKQOPLbgnWNVuWn5Xezpr2nSmPyVUZe+mILu?= =?us-ascii?Q?DAqMgmG2r3lyr9WZIbPmQYDn8XVMfbFoPdiSyg5Ahjt6PKrPnvvmOGsvFNAz?= =?us-ascii?Q?5lMnulTrVyziLOyPdlSMr88lCfhz6eZtccx7z6/RS29K0IAxgmAVzNE/arn0?= =?us-ascii?Q?YpwW/tGAwg9/BxPA+nQWGOFlIStrbjsUShyAtGeam1aiO+Nhfyh8UPxDTcQA?= =?us-ascii?Q?BoNZR/brqughz6e/WmsafKzzjbb3sKgG?= 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)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:58:24.4091 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8e3c7b5-7432-4585-a24f-08dcbace73a4 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: CO1PEPF000042AA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7200 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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=6d224307f6ebe654be82355595d66bc927620ac4 Thanks. Xueming Li --- >From 6d224307f6ebe654be82355595d66bc927620ac4 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:39 +0800 Subject: [PATCH] net/ngbe: keep PHY power down while device probing Cc: Xueming Li [ upstream commit 01d94f0fb04cbb59e77b8b045616aeb11722bacf ] The internal PHY will be set to default power down after LAN reset, but the external PHY will not. To keep the PHY behavior consistent, set PHY power down uniformly here. Fixes: 708ebe7d0399 ("net/ngbe: fix external PHY power down") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_devids.h | 1 + drivers/net/ngbe/base/ngbe_hw.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/net/ngbe/base/ngbe_devids.h b/drivers/net/ngbe/base/ngbe_devids.h index 83eedf423e..e1efa62015 100644 --- a/drivers/net/ngbe/base/ngbe_devids.h +++ b/drivers/net/ngbe/base/ngbe_devids.h @@ -83,6 +83,7 @@ #define NGBE_YT8521S_SFP_GPIO 0x0062 #define NGBE_INTERNAL_YT8521S_SFP_GPIO 0x0064 #define NGBE_LY_YT8521S_SFP 0x0070 +#define NGBE_RGMII_FPGA 0x0080 #define NGBE_WOL_SUP 0x4000 #define NGBE_NCSI_SUP 0x8000 diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c index 22ccdb0b7d..4dced0d328 100644 --- a/drivers/net/ngbe/base/ngbe_hw.c +++ b/drivers/net/ngbe/base/ngbe_hw.c @@ -173,6 +173,9 @@ s32 ngbe_reset_hw_em(struct ngbe_hw *hw) ngbe_reset_misc_em(hw); hw->mac.clear_hw_cntrs(hw); + if (!((hw->sub_device_id & NGBE_OEM_MASK) == NGBE_RGMII_FPGA)) + hw->phy.set_phy_power(hw, false); + msec_delay(50); /* Store the permanent mac address */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.043237098 +0800 +++ 0077-net-ngbe-keep-PHY-power-down-while-device-probing.patch 2024-08-12 20:44:02.255069326 +0800 @@ -1 +1 @@ -From 01d94f0fb04cbb59e77b8b045616aeb11722bacf Mon Sep 17 00:00:00 2001 +From 6d224307f6ebe654be82355595d66bc927620ac4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 01d94f0fb04cbb59e77b8b045616aeb11722bacf ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org