From patchwork Tue Mar 4 00:16:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrei Botila X-Patchwork-Id: 13999633 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2050.outbound.protection.outlook.com [40.107.103.50]) (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 E12B68837; Tue, 4 Mar 2025 00:17:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741047440; cv=fail; b=sJM5UaF2rC+jMnMApPOu9aiqoD9sC6YVPDEhK6tElutsRQ2cV3ijH3X6oj+n7wYSkxbzMH1NxXS9uNFq/sort6CT0TAhiaF3bpzaDDgMbXZpJfnGS3wFLttGgERCSiOjt2QAXXMtIO8Hjh7gZMDUONFHpuBPrnNm02Ah/bNBEBI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741047440; c=relaxed/simple; bh=vkGRRgxpuNLqGb05NXF7QLaV9+PhRkEiu84RvaQYHRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=GFoMSNnmLoYcPnGwdQqiqwWKo6L2e4b6upAqnJq49M9uxhx7hoI4bpMliETKhA7541lAhngRPjALzV36MZAsS/DLwKoyXp/eR+k/U2NTNvzgF/MpL49/mUnyw6QPNzjfFzreyv0qJp4UEkC+HLvw4jcXswBsSZUQ3O8dEGdEyVU= 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=sxeLqMMf; arc=fail smtp.client-ip=40.107.103.50 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="sxeLqMMf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TCKJo+cqqvJQ5jUsrhJCOoUDHmfQhwCxElNQGa2K2sj2ZniJXGYcw0/mmE/uUhNnv8eo+XMX1kuwesjfxI5FWGbiElRppNXXPIeThyheGuxSa223Phhri+HrwW3/vNp1KeX1wFG09Z5FY2q5DSQqx3n7PVMLwijawu9rYQv0ESp4gE35Z5spz76mkPpR/Ty0vg3oHXjVxx8y3lP+wYjv3kGJ8XzXHvUk/Hx11992l7XZNcPb3YdED3N1WUA9+NGgalf91dcIFsGXmkNp/RB2UBKGyMWhvH4wwVIKOKor33EpanDB/mJxoxNro+A/CC5VPk3iRv9lY9/0R5B5UweP8A== 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=2WEnDWKgkB+lTh5nLFPb156f79a8YdfmuXlW8PM1OGA=; b=t7hHE0kFeyhf0OQkkzBZy8CJz5rM4AJkv9xJm16bRzcDOw0ld0qvVMbkV02d+oRLz/pnTp/rcHo4xuQZVMD9lTIf0bvM7UziSerNPiVbZEMi3NLcbbsvt3iEqbTs4el6dFzHF4QAqJRMxLR0MrUmAmgEO0AOVwa2vqgPdH5NcWe+xf1KDtt7ACGx8C2Tvaa+ua1rgKgmAkcdusToZ4XD1m7jFva7o8JBtON2VJs1Rf8bnpKxjsCxsFgRtjSUIJypBjXGK2Rh14hVHHwZaJHKAbjivSmIt7hoNdjfHrZN11qiXqlG2QX28owZnJ6ZHkZxWykEzcZkRP69T1GVP+3IiQ== 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=2WEnDWKgkB+lTh5nLFPb156f79a8YdfmuXlW8PM1OGA=; b=sxeLqMMfKeQTPVVPcg+uAz8V6S1i9xE6l74yvgpHMySHwawODkJ1DMBvpx83Svv5m08qICHLDZuZB3oGfy6c8vGsJj7Vq6tcFPteUBA4Y3CBFG+3NvKQ6WuETKmXOd29O6BqtE1x98fsxaVZlXc5aGcJbX++lynSEcTHzkE0S+7dMnti1pcXobYtf5VVUhjKivswin32UjMyLJVf6Em3IfSBMCqZkRAFm6MznEYkYvB8TZGeag6qd5+gdFesW/F27Vno0S7L7LipS6iaF7xpQ8yYt+toAPHDbP1qX91YIVzLyIsb8NlzqNVknj4rf8DRyODs7kIU8BBPEy7VN1Ek0w== 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 VI1PR04MB9763.eurprd04.prod.outlook.com (2603:10a6:800:1d3::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.26; Tue, 4 Mar 2025 00:17:15 +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.025; Tue, 4 Mar 2025 00:17:15 +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 , stable@vger.kernel.org Subject: [PATCH net 1/2] net: phy: nxp-c45-tja11xx: add TJA112X PHY configuration errata Date: Tue, 4 Mar 2025 02:16:27 +0200 Message-ID: <20250304001629.4094176-2-andrei.botila@oss.nxp.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250304001629.4094176-1-andrei.botila@oss.nxp.com> References: <20250304001629.4094176-1-andrei.botila@oss.nxp.com> X-ClientProxiedBy: AM0PR06CA0101.eurprd06.prod.outlook.com (2603:10a6:208:fa::42) 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_|VI1PR04MB9763:EE_ X-MS-Office365-Filtering-Correlation-Id: ca6e5546-6fc7-4199-ba47-08dd5ab1eaca 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|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?beK5s+FbAXYw+oqPeXJDag39v80LK3c?= =?utf-8?q?gk6/pyY9eaKU+mIITWQ5MLk55fuXtPFfDdxPJvfg7UmM6NiWDS7/eHJU8xCYyeKo+?= =?utf-8?q?rnGCSG3CjAG97D6ZKmlk35qy/9Eg4+WsFrr9K82zzEDEQzM8iL9l7SVnwj64W8GBv?= =?utf-8?q?hxJVvFt7A31+I+Zah6xekfBbde2bOazaogA8u/RZg0A3u20zvwO98FjU+SbdG10XK?= =?utf-8?q?yv0sJ7Ak5YZ0fShxXaBdb3TNQ+PmNMQUnmoQrn9DL+K1/Jlv9SFXu1gsiLxyhCTjh?= =?utf-8?q?qE/iA8KWEz+xioINQdPWikP7ZR9AqEnzK0oKpjqi98/cYxr2Z0Umb5LmsZDvsPRPv?= =?utf-8?q?6m+aYgBvMzbkKRVsG6cfrW8g38B9CWcyv/gtiemo4zbjUBCyi/VqTrFGGhSo0OwWn?= =?utf-8?q?+S6cqdGe3j5CJerSciDBXbj6NkEXtioAfDF79YDFL8xhPIPwj5s4dxX7+0raPLJRg?= =?utf-8?q?6nCV2WYCidyPPhUb56Mt+Wl9GahNm7pAScVviqAfBpURD4xKfn2nWkgda7cM+Z6mF?= =?utf-8?q?UFS6DeoPASdWzr01JEH+q9WYrg+ElH5W3+ptWV1vp8hmYlm5ynsojiixOKFBJLA5Z?= =?utf-8?q?UWom4da1fDwLKRoyaAo2QzFepeyS82FAz9i91GOiGD+oYWg4Yptt8oOjBSlLHahFu?= =?utf-8?q?f8M6mkNYjhHjfegPRrzYJWCKMvR0TXiwv98LMn5nt3MaMI4lHPf3J2qlS3/1qHZfq?= =?utf-8?q?aVCUEWZcMSZIqu4LRpjG1XU5f2tOHfACttjSjdsM7YqwbjVj72T2BH+5Y93vbTDQc?= =?utf-8?q?XBY8uktjd/mYAPxzGc2an/k2VnjzQ1QM1CIAOWqLFMuAZgRyK4gGRB2qchLxsUe0F?= =?utf-8?q?BRS1SY9wJwUGcbVrrg4qKRaGesz52VK3ehVh2nbNm8OD67ykPAldt2mZocQUaOioV?= =?utf-8?q?+81nakEjOg9Eqtx7nindIZ9R7G98067z/Cn2+oZeC9Q4m25G2VrTOwQcbhpWFz3GM?= =?utf-8?q?D2vDQK8nVNoymmENAWo7BXo9ygxHljvkFPfyFnnb+C+XnjfQi/ctCMshDK7q6CVB0?= =?utf-8?q?u72Xo3UWKxhquvRpL0+D9nvHBav3EAbYlTdsFHLoSTUSlZbVihwulEz/1x646FtL2?= =?utf-8?q?4H/DA+XJr0SjI6I8RR0RYHlIz9zJnnJ5IX+4B0pY0cP2el1BuK+BoqBPaUUjR1Qky?= =?utf-8?q?+mxThmdi1bPcXXTSY/wMr14wkLf8pnof+xjKIj8qJzF6/1skenX2+gxNGiOJRE6rS?= =?utf-8?q?beYYVmjrW7kPSWBau4tFrfuid8k1qbT5E2ukvkbEwK0jXgfJHXYSOg27vHrDBCYOz?= =?utf-8?q?nrrX3DiclzM0gfM1vPYhhkFRsthLhjTAPdwEpc2649tL8MTbaILAGe0LzeKVGzhLj?= =?utf-8?q?QLPZW/UpL1Zd?= 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)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Jsm8SYMrLpaRSLBmdJ93H6Xi4Pb7?= =?utf-8?q?uihiLyt1u0EjbcsvVD5eH65Z1+a9EyyTv/rTeMGF1vzyaOTumoE79qFg6rFR8NwLv?= =?utf-8?q?HpOM2sJ3PRAh8DfRyD2r2uEI72UAFe49j2jpmdKk896L14Rpq0dm96bsOtnYo8TxW?= =?utf-8?q?Xy3CcyTSDOa1bB6YjivGeYYRauTVGdDFxOBcIGOfHtEpRYlUIimfbsSmS/AdK4uF4?= =?utf-8?q?uqxhEqGdCRS44OvKNF7Oqf9vKnjnUIIhDFUHMOn6yr+OFDKLHPeDLV6S1BPamJYG3?= =?utf-8?q?i9JHNX+UtPFVy1PVeDDdU3MMRtZHJmwygiVfXcqZHYep+tpuXvyDWAtMlkr6KWX6q?= =?utf-8?q?9S3x+9+hlrHy7BIS4fYCanUPDNfnq85KDfLuL3b+EJQeaM1yniU7WYzk+u9aHpIZf?= =?utf-8?q?Uz5fet+1bkPmfmhU6gVJgktoePKpKAM0bU0RceDSxS2E6tN4rrI+0NN336AGyk/zL?= =?utf-8?q?tvtCnMWWj1g4VdkUisMaB/ZdbYv+wve34FnnxUxNUksBw7Xb1PC0wfbldqfg2AGi5?= =?utf-8?q?vuWlCo7cjTGNYND9+51eETGAQVlxZqGEbc9LDy8E0QVESGGbmjMSyEq9Irc5ho2SU?= =?utf-8?q?ev9U31cuQ3AjZdolKeQo2YHKHmPhcyUplrPhkqYkeuz8S6x4b32sKnGrzv7adM0vJ?= =?utf-8?q?O8yfw9lMMGQiGcl+RDtdC61fkw24lzK/BjBHyrkJ8juSV25XhdbBL0WerU4DyEiAt?= =?utf-8?q?ddz1yuieCu5+xOfyhDXHn4hV/KGvJDu19MZgZ0jVcTBFFiBoG2KvvwaxoZMngt5JE?= =?utf-8?q?4jqtvNZsLsc5DX8s69Dt6QH7uUmWxvb7kuNtE/fKosNnmD1ZyGE6Uovfzharg61Es?= =?utf-8?q?EVkW4sM3dwSk4v14p363uEVgyNNhbt9CI5/W6R6UqwRxYh/4Ns8Ca3o4nmNOW09NB?= =?utf-8?q?EpLW4iqUa67WFOJxMJANUmxPjrU4a4ZJkdPcnezttL23xaHcE/BpyftdZwp7BbGX7?= =?utf-8?q?uyJanc/iT3BFp4TmdAO9l98+z3DGwvKc48IukmMRDIoORcC9mIaS6b+H7qEo8wPzU?= =?utf-8?q?kOo0EMwiOIE0ggY7RThcDjDA0iGtlU5EsZTaspL3UCkZ4wdYHoIsRNg4X+7E3bgGF?= =?utf-8?q?dYfPzHKxe3fNjmCO2fRD9kNkVnIvhxUOsVG9J4W1UV3lnB9zMQjsuygbOYEF4MMnX?= =?utf-8?q?17r+WJRCamGp7/YwVl48mN1XYoIRl+JAWQN2REdppj9u5i6Dw1hG0NeTXT4mtzpZx?= =?utf-8?q?zL2XLBn3ld7UsMc1kg1XHhau0hFY0I90gPfCNd9OczprbfrBW9zp5muG34sTI7JL7?= =?utf-8?q?0EjrJkH1nLRrjVoyNWWSoopE3nY3rnBq53edg/4Dc7C988F4fVupuVC9wKeih2Q2V?= =?utf-8?q?2jrCzh0U8wieDzI+b6pSitB8t1UMNNHytpRhYwZWuZjtsccRG+Wyba+yXkG9PxvO9?= =?utf-8?q?l0kfCDq+MFZb3WlI/Gss4LUmxH69ky3TlyDoRgAu0c32F8eaywJgfERlJ6JVVjVJA?= =?utf-8?q?nZ/lmOGLDKb2HzkxIxSkX4IAc2oUDV6I3uiHR32X7TwDWVTCnghJeM7ZPYU7gGf19?= =?utf-8?q?MUYUYa3b0z4u?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca6e5546-6fc7-4199-ba47-08dd5ab1eaca X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8216.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 00:17:15.2638 (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: do8cuTwCzpFCC/3BwauwzAa1C5mN35DAQ7+EIrgy0rue1WT/gNGzN9xDRS4dWTFJ02cNd2M5R9K1SyuTm2jlUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB9763 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 these PHY writes before link gets established. Application of this fix is required after restart of device and wakeup from sleep. Cc: stable@vger.kernel.org Fixes: f1fe5dff2b8a ("net: phy: nxp-c45-tja11xx: add TJA1120 support") 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 34231b5b9175..e083b1a714fd 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -22,6 +22,11 @@ #define PHY_ID_TJA_1103 0x001BB010 #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) @@ -1593,6 +1598,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 PHY writes 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; @@ -1609,6 +1658,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);