From patchwork Thu Feb 27 16:00:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Botila X-Patchwork-Id: 13994857 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2080.outbound.protection.outlook.com [40.107.20.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB4611B3952; Thu, 27 Feb 2025 16:01:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740672091; cv=fail; b=Et4urVHFgqSDX4n1m49q+NaNlaAWFYXdxYETYzPFGnI0hvKqwaQRrJL0FnLVuTDZFm+1Sy2AvOpnIgVZU4wMayJuiHsSiOAz4YNrsb8vSGWf/58o9u/cBnzYokYN1ZcWkCMzMGZrcgFx7F+VlQ0/wDb1lLFix5024C/yv8fHU+I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740672091; c=relaxed/simple; bh=pyIWCrKJ6mvO9xZbg896aimWnTlIWFXhcR6GnEWoVNQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=iXc/QSaESjoviUX9McTa0uC9rXUhAyOF7grXwuFQbsdmT7WYKt6bVsOvQmmh8Skt+yj4JM6VrTRu0w4LaSSQdUSfoAQj7aHJFTH9ygRO473G+KzouDzJ5GtIE6PwD85IRCys4MvHtLlX7JteU1wSj/Ug+dosqh+b50Xbj/MJ37s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=h854CENr; arc=fail smtp.client-ip=40.107.20.80 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="h854CENr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QHHIbJk85mGZ8I2dnCfzjQprO883BjJuROxua05sD+qHCIrfHOZ7wmzdFq31hP8iSWpBANmk8+Iy7/D32QnpfrR4+DBYubqKLAzsaRx264qeOA0e3hfoeRCvfD3QNQ02w5kQ+gXnfR3XPeYv38mnrXXzNFwYITGkyYTAzXkxZJJEYOzPUOFJZZ3wXSJssUaBx1mLJ262K8hu/xF/Yjbzs1ygEXjLS5ILtxjwVcaC0r4LwJ7s4xoBx2CnGjyecnKnnTK2xXo2gT9iRgxpZ8KMH3K+hCH0R/a6e55T9CcBIOgGRheZleyJCFkWSgt+LvG9wWd3Lsmx/3SX178ngeV85A== 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=7qxURBpFjxq0DXD1aCXUxlnHxtzbNWVb0HgjT7V5ZpI=; b=jUlLrJNZnYaILeFjsbP0VpoC/RuQjTk+TTzb4vxgl/uTrslLHptx4h/PuvNR0+reFFlpdHGc2Hf5qgfX1PSfSxeCQgUAW5h9bIr+DYoD40YbLvWFiRhZB02sZCyn0DKsRHWZrEw4PTKVbl4YqmN9nKIvCA2A14pShE69R7jiHRXE/d/M4N7vi6oK2/h70Le/A2/oJdg/TAkUfL5t3Fetm8/EnFOv0SgHtzeEAM8k9sz4OST4ZhQ+tJCJLGJeEtzZuwsFf1fLnufqqZx5+blfLfCdcyerdpH+IGrV7peGq/cokqF8meyp97TXuWUyRQb/m7Wlwdenf1RXDre9rFUnpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7qxURBpFjxq0DXD1aCXUxlnHxtzbNWVb0HgjT7V5ZpI=; b=h854CENrQQbKZ1Kbhndglu4CFEntrb2/9OS+rC8WpqcCYyyn4vKisCOiqHG0nQ4FaR87M/SQSPiZEV2eLTBXtgAGWfZxhGiPTbxtlgbJdUM3hC55Wo948W8j54pN7pObSCQftebCqj72259YU7M2BA1o+5JFia+yaaj9+oO9Kes1IlpYbVWNATYVdY6X9QqfNY/+dwD5nZfmJuNIPAKRrw6dZjfaiuGJXJgwdt70xyvOBMb4QV4DWC8rJwplrrnQe1o3+CN6LGDbwHfz5A1rOeqMzdkRygHEJSElRcaF/zocZXaZV7th1fSvW44A9+fGiOrWwjfbhDrECs9wKTKXsg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from AS8PR04MB8216.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::22) by AS4PR04MB9266.eurprd04.prod.outlook.com (2603:10a6:20b:4e1::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.20; Thu, 27 Feb 2025 16:01:26 +0000 Received: from AS8PR04MB8216.eurprd04.prod.outlook.com ([fe80::f1:514e:3f1e:4e4a]) by AS8PR04MB8216.eurprd04.prod.outlook.com ([fe80::f1:514e:3f1e:4e4a%5]) with mapi id 15.20.8489.018; Thu, 27 Feb 2025 16:01:26 +0000 From: Andrei Botila To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, s32@nxp.com, Christophe Lizzi , Alberto Ruiz , Enric Balletbo , Andrei Botila Subject: [PATCH 1/3] net: phy: nxp-c45-tja11xx: add support for TJA1121 Date: Thu, 27 Feb 2025 18:00:54 +0200 Message-ID: <20250227160057.2385803-2-andrei.botila@oss.nxp.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227160057.2385803-1-andrei.botila@oss.nxp.com> References: <20250227160057.2385803-1-andrei.botila@oss.nxp.com> X-ClientProxiedBy: AS4P191CA0010.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:5d5::13) To AS8PR04MB8216.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::22) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8216:EE_|AS4PR04MB9266:EE_ X-MS-Office365-Filtering-Correlation-Id: b7195286-e2c6-459f-30b6-08dd5747fd35 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?gC1PRlHMLhHNnEi/u83Zc4N7LlB7zns?= =?utf-8?q?x1nesbNTrYsjg+bKmwrlOV35EcV7wALt1Tk5HSe4fnTWqXNH7mxj5tTiaTyU1hn12?= =?utf-8?q?AI6YVn0ZpTwFR92u4X7A2h0/OJu7qcML23ZQHZz+zI1NkYz3PXvuteSNuUQjtbRq3?= =?utf-8?q?XnvtSSbpYHDx3DUG7a8vaLJAxSYaj2DpKvPPvrvqEcWcT3r58M9roUHEisr+pmzLs?= =?utf-8?q?i/V68FG2RI5+5PiM5tetPlsPn4Z51bQlZGgzwyg0nyTxDp9V7rdgmrZ2cPENm/aUf?= =?utf-8?q?sPqZeujBFIowus6mJyNPyQFr7zg+INFjJePJMEtjBvUH1SWrvqcYMrpcK8A2s9Nnk?= =?utf-8?q?XqxHsAEOeCTpqtsmg1QwoJPxde8AjnrNwh1WIVNcUrZIQXjxL2lYortHA3At8pPmX?= =?utf-8?q?pBnr+TM9q+Xz16Gre/i4Zpgk+JDuJmFeAEOGTs20NH3jjhe/XsYMQ67v2aR4OGlkE?= =?utf-8?q?BV5B0sQtaXP61kuZczJBXq2EibK05pubYuRswGWA2FwTcRU99B+HpRGnj0QhSbhrV?= =?utf-8?q?haox6xL2HJpvhsE98DBse0Ss30Bd3YcU4JH4KqN8gxBX+yOlanJ+et3sp/jY2d8eg?= =?utf-8?q?s5nqQlZ4V1IhB88fN7qOlQ7E5LVzYCjC4+lrQNLFleKt7hJp7J/gCwiJDOQuUAaSS?= =?utf-8?q?AoV8I202OZLUWPAQTpJE0j1+IC9spAon9BDCGamJQ/ABfujNWzf9MaQl9b8FD7IvE?= =?utf-8?q?UeHuwRixR46L9kokwFW1Tj3RBTR6+9u0Em8fDsAc/Na8XvJEeiweBbR/lPI8V/ZGx?= =?utf-8?q?IWXWhPMy2S0E4CBFoGmcDrA/nK2y59+ACwIU/DnvwdnURLGJKTRpH5HPGOW2J/RdL?= =?utf-8?q?uJ/yahS8hD+U6ecunOnA+6u0PwEFUuqBQzq6oO86GSErcF1Vx6DuGc/FBUrOxTfXn?= =?utf-8?q?PDiHlNq3veGcjbRFHhHBw98If36ykIjUbofbPsy4NujLuLp4nTNvd0B+UDVhP9EEz?= =?utf-8?q?klT8VX1L13p1eUa27d2XKAz25jAz0koP0T39mQ5B/uQNB1axdttFb3EtLlLn2//Ha?= =?utf-8?q?Z747jQxP+YUwixMWBHgzRo9AA4SzPNe8rIm+BzevYIu5RxA03MK12S56UNxAd5LvV?= =?utf-8?q?+vDXMe7DQvRB+JZjXd4X8DJxn/SH4+HHjuWr+09WvWlcZXkguKuvMU/xkhtFgveFh?= =?utf-8?q?y5b26f5OA7p1aZCCe1FS/YOMoP1dgaOmU7fipC+QmNcClLYkJhIgyCPSfjhqk7UTg?= =?utf-8?q?oAPSAsyJxToKxnBmHw4grDXqGZ9RxeoLHrXxIEGeh2wNl2E0RQDKeUBifm8NLbWhj?= =?utf-8?q?sSQnISy0CBfQn67TKe/qkpY5x8IMZjICNfp8i+Q55aY1WAoECZcyc6TbtO5PffMsQ?= =?utf-8?q?0exMH+1WUSxE?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR04MB8216.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jjvy3yfhUo0aoNDM6rcitKbDmXGe?= =?utf-8?q?xHwWHOT9Qu433MmnMwNywOG+qw79w9U6D9vvKSKzom7NHvXzZTwixjOFD6Vk0gZ12?= =?utf-8?q?ZR55qFPQFamoDYuLrBb2OnKsj3DjP82Ak7+WXL8ItvyvYrrmVRGBgXPVlo01Wxh7y?= =?utf-8?q?/vpZVRXeEJOuGZ6vUOsRZj7iY8PGldviSOn/HUSBa2tSerlTbvXkdPtgW1pMZD2Ro?= =?utf-8?q?J18WPp0mgrFZB38ao4K8LIEQo/l9f4ZHmYgW4wwnqCJNTqCDubXuVuuCRxXvcx6Q3?= =?utf-8?q?PJECLocE7ZAvONQ9Jui+Rl482oKQKSSwepZbrUH0gyFG0pGyecxlGe42yIThGt8sw?= =?utf-8?q?yhejM/qrvVQ/vvDLJQoYnc91iJtY0QQqnSJIyYMk+pdiJWLIvllwjH62qsyJFR9ME?= =?utf-8?q?1wMDoqoeKl9tZRJNNlQ1WQ98isM6A2kCPqVrWiqf27Snslj78VaPiiULN5H9cxgf8?= =?utf-8?q?Qg4JFRRlD9CprAC1bJaTOsjg0RCLZw3X4q+SzyoVBd3GSfl2QZOk3sb1liHFjGP9g?= =?utf-8?q?aSJ/M9FLyuYv/WjCZ9jE8t1JkKDz7sqU+XWj4ipG88KwQSw7ydnryJ1OCH1DajyIj?= =?utf-8?q?Wj9kCRcwIt64NkcY6vjXlZuE5PwcGM6LzjEp046AzLPgEikNt2KwYLu8xQp40xi2L?= =?utf-8?q?ChAkkVh3IkbtP6UMgSwhwZCnAUlrLZI7vkIbqthuuwV1gOL6p/kXGyoL6+dU2UYR+?= =?utf-8?q?Uc3z10XGSn5cE2xE6m9yGPEI5AQN5QscRUaVc9LKGl00V2DZcvEHtblbSCeGyS4C6?= =?utf-8?q?um5yHraGzRItShcpyCS144B9iiPHwPfaEsMRVq3Npem6YxIesKMfcIWndeAiz0w5j?= =?utf-8?q?MJrrUucqL0feS1ZDJYaU2Uo13k89eBt7Mq70oP20jy/LtnQLnDY65kSmeGUlGQDgY?= =?utf-8?q?RvFKv8Ua+SifjPOpSftsqHg4oH0KLTZSmnefmuBGVhPrOmKkFETq/nnH/xb7AMtGv?= =?utf-8?q?bEUuy8+0QF4FMMpivmsXyt/3y3yuYENoU2mIbdyp5jAJOveXovyfWu2ETtXn7UvEi?= =?utf-8?q?LaetQARn8HrsYWaf587sI0p6sO+cjmOBkycAcwHJuGpbm8Uq2z+ZMOHVzNm123whf?= =?utf-8?q?AJCAG33S11dhGcXaVN003h1JAYtNRgUX+/O+ezDjdGmyf5nA7zXUBip5/cMep0IDM?= =?utf-8?q?rsenHUIK2VIf9SHnVfgg3tb+Ool3Eldn74aE4qj+aOzyBORaMvTOAbOTfE/1a+cAy?= =?utf-8?q?u0u0zzQq/Umon5N7ELhQcgM388i69kriS1csEi1vANOC9aPIoX13CQmok/SjXM7NV?= =?utf-8?q?4hZ9tnWGjNJsot6JwMMPFSfXEU03O/jjJJb7R6S5d182qaJzOCJ8rdxUhHU2X/cdi?= =?utf-8?q?fVN8RQtOjpuus2AtZnOEL/s6EqQW5rEKuHoUmTW68eVaIjerX5/6bL6ea5bdDv/55?= =?utf-8?q?u+J3UMLYDX/KV/Lfv2+puMv2LlD91PAY0F8ELuoYSUlQlpDluglUWGK0jxOphU9r6?= =?utf-8?q?q683jrraEvexUP6x+AmCUd4wF7ZU3sC7N8Dg1flTh0/wePw899aL2jzUUeKBBC0O/?= =?utf-8?q?hRo1Gu35TMxr?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7195286-e2c6-459f-30b6-08dd5747fd35 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8216.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 16:01:26.0524 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VJu3mkxzd0hykfMbPXLc3D5uy2gtMQCCBjeYWnWQc5ph19HpC9HZZRmrXExqopzy74CpEnwAgnHMqOsyP+O4ww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9266 X-Patchwork-Delegate: kuba@kernel.org Add naming for TJA1121 since TJA1121 is based on TJA1120 but with additional MACsec IP. Same applies for TJA1103 which shares the same hardware as TJA1104 with the latter having MACsec IP enabled. Signed-off-by: Andrei Botila --- drivers/net/phy/Kconfig | 2 +- drivers/net/phy/nxp-c45-tja11xx.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 41c15a2c2037..d29f9f7fd2e1 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -328,7 +328,7 @@ config NXP_C45_TJA11XX_PHY depends on MACSEC || !MACSEC help Enable support for NXP C45 TJA11XX PHYs. - Currently supports the TJA1103, TJA1104 and TJA1120 PHYs. + Currently supports the TJA1103, TJA1104, TJA1120 and TJA1121 PHYs. config NXP_TJA11XX_PHY tristate "NXP TJA11xx PHYs support" diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c index 34231b5b9175..244b5889e805 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* NXP C45 PHY driver - * Copyright 2021-2023 NXP + * Copyright 2021-2025 NXP * Author: Radu Pirea */ @@ -19,7 +19,9 @@ #include "nxp-c45-tja11xx.h" +/* Same id: TJA1103, TJA1104 */ #define PHY_ID_TJA_1103 0x001BB010 +/* Same id: TJA1120, TJA1121 */ #define PHY_ID_TJA_1120 0x001BB031 #define VEND1_DEVICE_CONTROL 0x0040 @@ -1959,7 +1961,7 @@ static const struct nxp_c45_phy_data tja1120_phy_data = { static struct phy_driver nxp_c45_driver[] = { { PHY_ID_MATCH_MODEL(PHY_ID_TJA_1103), - .name = "NXP C45 TJA1103", + .name = "NXP C45 TJA1103 or TJA1104", .get_features = nxp_c45_get_features, .driver_data = &tja1103_phy_data, .probe = nxp_c45_probe, @@ -1983,7 +1985,7 @@ static struct phy_driver nxp_c45_driver[] = { }, { PHY_ID_MATCH_MODEL(PHY_ID_TJA_1120), - .name = "NXP C45 TJA1120", + .name = "NXP C45 TJA1120 or TJA1121", .get_features = nxp_c45_get_features, .driver_data = &tja1120_phy_data, .probe = nxp_c45_probe, From patchwork Thu Feb 27 16:00:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrei Botila X-Patchwork-Id: 13994858 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2087.outbound.protection.outlook.com [40.107.20.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A95331B6D11; Thu, 27 Feb 2025 16:01:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740672095; cv=fail; b=oa2EaFBxcFkVAsh8QS2OHkZZud3HSiJY8Dz4Iro6PnbCcFgLpIW8AnaYqTmqo+tAnoadlnwULPz/ipsKvpQKz6wIXtHRA8YDpkJLt6u9RlCi/yPbrPEAfT/abRGslMiik+7qaOsyiiU7OssH91xa1p/h7oYSCZwG4aOGg4PRB4Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740672095; c=relaxed/simple; bh=D6G38t2+gyGfHIr9jb80oFhs+nzd/fSqSocaP2fWc9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=KwuhXtkJF/yVZFe0d76qltkg2dZCGtiygSmDyo2TEN9jyUnPTxBuw6GLj03fUvGG+HHkpUwiWvdCXrc6Puwx3FWw8rCdJGuaDxIaqBMbU2j7nFxS0zYQEJlS+srPWaJ8tiBv/2QAziHQqnTuzsO+fyo5eZERd6BArLxEE1R82NY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=adRi5tFM; arc=fail smtp.client-ip=40.107.20.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="adRi5tFM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=p5L6FvoKkDPUCS9SgfRYNHFkRgbZtBxkXpcVe6Q2SLTnyTh7xHPpk2mD9XkpcpRTH15djWOKRfwimH3/SYMt5kj0btzSFQQMI26TT4H+ToofLrc6/6s6IwrYHKtFHfDQf5mhAifDlcs8aF3AdZBlYdYNXmaktEle958uHtLZsBETFt/uWGauxMMD2Un1AWIUv5TGDLZJ6BGIShOn0OnF4LQJVEUazYzsBxMXYWvZ/PRiCpHSHgO46puhWppQXfRaKUR/x9u+gK+Di4ckxLsOFDbo0K8JkcN5Yy3hBDa+/xit5RQ4RLXCnrYzLK7UwS20vaZw2w1vSI2dQS1m1g5P0A== 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=mBnaSNSMCRzlPrRdSI/ml5Nvf874rRR6AmHmEtxxu3o=; b=mmfjnxoZhxtfBJfpuqSWsZsF7uuMb1eH0SWnOLzd1RDl2DzyZB1dDeR8naSL3IljZnFlX0ldwiSQNhPVf6lvp13f0AEgWzGYMIfzx0xKo/e7BPg+VQ9K6C9fmzKHpMaN65f4fpnqfU86uxJpTOBLzDBLlrDcDmEKAoe3Mx3HRis3RP2bCWIKhGNXE10iWqtP8kDuWIEUrRCj0GXC2Jh3+FPOxkepUrOpwJaWYeKaScYf4zQTlSA2zzvwjXCFOxW/dKpy1hKTHDTp1Kot5WrjOgGrX121YkPagu0LB7HOyVMCGnFxQSQMizWo5FWCs6WmqRoTeWgrD+pbcr/QtJhY3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mBnaSNSMCRzlPrRdSI/ml5Nvf874rRR6AmHmEtxxu3o=; b=adRi5tFMk1o+UFr7dwJiA7ItIiPru1x5Ee0R9kLk+KxVN5PbqdGP/FiTwzuzefyQSPf1/zGF82ZJrJdnJyatEqhhSJwrOxl2+23ahi+I4HulJPPlEHMhRi/R4WLMMKOHl4qGjGfFCQmEj1nF5EQ++2zwUoodjH7KRaMOliQKs2vyS2gIwKvwaMK/pmYCeHeMiX6rGVfOmG4IoemET2ddv8MZMqnjNUORFqqC2vCTeQTFBB5tZrY+vOCDW+S0zp+k5AfikVYLyiUNFeZ8lu3hm8WwW9/g7T2Y9iwXBqPRc7vYYSUbl12XPhuskRL0nGleJwL405YSgYYzSXoyuDilSw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from AS8PR04MB8216.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::22) by AS4PR04MB9266.eurprd04.prod.outlook.com (2603:10a6:20b:4e1::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.20; Thu, 27 Feb 2025 16:01:31 +0000 Received: from AS8PR04MB8216.eurprd04.prod.outlook.com ([fe80::f1:514e:3f1e:4e4a]) by AS8PR04MB8216.eurprd04.prod.outlook.com ([fe80::f1:514e:3f1e:4e4a%5]) with mapi id 15.20.8489.018; Thu, 27 Feb 2025 16:01:31 +0000 From: Andrei Botila To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, s32@nxp.com, Christophe Lizzi , Alberto Ruiz , Enric Balletbo , Andrei Botila Subject: [PATCH 2/3] net: phy: nxp-c45-tja11xx: add TJA112X PHY configuration errata Date: Thu, 27 Feb 2025 18:00:55 +0200 Message-ID: <20250227160057.2385803-3-andrei.botila@oss.nxp.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227160057.2385803-1-andrei.botila@oss.nxp.com> References: <20250227160057.2385803-1-andrei.botila@oss.nxp.com> X-ClientProxiedBy: AS4P191CA0006.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:5d5::17) To AS8PR04MB8216.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::22) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8216:EE_|AS4PR04MB9266:EE_ X-MS-Office365-Filtering-Correlation-Id: 0997fac8-bf3b-4e21-c845-08dd57480018 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?QNj3o4BNYnyYjk8DX5P7KuitODXajA2?= =?utf-8?q?AvwV/DVXXy2qGcrJeCC53Tnn7DiMV/2H3KKfeoiiWGws08epJYE77LWQxz2wr3z5d?= =?utf-8?q?X/AvnDtqOAWvPC/2wo/s0NLOyx7OaHLp2wqn7GvT1xdhP1+wrhgDlbYcCCKXmX24E?= =?utf-8?q?VeyTMDz8DOaUGlTSRBlfzwcPJv8qQfW96b3IZU8GUb4s8dWoML8MskwNNav+NMMSW?= =?utf-8?q?DZgWNebToAMUFO5lDs1NWaKYwXax/687pj6MMN7ATzp0XXcXplqvUkqvaOT+0bdE/?= =?utf-8?q?VFAqcmM9Sdt5exIMhGgEbdoNP2rt4iQZwKixWFouyKSM54938wxitVQiLvKuxDwoH?= =?utf-8?q?/mQlqEY0aZU7/C3S8jNVYVGCZpxWGo9ozSJUYEcC8JG4IZe+Z+7G65yiZoFIRCRvN?= =?utf-8?q?gCXN/a+pzAXqtQVqO/DrPYNqoQ/iwsbYOPMWTFOgnZwO7ZUifQ5x949zorUcBFjKD?= =?utf-8?q?naMI4BDN5n5/fvGHUYUStqT3+ZlezBr6hwwGYEnOvoKu4xGL6EfI3gT65u7XqdJgd?= =?utf-8?q?FrVsZF+nY7eBXfeqf6FYJkeSr+diWrCth8E4vg+Bb8Ktv2L25Bz61LcFVErUMqqSZ?= =?utf-8?q?WkMUYQhQWMf6LaOMXCWSFBAWajF3Hw/6glVYX6L+Cg6d9PztxSRwVBLEWbYoRAW1i?= =?utf-8?q?tod8jdi3i+Kvu4J01dbxLtFeTE54XmT1qt4JSnd8NL8hmTitUzF1ixLXBZ5bufk3e?= =?utf-8?q?mG2ssEcJDD2g5McLW1NAlRtjff/98TfiMNfN+Qow0wiOFR5FZRAbGTH6Um3RixlM6?= =?utf-8?q?bp5zzKYWvEgn4Rz+eMRqkCWrwY94aiz65rf9DTk/rDS+EKzbkZxoiTZYTi//ZK7XB?= =?utf-8?q?DdQsUg49DE+M4WkwwuBcEKX7I8eph1X87oOLs13ZI8tWoPThGntf6DKHgievYFPDf?= =?utf-8?q?r5NilbLxADN7d/fp2ZLH449GuKRjKhX/fjyYMEKDuXpjeybebudRy8FR/7oYOwTkO?= =?utf-8?q?81U+iUTni+7jWisozcf0PREihxdEhH5VZU+6inWvjNMzohWL0iEmu6m/s9BqM7iyY?= =?utf-8?q?iRgANIL8+QY6+colTp3D5XxZULujew5f7+aGpANgrP2IxHNNsCSbktG+jEkCu0pYm?= =?utf-8?q?YB9yK0/j+xS6mhcmsspK3Rpxj3A9PfWwal9HRo5xD5S6rRBReIraWBTnGv3I9kRY5?= =?utf-8?q?QguSMrBlDex9zdn+X4fHelOAFMO2RuSReMSLIqiLsPvwCNRMnElMeAb6AMJdM7zYt?= =?utf-8?q?tfAhbU98/egWby6WuFn2iB+YUkcvCkg0CEAbmyfUMQ/+QziwjJxFzvDe9ubZZkGDF?= =?utf-8?q?0ZAxzdUx8514B1AuHv4YMb8cv6wr6TAaUFe5CItfnKbZpzP8suRO9rmfM18VGt7ny?= =?utf-8?q?0Z2Vg+RWX8iF?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR04MB8216.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?40ELG2o1QCt7LSLylnPevE0GRHYK?= =?utf-8?q?5suYMggLvpb7igAw/8aiHC3RsJT8ls3cqbmSu2GdlgyX/nkBvBOCRgh8BaZheBG29?= =?utf-8?q?fqIfPsHj1EvuETSR7Fh9CzO1rj3pjUvCzpdQQlckyOk1g90tDixqoCDoKspuFENB7?= =?utf-8?q?06fCV5300AJLFJNv/1AvM7TQXlpKepM3PRo5MpWOpqqxKEY7E+hi8fXHBoKIdwV5B?= =?utf-8?q?jnTdupiRBqp57sJjU5aDkg6v+C5o2FgYTcM7+LML/R6uiVMmO+5J1j0qp6UyCf58J?= =?utf-8?q?kStvLRMhk+hISf1GCq93BSdyka53a0xMXp44ptIdZsXQgKKZxV2HB+oo4jsCGYQDe?= =?utf-8?q?7eLYpyBEmyfS1hyCXIakmHbab1fSInQV1y2tWJjhYcY0pwWjbJBY4fTU31FKiNn3i?= =?utf-8?q?aCG4SJH+LbXsvNrTMH8YXm81EgSlaND6Wn4x0nS+zo35EWsp/H/CPKMnNbcVE/wS1?= =?utf-8?q?R6SXP+yWHM3sns08S9Q/LS2kaS6eS7SjAOf9JNHYtK5fvexoYhnIfqzmpGqqrY/+h?= =?utf-8?q?ROZ5SSZy1tck8TUdX2wLhRx2HmrML2lgArsAvDEUSKDivLVM8O5P5ed1G0CysRnKA?= =?utf-8?q?AnjBA8bFM2LdZ3yNOoeNIvc58jq10bxwNalTd1PlJLN5OYT9GJSJR+UwjgjG63pum?= =?utf-8?q?sSXQD2luY3KA54rFYYQNWQXJdn5G3wm4jjrcduFYhJvodZGbBa+cuIRVffrq4EgpA?= =?utf-8?q?a7hGJQKF9mseQXCi2IJKwi5XRSCh0ZV2AY03tuKoH6axy+Grx0fs1cXYWZvaeYGFv?= =?utf-8?q?sM9qgLjKtHL00zH71MDE/h1imJ5qyA5/jZehOpAa4fQF2722FufgIxvb4jRHZBO7N?= =?utf-8?q?kb4dHNyXOedLZp9M4/D0JgkCW0VaXECTFHDC35zx6sahjZ2fVyQZAyJbVh2c6H0hx?= =?utf-8?q?W8vy74hawPmI44PIS1YPfj41uN5SuN5LBLjipoogpAat/PEsnvQLH39pmVxYAbKlK?= =?utf-8?q?LTBlo1frJWqj598hKKgtbmsmuakeKposwX6jj/Xq1PkoSy6WEl5UsWxotgXp0csz5?= =?utf-8?q?RiNCWRYe2YtxK9BvQV9ZT1P2fzWbabZ5EPNZu7dnTiKpoXbVTGRE44s/US/ezQKre?= =?utf-8?q?SMrawP0rg3zb8Usy4aiD1AZ78B5ngU6xyxpPv5szsxzE+nQt2iS3ajd7rVYpCBvGv?= =?utf-8?q?WzPABdENvmRAhd0wqjAAdC+Fpwr99j0uidA+G0o/jnE156dVUQue0Pc6lufhBlF7D?= =?utf-8?q?ZwOdwz/j8fR2Iym9KnjtPMsH1kwkS1KjxHIK5Yvr1dpmLykmWwTXY6fQ/noBZ6sok?= =?utf-8?q?qxDg/uILS4Eey4UXfRObISPGNwvSmA0Kf4Q6XFPk64InohroRHHQg7UlDTi0HrUNX?= =?utf-8?q?AJXrS3KZ+PLFBCDSpNqvA1neR0RJwnQFxgwgQBOPO4hZLghPNxY8Tjjl1PsO5QPyZ?= =?utf-8?q?8/k5npqVqpWW2g4p/3bUKwIV6sp0x1HQVLCOq4JBSbHeXcVNoDNu5oiVxCVS1tUbm?= =?utf-8?q?0ws8d5cp86tvBNNV5s0K4kvZMLe6JgiK9j5xhRm4l1v0EdVMem8lrorniR4SfRqzg?= =?utf-8?q?smdBuXvB/2zj?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0997fac8-bf3b-4e21-c845-08dd57480018 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8216.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 16:01:30.9192 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S+33ZUGi06YBMpZPJ5402mrMu9HUzvbUPcrs10CDk3SLS8zyxtED3ffMQ9y+IT+2RXqtnVhNOhHq8XfASc6eDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9266 X-Patchwork-Delegate: kuba@kernel.org The most recent sillicon versions of TJA1120 and TJA1121 can achieve full silicon performance by putting the PHY in managed mode. It is necessary to apply this SMI write sequence before link gets established. Application of this fix is required after restart of device and wakeup from sleep. Signed-off-by: Andrei Botila --- drivers/net/phy/nxp-c45-tja11xx.c | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c index 244b5889e805..2607289b4cd3 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -24,6 +24,11 @@ /* Same id: TJA1120, TJA1121 */ #define PHY_ID_TJA_1120 0x001BB031 +#define VEND1_DEVICE_ID3 0x0004 +#define TJA1120_DEV_ID3_SILICON_VERSION GENMASK(15, 12) +#define TJA1120_DEV_ID3_SAMPLE_TYPE GENMASK(11, 8) +#define DEVICE_ID3_SAMPLE_TYPE_R 0x9 + #define VEND1_DEVICE_CONTROL 0x0040 #define DEVICE_CONTROL_RESET BIT(15) #define DEVICE_CONTROL_CONFIG_GLOBAL_EN BIT(14) @@ -1595,6 +1600,50 @@ static int nxp_c45_set_phy_mode(struct phy_device *phydev) return 0; } +/* Errata: ES_TJA1120 and ES_TJA1121 Rev. 1.0 — 28 November 2024 Section 3.1 */ +static void nxp_c45_tja1120_errata(struct phy_device *phydev) +{ + int silicon_version, sample_type; + bool macsec_ability; + int phy_abilities; + int ret = 0; + + ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_DEVICE_ID3); + if (ret < 0) + return; + + sample_type = FIELD_GET(TJA1120_DEV_ID3_SAMPLE_TYPE, ret); + if (sample_type != DEVICE_ID3_SAMPLE_TYPE_R) + return; + + silicon_version = FIELD_GET(TJA1120_DEV_ID3_SILICON_VERSION, ret); + + phy_abilities = phy_read_mmd(phydev, MDIO_MMD_VEND1, + VEND1_PORT_ABILITIES); + macsec_ability = !!(phy_abilities & MACSEC_ABILITY); + if ((!macsec_ability && silicon_version == 2) || + (macsec_ability && silicon_version == 1)) { + /* TJA1120/TJA1121 PHY configuration errata workaround. + * Apply SMI sequence before link up. + */ + if (!macsec_ability) { + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 0x4b95); + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 0xf3cd); + } else { + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 0x89c7); + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 0x0893); + } + + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x0476, 0x58a0); + + phy_write_mmd(phydev, MDIO_MMD_PMAPMD, 0x8921, 0xa3a); + phy_write_mmd(phydev, MDIO_MMD_PMAPMD, 0x89F1, 0x16c1); + + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 0x0); + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 0x0); + } +} + static int nxp_c45_config_init(struct phy_device *phydev) { int ret; @@ -1611,6 +1660,9 @@ static int nxp_c45_config_init(struct phy_device *phydev) phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 1); phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 2); + if (phydev->drv->phy_id == PHY_ID_TJA_1120) + nxp_c45_tja1120_errata(phydev); + phy_set_bits_mmd(phydev, MDIO_MMD_VEND1, VEND1_PHY_CONFIG, PHY_CONFIG_AUTO); From patchwork Thu Feb 27 16:00:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrei Botila X-Patchwork-Id: 13994859 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2068.outbound.protection.outlook.com [40.107.21.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 989B51C1F12; Thu, 27 Feb 2025 16:01:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740672104; cv=fail; b=mwwW12Ix+MLQXqVAHXWS6JRh82BjROo/ggYi3Yd0hRI7dHmhtbgaa1b831H3D8oRWdR8q2GmO33HUAGMuT9oyKbadp3Cl0Gu3m2PiOhvFDrlTYKYjYqOuB5R3aGm9Wml7QciQgBjmY2GPHImB2ILtinNb6JUJ2mK4h6GHbuk+io= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740672104; c=relaxed/simple; bh=T9zrsyUNtUyiKS8TzG6HPmP8BfBWAQnfck+Itfm5CWs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=BI8xIzmTkGqEdj5Z6SP/TniIbmFkQi1q4Kz/AlirpQSjet2kzCd70DVJCprxR/nrBUjdgv+zIMZQ72E9QCA0R3TqfKnRS/kerfIYJy2xvOQmGf6nH4asBg5bnzlghpKrKGHAwA7YE3FnRCBf2l0CF1k2Gb8GrTfGGVJfBVcxOEI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=ehl1KWKz; arc=fail smtp.client-ip=40.107.21.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="ehl1KWKz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HCVu15tTDktosbvq6BRThk+jZ9SzeDFpJdijF94PzD4GOrbcFGaNoGmXGM6Z0wIev6H7roIZcRhAM4FExQkIwSF1HQHGlYfvLRCFBTqVsWKePKDUjGQ4e/Ns4esuxYYhpQ77ovui6TBiXubxKoDd+AwyUu0XeqkjT1TGd0CVG8nq3yg9QHfHGLT0KVAwBNa7BU+WQW+qxmzBzJthdF53TOyJa8e8A1djcYAKc+QjhQRqxqflG9M6T7MxpZh4cCxigxs+1cdLW/d/Cq2lnMOhoIkq/f5WJHxVZ7LP3GI/6+AC3FpPClClFDvYuzxVsbl0UrF/2oyOHsJoQS+AK5oQBg== 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=GKFccNKLk6bXrLGVs03QGGShzGfrL3dftPZIgxLf04I=; b=snUxI5eWrUJ4OJjK01yTKyZoVDQAM76mlrfvfB+HCwAcvlrWNNp7+mEfX/S0j+PjJgP5feRdnAvJ/9OTC/aVlqulfEvhPSfw3IN6VUl3RqQbbxTtnibmvySRjxUofEexfyiT8GhUvdO/bR3f8z2eMwXECtFKbVIA29DTK6CirUPuqebjLxnqY9M/j/J1QfyNCMO36GNLUbCZwkIXzMQFGhkA5GUYK/hKe6sR876YOuf4MmovHqIGIjDtjPpssA8qOILz+wg5GUcxKIFNEtsR76W0zGjSzEbnLoPqyjEsWauu2wRzt4kOX/+Z8HeBvlyCIKmA2h9EIWauKbjahuxtAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GKFccNKLk6bXrLGVs03QGGShzGfrL3dftPZIgxLf04I=; b=ehl1KWKzdsrV+Ksaj731xebE8XqB3qaKnMSUVQGtRY4VtXZ+4VqHs8NedvJXJloRYb7YmU8Wr4bW6mRofwZjh6Ekjfb5k+dI1n9MdKHmmeNBgTDcx5m/s9h30XEUXZ/3wytzmHfs7WgePaPS4BALlMcdhlM0QEJY+17LxNpKQ12pYbrWq/nEEWOS6tEr+zKYjNQAAufAousqns6eJbjw3I+5ZB5YymPkx3Yk6Jky1PSEUfn4HTO7QJM+U2HqYb8inNbg8ysFHvohLn77zETvCS6xrTkgJGVUDNKJF0MUruIPYeVl6G8TB+7+l6oit0NwzVlliPB6cExL07x2sGCoUg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from AS8PR04MB8216.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::22) by DU6PR04MB11229.eurprd04.prod.outlook.com (2603:10a6:10:5c4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.26; Thu, 27 Feb 2025 16:01:36 +0000 Received: from AS8PR04MB8216.eurprd04.prod.outlook.com ([fe80::f1:514e:3f1e:4e4a]) by AS8PR04MB8216.eurprd04.prod.outlook.com ([fe80::f1:514e:3f1e:4e4a%5]) with mapi id 15.20.8489.018; Thu, 27 Feb 2025 16:01:36 +0000 From: Andrei Botila To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, s32@nxp.com, Christophe Lizzi , Alberto Ruiz , Enric Balletbo , Andrei Botila Subject: [PATCH 3/3] net: phy: nxp-c45-tja11xx: add TJA112XB SGMII PCS restart errata Date: Thu, 27 Feb 2025 18:00:56 +0200 Message-ID: <20250227160057.2385803-4-andrei.botila@oss.nxp.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227160057.2385803-1-andrei.botila@oss.nxp.com> References: <20250227160057.2385803-1-andrei.botila@oss.nxp.com> X-ClientProxiedBy: AS4P191CA0007.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:5d5::7) To AS8PR04MB8216.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::22) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8216:EE_|DU6PR04MB11229:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f2fba4d-8038-4a7b-87bf-08dd5748031d X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?1C/gwVSR0EU6aLbWvQdX9ZDG3+N/3DA?= =?utf-8?q?U4DXr8x3qgbapvVeh7yEHhVdOgRZhWOG4Auah9+KKBZt+Z5JtEg2V1yxxLBys8OKh?= =?utf-8?q?k2rLteAHvONj9axGSWBOpo61Cv9dMyZ4B9CEqfruR0/UCffYaYMBymzAC3GAva83x?= =?utf-8?q?YzObG9meHKYuIkzX8DKvm2sOqFYqf0+FGDiWXFtP7e4pCpGEfCfOp7FqIFNwBYLwC?= =?utf-8?q?iXdO46iXizThNYyH/6iJ31CBxq+cDVvlNkir1XKyscBDcxAdezZHd3PpFBTlK0OYq?= =?utf-8?q?gZlAavuAbuYnMYy9dqtBzex8qPaqXg8h6ZZOBkvdgcUISB/t4A31fpKMfIYlDagwj?= =?utf-8?q?AI06m0tcNRiNNk0t5xw8aNFiW3s99jALu4VlccaUmEnysFcbDkahB6BhhTL/Vbpmh?= =?utf-8?q?elueiHQp9sYsR7m2EwLP/YC1i9rWNqxiFgzioQV1YoAP8yeJ8qfOAIR2cF2JEIoEr?= =?utf-8?q?9oKPceRfD6rxJVIJcF6zXkGXiEEJJ2B+lko7VIQ4tzxDTrDSap/WU9ATIWExw0T4c?= =?utf-8?q?5SZ8AmOmEigqloEUwikn52CNQ4MzqWGdfTl6LLmEihF53aZGK9RTsqhC8rDR2qY/D?= =?utf-8?q?HXCGUcHeGLZDopn/payMoY4pJGoL5QAO3JIoU3K+GjygmfWY+fzgteISP+ghsaQco?= =?utf-8?q?L5sjFg5t8G5xDBUVbU8RfynA5UxulaMNYgriAFPJsnNpsMemPdxh70PDby5+6w3yH?= =?utf-8?q?D5KV6ueQIklBbTO1roAfjqwbTux2aqU90VStesdR2AwBMf37jxB/+ba5x/pBEdcFP?= =?utf-8?q?nPCTdPHhEuriqYtlLcwLv4wRajUALk8qMzU37d0aG8S9ClrjOk54UADiKymoxTPB3?= =?utf-8?q?YEFuwe/ZFXtpU9BFd5ascVfuSXeZPT6BRu8L8NrtGlWR7MqFhaDDDgbVFcqbMEf2x?= =?utf-8?q?3dIyAAdirI/vYvGmHc1oUdEnK06qvpyB5UULWVUwHtDr2Grjbe+8415N4FN8sHKjb?= =?utf-8?q?OmNHAcGXZjJ0gjmCGfC732/r4ngxM+iqYbklA/cC7ldOoINduSH+GPUQDeXvN24c9?= =?utf-8?q?4b5cm9o+Sv5g3D2x2LrDrsnIjUiV8JPI9oP4PpV+kfvFtlfbA00nKGT2M26ccwxnR?= =?utf-8?q?1ijVpP1hRgz0GwSQ1PySkKcy4OTVDrr4nYHs7UCKX0YfwuE+oNz270VkJElwcdjJf?= =?utf-8?q?lw8TxsN8O4aB5BGEgd92DAlpWm1agwyzvz1X2NcjCsIp1cozBrS+oHenmTt0mbjVQ?= =?utf-8?q?tLPNVF3YmqE9k1t7rvDOJlCxmeJfjYEwNFRPden9LoxwDLGzFlqQhwr22/Ve9KkBf?= =?utf-8?q?XT2Gtq+/xmV3HbdwaLFxniCmIe4/e8ajWErxYpW6lzPokErKi4NHPFBBIsWlw6M0+?= =?utf-8?q?/5D8x8O55+jP?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR04MB8216.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?GbGG/KZuxItfebtCb3mM56GqrvBs?= =?utf-8?q?qMr+TXd9j8CwcA6O+3N0DIEWrWlgV91mOG5ZlrNd00vsu8ZBx8KmOZ2OxiBNORJh/?= =?utf-8?q?T3Y7Ax95P4y5f3HkXJuASjPnlHFJ2msDI8Z5OjGs/Okff1MCnIGlYNwz+GdX1Dpgl?= =?utf-8?q?U9pCX/0U23QTEf0ittsadvEIrqSLzcZh2+ODvAdbcpiWs54CmIkn3mRnEqmOBz8p/?= =?utf-8?q?ZcyjXuqvW17Stu5ZJo96eZ+5w/EojPHP/7+ES+Y7iR/0B68Aj9wHswdwPFYB1VulM?= =?utf-8?q?2X6KUyBm2hItber4ndNPIcl9HI3WEQ5hch3ra4mtbuaBOo0EJ7Deb0QmS2dpitEWQ?= =?utf-8?q?Qsr9ctFacP5I0tQtsgcfgDa+yOBvJ6n/7efh00U++Qd3qqMD8A+Vxy1n5ryzw3Hdb?= =?utf-8?q?Wq8iOYbvDX20iWICQZaWfxIEyqLC3nqvFooQLW46ijyiy7lm6l1FTgbF43y46ri+a?= =?utf-8?q?oKWP6PEqaPsBcaIBW1wdfIQKLGbt7JONKawlnQJr2nmGXi557Gu+jbPyULF9iUAup?= =?utf-8?q?SQRJWVYtHJT/HM3kHngkhvljT4KwoEMtEqQaVPev/fCswrm1KUHfYmEsfJ04dcUAe?= =?utf-8?q?QYPmDBE21TC76YHxrhi1agH7dIlpL9eVzUUpTTeiyG/cmS/K6/YKz1/Rq/ACbdKcC?= =?utf-8?q?tj97zBF/ACXdLjP6NBi7pit/s0sXS9Wgmi4sNBYEZlK2OX4l3uY4hxFokhKxVXiLY?= =?utf-8?q?Rlf8CrXbgZHYtgAKs4gAkBSftzffUuYYyrgZFYomtV506Plux/PSPj+oBQ7tmaaLs?= =?utf-8?q?wOAspICwBmkw7tx1e205lujaT8AyPtolngp/Rz77wCdylo2qxGp/QS3u6iIPWIjWY?= =?utf-8?q?cCXPpIyl+E4GP8yl7riX8Raw4B9jqUMWs1BZynqrzXzdHVM1DnNZ9rS0TpOwWmZLK?= =?utf-8?q?8Asgr/LRXJM5VG6kQQHrrQ7/028pRUKmwFtcTQM4Ci4ZEsaXyfI4H30cal5MYbiYN?= =?utf-8?q?+RAgvdYdw5PMEAP1QpvXSbolgwek0uuMF0lG4ipYExTPXknsW7mPJKfNo2EO3RDwM?= =?utf-8?q?rH4JavC1CjnVEgCuzWIIpajFk3oUZcwHACskDIBZg8rFs04RsKZAlIhG2sghLm4lH?= =?utf-8?q?1xz+5CKfZN2gITkL3oPpEYqN9tR4ZYCa2tv5x3FCMWPDuxuVnNmjgX1fiOwwr0QnU?= =?utf-8?q?1qBYXFZzrlwAvBIjE+B4HmccOl3WckIsBdHLwHziNs/zUldQ3ybuzAfNN/SxPK0UR?= =?utf-8?q?svcD+PHQjBgRYQ/lBlns+OQcWhb4VWSBpjcAlTpZ8eUpdhg6sdbwURueOjOadC/aK?= =?utf-8?q?y9DSajA3ZOSfIOK5qlk/UQaiaTin01KQxW1o6wZ04wLEqLru79NFlJrNArORbdElx?= =?utf-8?q?XzOAlq+ARt4w1M3nX0flwHkl5yU3boL2lIRjfpgGMT2GoI+Hl74u1PvHSX/DxR/yh?= =?utf-8?q?aKUyz74Xb2YQqBmjZ/s1/JXvMhK+j56yhmCaBbzL0jnhD6zM7zNUBj5j3XJA16xpC?= =?utf-8?q?N38IspOW7o10IKf0lIoc06WJswLgLKIIQ2+q6uzTjSzv8mQscMAJ9c8YVMJwmU2tj?= =?utf-8?q?UmRy+qTJTVEt?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f2fba4d-8038-4a7b-87bf-08dd5748031d X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8216.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 16:01:35.9319 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5RoHLYvEjsytdGm3lOVP3AqNiSKJIRzz06sqLZ42kI7Smdggi37iviHdkh/HqsqDDJfVHaXzeubxn36og8FiiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU6PR04MB11229 X-Patchwork-Delegate: kuba@kernel.org TJA1120B/TJA1121B can achieve a stable operation of SGMII after a startup event by putting the SGMII PCS into power down mode and restart afterwards. It is necessary to put the SGMII PCS into power down mode and back up. Signed-off-by: Andrei Botila --- drivers/net/phy/nxp-c45-tja11xx.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c index 2607289b4cd3..d1de99bb3954 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -116,6 +116,9 @@ #define MII_BASIC_CONFIG_RMII 0x5 #define MII_BASIC_CONFIG_MII 0x4 +#define VEND1_SGMII_BASIC_CONTROL 0xB000 +#define SGMII_LPM BIT(11) + #define VEND1_SYMBOL_ERROR_CNT_XTD 0x8351 #define EXTENDED_CNT_EN BIT(15) #define VEND1_MONITOR_STATUS 0xAC80 @@ -1600,11 +1603,11 @@ static int nxp_c45_set_phy_mode(struct phy_device *phydev) return 0; } -/* Errata: ES_TJA1120 and ES_TJA1121 Rev. 1.0 — 28 November 2024 Section 3.1 */ +/* Errata: ES_TJA1120 and ES_TJA1121 Rev. 1.0 — 28 November 2024 Section 3.1 & 3.2 */ static void nxp_c45_tja1120_errata(struct phy_device *phydev) { + bool macsec_ability, sgmii_ability; int silicon_version, sample_type; - bool macsec_ability; int phy_abilities; int ret = 0; @@ -1621,6 +1624,7 @@ static void nxp_c45_tja1120_errata(struct phy_device *phydev) phy_abilities = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_PORT_ABILITIES); macsec_ability = !!(phy_abilities & MACSEC_ABILITY); + sgmii_ability = !!(phy_abilities & SGMII_ABILITY); if ((!macsec_ability && silicon_version == 2) || (macsec_ability && silicon_version == 1)) { /* TJA1120/TJA1121 PHY configuration errata workaround. @@ -1641,6 +1645,18 @@ static void nxp_c45_tja1120_errata(struct phy_device *phydev) phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 0x0); phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 0x0); + + if (sgmii_ability) { + /* TJA1120B/TJA1121B SGMII PCS restart errata workaround. + * Put SGMII PCS into power down mode and back up. + */ + phy_set_bits_mmd(phydev, MDIO_MMD_VEND1, + VEND1_SGMII_BASIC_CONTROL, + SGMII_LPM); + phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, + VEND1_SGMII_BASIC_CONTROL, + SGMII_LPM); + } } }