From patchwork Tue Mar 4 16:06:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrei Botila X-Patchwork-Id: 14001072 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2081.outbound.protection.outlook.com [40.107.21.81]) (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 1F1982980A8; Tue, 4 Mar 2025 16:06:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741104409; cv=fail; b=LbNqYf8xR+ijcaZZqK5mAdh1I1dHzwmWU+NOkE/5jTFuQg/9yOMugUNlmytDzrwpdTx5QistfvfQ2i4/95MPoaPEF7mXfneJq/fW/1ceVR0MC79M3eJNfboBfsKrM032N8Lh9dxhrWc7WCZ/2zl4ar8iJOLmwxoaRou/7vPuSLI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741104409; c=relaxed/simple; bh=bDoScIKbNzqH7B4Cv3wsUY4ON/3OslGA8q81wW25eQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=XEhJj1FSeI8UGhZr9lQIc9Z8O/34L7oYhqVzqsWIYaGalLdTzeNfhO52XWFPcgUce5DDrAVEqlh4S59CqOcsA3hRPNrgxFpAiPU8+CFsEU24AaVkioS5tfJSImY/HhOXu1li8U5fuYpvZPh/ETIeBZdvyHo4Wwjpy4QuVZUcZoo= 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=CQivGvNt; arc=fail smtp.client-ip=40.107.21.81 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="CQivGvNt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uLG0EDpS93mlIzVHSpaFZJ5voquQ/bvKs8Ma1TVtHGq+TV/HoSry1F5q4uHSgywiS8LQn7Fpr0FvFSj31uFQlYlupMVFKeSCXGoQxclRWgIXR3Pdk5OfZNEWWybAJI21iUUc/hlTC7sHXfT2WyeWvGpNPP6RLjKkv9DZ3buIBlTUkvylXM4ATVC7EJ1164cTWlQPjExbbDIflT+0kWq+wMsN0sMtDo/4BdpKSfcHJkrpbkctogGJ7M8pF5CMu9TjmvCHMM4LyXVVA9a9D9ZW+FanBj3rhLpSq1bWmK+psRx1X0YCy+zuw1Qx/Cu/hBjGEi7v6hblAllikMPQiPNbEw== 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=OPrFxUbhueuROFLOJ2NgMrOK7Orah0jo/s6Llivwl5M=; b=oRvaheOf6mww0Nh4Yc8Fv/2AVUxa+PwOrQlkLnlqxK5qiBWByk+M94NefkwdgL5+g+IWMGZVtQk8B1CCoMkSm7uy9xwer+lz/GsGjjBix7gSrdFtvZLcN6iuclWsFfAIPq2Edy7THujYi/EnhOLANJ0SDgL5TBuJgN5IbrR7wNqj7HqzvcNjcEV/3iZ4ArVtpcI07qnB+zjWSbytWzvGCqw+P6jw0r0J/5aoxOMnpp65QGTiIBXOe5xKIQnJOZn9SOMDEPvwloiDqoMDvQ/QTwzgudaOGBUnkhZC7p12G3OaqNDK5VQieJyq88JSUOsAyka33/FGilatt9wfUYyu2Q== 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=OPrFxUbhueuROFLOJ2NgMrOK7Orah0jo/s6Llivwl5M=; b=CQivGvNt/JyEJL9aMJtNrci/McxvrY/alDaFHiAsGf8TiWlcFRgE0jHoCOhPOOF+DyTTtL0hYhUYzj5oBAipesgVYOY4kg5Qp10JKeUfRI1ct3ERit34jjC+XnsRIKD/zxyose5S8aYhZxGOBOCR+lnE1fnzT4DisV99eUMLRH51VTlKPDdW7+44jVqJCC/fnVA7V8mKRCMpkiMtTZlc/+Ns63eIgpWStA/Ney75EB3TesgwgpnSV0ZC0Yt913rpL0qMtjnkFQ3WtUheTTmjdGGrSirxLpF0DzOkY42niKOufat2vYlv13muCfDGeA4mTH9s09mvs6qwWPlViUrkAw== 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 GVXPR04MB10304.eurprd04.prod.outlook.com (2603:10a6:150:1e9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.25; Tue, 4 Mar 2025 16:06:45 +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 16:06:45 +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 v2 2/2] net: phy: nxp-c45-tja11xx: add TJA112XB SGMII PCS restart errata Date: Tue, 4 Mar 2025 18:06:14 +0200 Message-ID: <20250304160619.181046-3-andrei.botila@oss.nxp.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250304160619.181046-1-andrei.botila@oss.nxp.com> References: <20250304160619.181046-1-andrei.botila@oss.nxp.com> X-ClientProxiedBy: AM0PR02CA0166.eurprd02.prod.outlook.com (2603:10a6:20b:28d::33) 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_|GVXPR04MB10304:EE_ X-MS-Office365-Filtering-Correlation-Id: e2024dff-fa72-4abe-cf55-08dd5b368fbc 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|1800799024|366016|376014|7416014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?3Nz1pK3KTgNxCh8lrvYCFK7HSWXBsl9?= =?utf-8?q?G6T01RAAXkHsWEj2CJ6ywm2wmFZAxnBj9Qpy7p+tCzIvPtlrcgUV0nQr8x8srxbmJ?= =?utf-8?q?V54oGDQWV6sJPq09barxtUY63P2yT+HKNPPMMG7OYXD7fB67Z2pQcM4dN8Ugc8dz8?= =?utf-8?q?GdvVOEDiRP70Jlxxyd02wTMLylGodQzs+3YnuwCo8b0Noj5WFnUwcKfRjnSmxspqy?= =?utf-8?q?63a8ctRlmRZTNJOD7nExTkOD+70mcdI8XOm6MgCC2GCPWOFXxVSZ2Z3VWSEUkLS1/?= =?utf-8?q?Cy9VhGswoR7GjrHSQG0+arOiuQ+mJ2uy82mykNzlbDTmbtrszs25OtEVmiozANsAX?= =?utf-8?q?ffiDT5mpGkeY4wHIFgSsiJpQP8gITZdNfEoqHObPWqHWUUlevawHr/owdnmwm7Ov8?= =?utf-8?q?GyaNZ3TxseIPAc5S3enztsuNgv12WCqCZ2URInrUncQmoPaYcy8G8NEp8nGffUS4P?= =?utf-8?q?PA0oTo4HQfHy+7wDeBvW1mDugBC26RYt/Rt+NxDw2a5SlkBI8zZi8UXi91gLTLTTg?= =?utf-8?q?TMIMShReJRIV34+mS7R8QNR6IEPFLHNL6bg/np/QzAAGp0UB6PHW9V8d2V7c7qnE3?= =?utf-8?q?Or60fbs+fAaTBfemN2ZAEqLTztxkzK8/r7oVoAIL1D262MOE/tb1jHVSQ90f7Xn5E?= =?utf-8?q?0XCSACSc5BoM+M1hQoO4j8o30Ulc6fjsGlm8nCvnu9vdfdbSqLg2D3nuO4DvA4Ppi?= =?utf-8?q?dGfsV06elPUqagjS/+R8kXI3Lkl/DBYz/OoRr3cVlOlXAtacDBRrdsbOPYUT9xqmx?= =?utf-8?q?yDXai9MYj8cbtxrQU9o5QuIjlaMYLQjEJwNbofIGo8MLabLv3OCrVXAo4z3Jemtba?= =?utf-8?q?ABu4MjXkoXoDTJ9v/bMmRLmaCr3rpNmwtMcPnl7vtw0uo4awqqc7NqDfnXOYZHykK?= =?utf-8?q?j+EUfX2jBgt5hbrXFK+6ZrDoEOAzPhkOhGXccM+FHkcm5wvBFgWqbemfr3uvU60NV?= =?utf-8?q?ulu/rNASrv6dzVWU4pNPzqUI6ZVWtf056M/ZTaWt1RG4Nd7dBsvs2FO7ilGTokJYc?= =?utf-8?q?J5w0bCtgY9dNrr+omH2O1o1E/fX06WpNK936DgRQYp4x4bu7T/2OBEaqAhQPYZS0A?= =?utf-8?q?ZuPE4XcyM6bxVxlnrHCEWwD8hokkbzpWgH/YQZiIWCOflPxmwnE3YZ97j35WmjoK9?= =?utf-8?q?lWrqreA45PMOSmEq1JzFO7Knkw7x5uACa62VtVlgaoXGNw2icdYRDBBdfrVTtXIUA?= =?utf-8?q?Kw4htangkcwSYqgS1Y1GA2oLtW+uCnsm6fjxjcL4PRa4JNnvO2GwjrWyhEEh26boC?= =?utf-8?q?EnqOFDPiA/ZofuGuy19eAyklHxxRJzFENt6fBC8+XnKRlGVU10X+vTbW91InYYtxa?= =?utf-8?q?2+PQvdXvV6yR?= 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)(1800799024)(366016)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3S2a/wMNnMF5L81IPIGFkRxb2T2a?= =?utf-8?q?tc/NDtT6LL8Nh0fPyl7DE+snzk0T+VXYzUI4EpswM6H+62JsA/CoOvzO8j1s2tDV1?= =?utf-8?q?6KemdYbpC0gF/02dr5dcnQlvTlMWPdnG/p3qsqhGbGpU3VO8pd5UObT+bVZ/ze3X+?= =?utf-8?q?tSpI0R9gYze/LgxfCmAP5hin7yYc5xPEwSR13UIsRrD8MH3/j3sRk7YAPjvoUuzyn?= =?utf-8?q?ptOjgQweSTBe96fjsuPKxPUIxAc5o4lKQf7aQCNg2GCu6BjGN5cncy0+kG7DVK4uw?= =?utf-8?q?SDwJx3oVgwnIc1QhiYKzPc2NZFh/6uA2NP52ciJOMDv1rrZXfeXpSTVFrTKA0Wbs4?= =?utf-8?q?bAtrptNwqvEARxEtLyMdGjH1XuAvk8rBVtpU921cQ4CvEoWZSMDBc8gvBHop+ok1X?= =?utf-8?q?VNEcG8hJ5FiPS5u3hJxm2KouMrqY49W6H4lpsCYzbR49lDXLvVFmrafohnRQGb8EK?= =?utf-8?q?h4YyGXRLPkaiuXh0wr/myMGVV6eNcYlLg1CxzakTengDKYQfBWzLPSTwIaL/8vbvI?= =?utf-8?q?jBo9E+CytUt7Emefu6m/UhZ8YG/GL+veEKeSLesngw0a6Ro7V73oC5PhJ5Xg2AVjs?= =?utf-8?q?B0IR3gdgc32GcnEsec8kA0RrqWTrAGAtC+LegrwYQWWzeHQMY3y/vcDKTe37scq1Z?= =?utf-8?q?sIyVgd+rxpx0xed/QHgLJUpVD9UmqBiUCQGLbPRtGAyEBgHqe1i/U3Oa9u5490BN8?= =?utf-8?q?botUVoOMqc8xxgzZv/G/5I2B815CfnpvNTy3AMrFka2vsm4Z9DZTsBKHIpZHLeaDs?= =?utf-8?q?ybobtQqBqjgmb53xmEHo/d2taPhytx5La/bkyvTV2YYw/WG4/i8QRRBgsh93nY7Tz?= =?utf-8?q?hLkzyC/CkCbB3c8nPx6u+qKc67Hhwhq5LcqZAKj1Nprm+XrH06cdAIQuUw+EEaSLg?= =?utf-8?q?4R4BSvjtco7GH5iFqKXd03Ivym/5rzQoxuE8l/PbjLPk7NzOJ3KQxS6/T7WVyBYus?= =?utf-8?q?cLkI/lc6d2vSjrVRftfsk0YOgR2LCve7kVIhVf1vRwZCHeJrZpz0JXoN9EI996fc4?= =?utf-8?q?RHrZGNBzM4f9t1Epit3Zwy55lthnzvj7/uXiUImdO3+lM/lGqtSBskrq0LgtJY15B?= =?utf-8?q?AuSzv4EHAZzF4OgJwB76yXX+an5XBtV+VsFgmHX+nanNWAZ16UfISyNt9AcmNlp9o?= =?utf-8?q?tlmevbr4sJJ370QBwd4yxbme6Cr8M7kX2QYUP8fPRzTEf/RTgTAyqWGCu4mQFDQT0?= =?utf-8?q?+Cmo4ILu+zoHDcPyEFJRqxwgi4uc9pjck0Xy7rOO59Cji7KKRl0+hEDXUgnViRvsL?= =?utf-8?q?a7YWyNdgysGaFwMaiVdcmYyyQH7WFA9V9Xu3cAk0GwXrCmzWDhVfmCp9NlEByUg69?= =?utf-8?q?tJ2hgEsMWBpYuXhcua2QqaZwkeOKLHdajMCi33YEL+Xq5pHgl1VvRMNwLAL/LkOCt?= =?utf-8?q?20DgkvXVrcO0vu9utleH0nVihYCoyiwjaC1d13ULltBvpZBXbEWvzyhWooz5PMDEt?= =?utf-8?q?k1Lrp6EqZObASlIAwNoraruT/DJBFqa5S9ryjmrmhHLyZ0dHmlX5vgXSsyg7jVX2Y?= =?utf-8?q?I7vmXCS5kT6w?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2024dff-fa72-4abe-cf55-08dd5b368fbc X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8216.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 16:06:45.6184 (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: m1ufGB/6dvm+koAqE2pIzX/srVIuPi4NZ1vTiR+v4vkSMNQJjY0Fgg4CwkThslfQcKo0RSxldf1Ndx64XEsyZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10304 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. 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 | 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 709d6c9f7cba..e9fc54517449 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -114,6 +114,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 @@ -1598,11 +1601,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; @@ -1619,6 +1622,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. @@ -1639,6 +1643,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); + } } }