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);