From nobody Sat Jul 25 00:16:10 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 732983E49EF; Tue, 21 Jul 2026 23:16:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675781; cv=fail; b=FtqcQbneTaYxVA4TlZU8VtIGnTQFksclIT6nwVRxCAbvC4o4VKYLmTOgjv5n+olCKNgjHLeC5ENM2vZjz1N3PYjt/woTb7pilocqTA1cLwzhV5Knz91nfKMzxdvfPzxXWliAcJuGp87BGerjOyoLxTxyWf+4g5MfoWmlODuKNig= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675781; c=relaxed/simple; bh=IOhpZ4ZdV4GsOn2LNdfHev1EnusaJufXXYUH814PQAY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=uOvg7Z4au9CP+XY4lVsxzVK4gzo1GEjOZLtwb4yUt3Qju3D9t0yfO5JLMqXlkmZUI7RI4Nn17qsAbP4pfGeJK4qZFMm+FOyoxu1RZsuUeg3+QoOtM+cIwsZghoxs12vG60HePpxgTe69Vhn0IEWk7OuVS8KYXQJVY/97Wf2kcgY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=nG9fsCVD; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="nG9fsCVD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wkJ8synmhbOBLav/opGmHNwp+D3vwnAdTVKC5DcSn3ClEVzaEwke1wzUWaUEo+wv52pui6BNXtOEeVjG0uxUkXNdi8xQy0nOCm7/evOjp2GXpEn8OotNIfq568TEgaRfh73j9uMO9QkHi4almtZAoofWtmHdyBCvqaBDO7fHIMf94ATPw3tLVo6GXyYkm8k2Y2t9l/Gk9YMUdmIQ444TetbSYrKsqiBf7g6yKNNlwLC55IjFo9fDbLLN4536V71AmwbW5mBw0A0jgs5eiWeE9WLLv/Dsu0NUTzDqVB9d3MZ0k5VwU7Gz+1ICqBGvD3NL1I7ZbyOTt48BectJmB1wBw== 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=NtzJlKviKTg4EeOJnu9m7mXPMOcMeOOkIaqhictCvJU=; b=TAi8M4Aor4Bp6CRjYUM8yc7tKD/UDf7ESIXZIxEsZ84WxsUw/KfDupSSSrWypYZK82nZbaYyynnoCAGfd+9giaFTClcoByes/hF+FMdCd2OsSobd1iY/yvsRhB50QUgjmF3PCeWmGSkFpuJ2aQtPM+nfdKik0VP73FrDsP2EZxAc0JGW1P9DFQv+dMHmFDfyOHcFGGeUhq9/OUvPwxST4NDUeZtmOe82THNcozRYtOx/K0ZmOk97uZfbaCBEMNTs01L718suTRBI1X4UIXMebAV9yV8DH6hy6i6FfIDzXQoPB7mRepb1nk41C96OzSftBWVjW5hPlxZ1d4aQvyjUtw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NtzJlKviKTg4EeOJnu9m7mXPMOcMeOOkIaqhictCvJU=; b=nG9fsCVDDmZ6A+7BUTf8ZyGrNnsyXEN/rVSjSi/LW3ThL0c0FXXqN5OD6/e3Pg3j6g2jVLHmGsJugaFKg2CPP7pja8Or/hMYkZfoUFNUrFPOB8FafgA2a+GlQ6hvyY3Yj4B6L4G/xGa2Ukrd1gjw6rB9m5/tmqSVv1RLWGdECpmrxbaofnXNj4pbqZhT/L3KahLWDbzWiLjGOjvyMFcyhXTgxCkersLwNXMUVp1Cieil5y/2Re/amWFpN0r4wzUFzB1ChJc9AS1y3cNljQjthqFxJYcorb3v/1afz1OykHSg+z77Ot8jjy5vuqM4wwCu3ZcXtZWOVrosm8lCd73zEg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:15 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:15 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 phy-next 1/9] soc: fsl: guts: perform fsl_guts_init() error teardown in reverse order of setup Date: Wed, 22 Jul 2026 02:15:55 +0300 Message-Id: <20260721231603.67865-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P190CA0017.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5d0::7) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a948e20-66e3-416a-34af-08dee77e0fe3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|6133799003|11063799006|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: SvjkhI3AT4KNHfIP0/s/0fqNfOEbcF3DoJeBz2GIVLMS3a5cml8hRA4hhf6FgIno28XBkiDMf6QyOwcuQ8A+ew7hOzg89VEOK3iaV0XqwzFBmTu2TpcL8+ZS7srQqlUEi09dJ+AqkFhYdvnNsb9okVpbeyFSgrrzjkDbS2ipaIWGszWbrhyy3r7PMEf5LOvk5yxa4U7Fw3zSao6//bZy7/UeER9Up7865QcOBNyexlm4SGP31nHwmsFH/bWOdGOa7pkAmik58ANEKATEylkPADoMOqSHxyiKh19BrDKf9bo0ygmHBvreIxDdrRRO/CrVVQo2N4m3nuMnRGoQQ7YipiDVyTJ8DbIaMwiPKVYJWbnw6A7j+XQH2m3ls7Oj5xZFLLJu+Hnm+LKctkF5MD1w0N2+QSGUL3wbNIAeQveOOANJqSzsh24aCT9DA0fzqTvaFNC8IFy3eIKkfwvmfrxfxZWAWu97Ho39l5IycLJ5Cbj6LMUhGR9wEvYIojgOvF4iKT/xAVLxigHmIsUa2kGe0H8XMi96WpRg5uK7iwhGoe3tczJaq8I0KNW1VnyT+vwZU/fCoY4Lt5NyuBhs08IbuMCapJgqlD1Z2w4OCn05eS6ny4efoGtQHxRERExYjC+joaLGGPFXkksVG6vhDzY3/xc4JrVnGNBvyNJKMpYzwnk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(6133799003)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LtqNL9I84nId4iv1KNDQer+JFKpOuanBnzgrqd88XxyZsB+oj24uyRiv8DLF?= =?us-ascii?Q?2HL5l2rqCa1a01Y3iUhVI5Cr1ZAOyyrVedYzZ84MKdSn4HrgvX2CBROySLJu?= =?us-ascii?Q?1RMhMMsPjzQAXGxEkVvtpFaiWnylF6otL9XddVNpX6VoTglyftNYw7Y8LFJp?= =?us-ascii?Q?lQh7hMyn20O+h+LMzk+dRSdOuP9tb1oUA/XSxPK53hP112btaILsMDSguPA6?= =?us-ascii?Q?P74vALtG4bX0fH2ryp9IbLuqhdCcTqo6gXZNIsHHBxQgFL7aRnUD06YFVSRZ?= =?us-ascii?Q?uTrqfX+Yt8Bz7dsg7cYWw2+e2kDuUiGForbT5uYTCnhbKNMbYZS6AQCkdttJ?= =?us-ascii?Q?7st28wip6dQorhoT7IYo6DrQf8BkNgkKNxFNtK9alafbXCsMKZ7V80owzGTA?= =?us-ascii?Q?2XCi8fuvbgjltTazraoPCv3LYL6DdE4hbctEqv400s3V8U2z0UJDMt44xYmj?= =?us-ascii?Q?BfFE0p66VO18Av6YSAjpEpMAz+DLShawqpfrOpoOpw/8CHwgM87ZwCofxgmn?= =?us-ascii?Q?MCb7VgdN3TUhf8J82axKs9aS0RXJ7+rEkqGdoq48EPqWfKDpRd1CJ2VVAluk?= =?us-ascii?Q?Fui9glw5cUiltUx9jaOVlCZ+8gZLp5zAB+5aUc5f3tON29O6TI19ZmD0zbbk?= =?us-ascii?Q?woV1D6bQmt5t1oZ0NCm6Zd+zBFA9k/eqGoopWG8RJTjssLyUlX5JCMo4rNzS?= =?us-ascii?Q?x0zhlVvBOdmS5gUZCXbctXTf2VzcTDejNYASjFm0M3RKyHvC+M/JWIcDc5ZP?= =?us-ascii?Q?Lrgc/clzKtAvFBu1XYGQ6ZV3sZV0ZcDW/UJn7p3/+HUBZC7Wr/13N9D/G+G0?= =?us-ascii?Q?PXfBRhhG+xf2whrbBo1yLmgplGQBy0mFfPve4GBc7PShj7/oxbpV+eXVjWqH?= =?us-ascii?Q?ymleCKiYj6EncqY9o9a9MZWfHrAmKFIpQCnXS0FHd35EwIfNBEXJJJ+An9Jz?= =?us-ascii?Q?AO7xQd9dTxpvycYaiOqGvEwuRujI8s9IG+/Z/ZA+IzAQoxC05Iu+sI5Y2KkU?= =?us-ascii?Q?ql8Lse5IubPx2HRN2QazzWDiR74A57oxrAEpCFNxDwCYZDyWc6L3HG2ZC+zw?= =?us-ascii?Q?xaIO+oEIT6eV16VFyP6jYqjDgkEVCW5s8flK/j4RhGeks/xxg6q26bt714No?= =?us-ascii?Q?2/0z+hUrdLpDy+dEct5YlQSWLF0xzYQE72UpvE95UcvBXbY7roi1UibuYlON?= =?us-ascii?Q?WH+WSKRiTdXAJxRimldQRJleNYdVOVgyuQBxIEJTSTbccLCKiMolEoPbNzY2?= =?us-ascii?Q?XntwmH1864PpooP1FRcYxVbCk2hJS8SwBLK2oqiHd0PofKJYhxRCvLM5Duhm?= =?us-ascii?Q?/6Bg+yJ3y/D5S3WXEjxmoDAtrxt6MOcGOvT4zHaC+XzpWAszhbroL8HwIrI2?= =?us-ascii?Q?p1UP7oilDWI5m6Wwi0cow5cpr5cZdQ5/UYUgpaD57iqpx4G4xJS9mHu/Iggj?= =?us-ascii?Q?i8eK7wlep83u5I3I6J8/1pBtaoX0YGjigwFXKcgrDuX68QYPO/qzsWGeotIT?= =?us-ascii?Q?VBLYr7FwEFQqOPbVGL8+hHcIl+AW9LBqBG9YDWKIQ0YRo7lKmnCjDjtLImmw?= =?us-ascii?Q?OwXJO5m1hRo12gHtJyuqweW/BrBYCzQjtU+q5wVbFQg2XcRTIW7YzuwlxSfD?= =?us-ascii?Q?T0IDmKqYcTCPwOr7Pe4k3vjrddhaX+mfmGbnQjg9WwGTvzGxRsa9HkTgnw1w?= =?us-ascii?Q?djxvrtiMZ4Snm+MNgqN0TwnQ4ahrSPqNZhmMwFT1Ogl7hVAef06WTSJZxadf?= =?us-ascii?Q?3645F/RZVw=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a948e20-66e3-416a-34af-08dee77e0fe3 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:15.2664 (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: gyay8RTBl5atsW9FRywCuOqGQlg8d9QlbuHkQUx4xzxYlCKDcP1Y2vkFuDXiJZRSi3jVQ/zAuOH9hWf6mN0YuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" fsl_guts_init() is about to get much more complicated and the central error handling procedure cannot scale in its current design, unless we add a lot of "if" conditions to detect what has been allocated and what hasn't. Currently the code relies on the fact that kfree(NULL) is safe, but this doesn't scale to the case where "soc_dev_attr" itself is NULL, because this would dereference "soc_dev_attr->family" and friends of a NULL pointer. Convert to the more typical error handling pattern where the teardown is in the strict reverse order of setup, and a teardown step is only called if its corresponding setup step was executed. At the same time, maintain the optionality of soc_dev_attr->serial_number by not checking whether that kasprintf() has returned NULL. In the error path, kfree(NULL) is safe, so we don't need to add an "if" condition for it. Michael Walle has confirmed that ignoring the error was intentional, and we preserve that: https://lore.kernel.org/linux-phy/DK44809N7Y8I.J2Z3U4N32H0Q@kernel.org/ Signed-off-by: Vladimir Oltean Reviewed-by: Ioana Ciornei --- v3->v4: patch is new --- drivers/soc/fsl/guts.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index 9bee7baec2b9..453456f31800 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -227,17 +227,23 @@ static int __init fsl_guts_init(void) } else { soc_dev_attr->family =3D kasprintf(GFP_KERNEL, "QorIQ"); } - if (!soc_dev_attr->family) - goto err_nomem; + if (!soc_dev_attr->family) { + ret =3D -ENOMEM; + goto err_free_soc_dev_attr; + } =20 soc_dev_attr->soc_id =3D kasprintf(GFP_KERNEL, "svr:0x%08x", svr); - if (!soc_dev_attr->soc_id) - goto err_nomem; + if (!soc_dev_attr->soc_id) { + ret =3D -ENOMEM; + goto err_free_family; + } =20 soc_dev_attr->revision =3D kasprintf(GFP_KERNEL, "%d.%d", (svr >> 4) & 0xf, svr & 0xf); - if (!soc_dev_attr->revision) - goto err_nomem; + if (!soc_dev_attr->revision) { + ret =3D -ENOMEM; + goto err_free_soc_id; + } =20 if (soc_data) soc_uid =3D fsl_guts_get_soc_uid(soc_data->sfp_compat, @@ -249,7 +255,7 @@ static int __init fsl_guts_init(void) soc_dev =3D soc_device_register(soc_dev_attr); if (IS_ERR(soc_dev)) { ret =3D PTR_ERR(soc_dev); - goto err; + goto err_free_serial_number; } =20 pr_info("Machine: %s\n", soc_dev_attr->machine); @@ -259,13 +265,14 @@ static int __init fsl_guts_init(void) =20 return 0; =20 -err_nomem: - ret =3D -ENOMEM; -err: - kfree(soc_dev_attr->family); - kfree(soc_dev_attr->soc_id); - kfree(soc_dev_attr->revision); +err_free_serial_number: kfree(soc_dev_attr->serial_number); + kfree(soc_dev_attr->revision); +err_free_soc_id: + kfree(soc_dev_attr->soc_id); +err_free_family: + kfree(soc_dev_attr->family); +err_free_soc_dev_attr: kfree(soc_dev_attr); =20 return ret; --=20 2.34.1 From nobody Sat Jul 25 00:16:10 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 2D4B1435AA3; Tue, 21 Jul 2026 23:16:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675783; cv=fail; b=ayMr8CGD0obXvxVeMkS6Vvf7t/XFOMCEl0pTz90huYOzR3zDNS8VdKQ09+OcPuHR25MPKQZbINhZ9aLnSYtG+KutL4EVAtpoWzdoJJDZtObHhZlilgHRT3SOrja/o7OqBA/bIErUvpP/Me2ucEtqzCAse463GHNfuPwiFBMyrd0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675783; c=relaxed/simple; bh=wz8NAsoXdbb7GlANg9r5TGD7gz2lX4JSIFbE3nNtqUU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=RRmk9ndhMGngJc6tVpPnFaLpOqdhu1xJE2HKsn8ifGbNbcSx6SgSuAVvnzhDogs/4aL4+UVvilzA2qxyo4LSQ+amRhoR0+Kjz2WmIe872+u980GhPgh4ZMiOPF28yFWOX53pyeGUc1wmXbSO7ZyMWWZM1kysw1sd/GgVUOijlZ0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=Ft4/HPYl; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="Ft4/HPYl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mDm7JyYrzM9FJKOooTW9sKm3kKvfw1eI9vTRSRMJALr3ACVHIY18mWZ65l2wdgFqEopgruCycgEbeV+65iIDruE8Dct6wwGzdoQnwugttL3bX8cBPt6w3aD2CO7rQNF7weLQRxjL8YXnMfB76cv2Ft30N0pEbteiWshqUMpxNy96nSE/Qt9XuMFMLai3LXmhLZvvBGEarM27mprFr+RT5h9SZ6U/B/UDr9uqMo5oskitq8cUOg58DffjnizesJ2jc4ZqCE0H0UXU+cflfzepGyNXsP4len2eOWDu1Ixo7Lz/VfqPeZIMUPTCtpkCEGVM/t8yfh21AkRLgWVBVv7iKw== 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=LoQOtTW3FtlA8mww2f4TSbIuazq3KdLl8+erw+Wwn+M=; b=sx0sUTA3beiv+FwG5h4U6fOs6LvP7HqfgBZ7a8YQjmquuaOV4zhHyarSgfBNCQZncOewBNSSVH93qI7QZ1XTSOhc2wZ8jIjeXrsrrpPx6sGru/4ZOuIQtkdG5WDvjnYwrQms6qNWkM1kyAGKMgRW2cveSdva5gBRG4htIRLYXDnyDNbtxyhR0/P5qHewvkqps+agjL4FAkaGLTymlEegcBN8W4+HfKrMXTAAJjct8YnWKTIo6lb3Mml6ua4LmpiF/Agt/t/po/0I8x+ZNsE5+cfKCvINTo3eTAZa1C9S/vpl3lrg+8K7qBCNPVYV4o4a+36Hh9e0iGo8+GUQDkejMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LoQOtTW3FtlA8mww2f4TSbIuazq3KdLl8+erw+Wwn+M=; b=Ft4/HPYlw6eVrqXW0ro+2WA4Y2lYCLT2d93bTOJolQFMWbt55RYQFoqJkIi/5uMj3eGlq+LOhqxNmmTXQXvSLoZgt3zPiHNw86Rdw3p790KJftcVq0857RZ6zJrNyLMci0ltymrZlmMGLvSfr4+UPB0w64o6BzmB5iLtL3iWxKy5Z2OfuYHMfqJGUCZsRMaxA3ibw5r38v9pPkbW1QJ2u8Q2oMN2unLNW2hH6rvoordFGD1eAqyMydSKt5tmU6Mg0pXqoNOPlHj8ciIvknlPIDHne0l/MuXRhRoWEG6ID2rmVAbXYznsmO6IxhXU+9Urt/nC5b25JMlazDa0HrEFiw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:17 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:17 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 phy-next 2/9] soc: fsl: guts: use a macro to encode the DCFG CCSR space Date: Wed, 22 Jul 2026 02:15:56 +0300 Message-Id: <20260721231603.67865-3-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P251CA0008.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::16) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ccd43a9-f82e-44a1-49b2-08dee77e10f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|11063799006|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: KqMie4706PgoXw27QSQoMFpOdnMEd28Tt+oWZJajSUkXq+2P2kXrTJ9Ag8Fe1iwirscVd0cFn0G52T4D0h4uEqGj9mJ2tGA2jco7Wb9kcV+wLzHisWCJzOv8zsXvGKgAjmOeBwAvBWYlYzQtlIB7CllWef1G09RGHKYqX74UlvFxRLGOFSJ6L/0qwdagZD0QDSEPNTB/HXOnTV9H/bQFELXyQhdpIxSKf3YEcgk3dWjze5MePgVw1bX8Wy18m8hpKwYUw2Ep8oWelbbQNXQaS661x/dWqPupbAkfLlYR50y60sKQ8KYDyUFVxjP9SizH1AICi90Xnzt155R/z39J6n+mdP24XKKvfXWxC931P/xIQxxANWrmYjj1r8nvxBxw0kB3ncnM0Z7fzoy1adLHjw8+m/HDjX/08n11nsXFz8SqkYmdicxzNAi8VMdr2bMeg9BeCCRiBYBAv6ojZZtm0UA2EvsM11yndGX1TDhyzRYoCBS9OpG3mlAFeuFZZehwYsE3Wfae+QNoaU33I7ZNQpJpT20uyVuBSOuvGM+RbzZUMM2EEPN8VCLG4EYyT8Bif5Axnsy9Ec18i0J5jxu26jENwTKDMLn/KwJpu+JnfbISMKd2ynvlJMYvm9BHF92tkmfTXnvMbU8j9B2NRYFHzHhMJbbO9GhF6FH/1+N6RvM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1XhSAqjxJTRkVenHDZD8NQ3ib7t/M37ACcbvGmtxfK3a8K64uONf7yp1Z1he?= =?us-ascii?Q?5bq+2FULjpSVFdqAoiAxl6sANYmwYsv3R416JxsaZx6X5hvJfI3XtfjlGAa0?= =?us-ascii?Q?q1z1C968mWtoiC1Fke+Fwmay6UxQcKYpVmp+C+pw4ZTmTq7qJe73ZJN2msSI?= =?us-ascii?Q?0JfFXoPgoKa5FBhyyPM8PY7/mCBnmYFcQCyJx8L6u30DmGXzrNPLNuE14E0I?= =?us-ascii?Q?Zw92mJUJ/Do/1amNrEa+13uYFKiloIQbmzycLIYuY342wtGmKlGXJEZTxoVd?= =?us-ascii?Q?bKo2pugaWGME8TC6c9DLnFMSms6ZzWEYqaF/+olNbP+8XsN5RCB/1gPdC2WU?= =?us-ascii?Q?ZJ4/MMqO95KZfGMvMFlt4Ia0GNqxMHKTgwCVvIAbkbN+0UphqEyOrXuM3K3y?= =?us-ascii?Q?blCDCnXim8O4qho8Ybr3C6WJtyvEQe+EH4LhTmZg5hhqLJqOGeH3hVvUbuZ3?= =?us-ascii?Q?ZP3OQ3fjSoF4ZeNrL2fEpSGpA2gw+C9BldmvFXYpQysx+XuqpcbmwrUGjWxD?= =?us-ascii?Q?etGg46U/nyOUhRbt7fcRKjQ/BzV0BBo7dEYAg7PLgmcgXf/vDP2sttJIOg7m?= =?us-ascii?Q?B2rQ/LAOMKAX/QrceCm9OQV+rOJIK1umS4zN0GXQoTorKash5Xu8Ii33er41?= =?us-ascii?Q?OH6rFM9o2IyoZn1YPoQA8KitJ5KFUTQ3fTR7eNFojVQrkddzjkZz9htRVpTU?= =?us-ascii?Q?ydDg9TObNMa9SCTeqz2hWOLhkCjx4sIOYqVsQX9bTO0e9jwHCrAA1/EftHB7?= =?us-ascii?Q?bNJo19xIcL3hRibCW1KM7K1pXfE3njwP9s+0sjzAroXs0Vs5bAZ8uuHKDUkU?= =?us-ascii?Q?MmQByT/fwNH6x87q+f3BEDv4cXlJhoLqrcdheW0f9OO0ux36VWFn1qeOKEnt?= =?us-ascii?Q?ZG+TNhFCPFzHErmVKLuTS1qpUmciGX3jfvx98rfPli8xldbGkW+reo0+MCA+?= =?us-ascii?Q?jQGAs0B5ETDqx9GBk1v9L7vZwToZAbBrBFDPkKYUNcFzY4ptMeeHluImgBOh?= =?us-ascii?Q?7kUyjHR9/S+CmBiScLWgY/vfkdZcwAexCw6Kp+u0Tp3W2XcP3s6mY1UCIYsL?= =?us-ascii?Q?3E3F33UirWJsi5F5oAI+UBNFDmv/0LEQkOj06Jppo6viN9CDIaO7qwogiq+2?= =?us-ascii?Q?cIFdcE2/0LRQyMODyOKoEXS/gQkd5l4dUitdtrzOzHZSnKGcsxju/H9bq79a?= =?us-ascii?Q?l1VMcSSrZ1QefC28lQADLGPKShB8DQKGfO8teOv6JffSTHSeV2P1IXXdrAGQ?= =?us-ascii?Q?bPqxHixA/9ddUtibPGGTVELipkxIKML4S4yEjUrxDMMz9kjlSvidWuSK4UFL?= =?us-ascii?Q?pfKfo5G7PAbgmGfCWozgpxmPkmg49AS/KjV0OClXt1gBdy3d/N7MRNeAgXST?= =?us-ascii?Q?9S0qIZnjP25rnGqR6HEeIVRvTjvNXysPJGgrg2nT1iAaL+3x+RT8cf3K6rRc?= =?us-ascii?Q?UJ0bnIUGo8U3Lxgv7ra5MpFJ5a04S9I3Avitko3nuVz7oiCMYqFsof/BG2hg?= =?us-ascii?Q?5UQJKruZBXVjGh0PsgeaP6ERCdekYRzc0CQ2/4UDWjKidXqH0BZ5ofzRpbo7?= =?us-ascii?Q?KobsQfitXcMT9mM7HbsdZEcAFTqI4PWz+IWlgq+pCbFtfoHUQKug9un/EW7K?= =?us-ascii?Q?9DPCc9ZnzKyQx08J1tPMC/sIDv0/JIMwkwJRjXx8pPJffvsnRLC74gbLDdJJ?= =?us-ascii?Q?mwrIrKiuyumuxkI2Kv5sfNkXGfm2ntZeuiyKVvE5fu6oAuNLzn5FbEvvL0Oz?= =?us-ascii?Q?9UABp5EXXQ=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ccd43a9-f82e-44a1-49b2-08dee77e10f4 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:17.0406 (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: EKoRkKXOWeOUXtdJ02vzbF9+0TGArJRHOz/xRAzQUbkHc5Le0wdYBR54j8eMSoiUXu1ipcQbGixZzqfGfs5z/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" From: Ioana Ciornei Instead of using a hardcoded value when iomapping the DCFG CCSR space, add a new macro for it. The code will be easier to follow this way, especially when we add support for the DCFG DCSR space as well. Signed-off-by: Ioana Ciornei Signed-off-by: Vladimir Oltean --- v1->v4: none --- drivers/soc/fsl/guts.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index 453456f31800..b97eb80cea95 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -14,6 +14,8 @@ #include #include =20 +#define DCFG_CCSR 0 + struct fsl_soc_die_attr { char *die; u32 svr; @@ -197,7 +199,7 @@ static int __init fsl_guts_init(void) return 0; soc_data =3D match->data; =20 - regs =3D of_iomap(np, 0); + regs =3D of_iomap(np, DCFG_CCSR); if (!regs) { of_node_put(np); return -ENOMEM; --=20 2.34.1 From nobody Sat Jul 25 00:16:10 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 1C194432BE4; Tue, 21 Jul 2026 23:16:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675785; cv=fail; b=kjmH3xuTyMEdLYknQQKCLXpfB1E+KAbCkL5x0UEi3vYv50MODsr6TdEg6A7HxLACqNO0ePVWRhu9dWDIDudsWFicfQOO96KMClbI0PNDdMdGpgx0uEURhYjbRpXR6qZTIhkc6I2rLqvC3bWHP6Oxp2df0X9VA0Ebnt94JeWwdqA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675785; c=relaxed/simple; bh=BaBbETDDROPoHXAJVV6683atCK9JqFp6tWZtBUROCwU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=PJrg0p3msGmsL0y+atPiWcBlW7QILsLgIAYLpYU39OBfTbZ/eX347ld3jWXOHdYosvj+cv5AgPnuT0HZ5ELdwww8O29FSg5OZ6+iaOBAfhBjHUZDUtLazrD24pqX9k6HlBTbsi6yriaycydvKQx95woLMovK5hrXJxWvXObDAhk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=FH3PFcb9; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="FH3PFcb9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kGPL2HO1qoIAYj4QB/lDEPTWzbfQ//B13IkpJjASjfIwzOqXp4QURVN0HFpH8Us4Ndgn1WhsjePhAfR85STyhw8pYvLWpGCoBeqzcK0Z6sYwpuMVZtRI5QfnIge4hF5yKaaaGHrVfHzebHFE7B8KsBr6U0631qg3WrW45ddIZMMxkkPS4fycruJ8rHgFB0JicEaXxKD+wbaGyrXtw1o3Xrt1xRnKLSXpeNugN8CN1RFGdXrBsCyQwJI6X5lFPahyz6RiCQRKvwVY7dMNsLGrEfhBPYf/MOGhvx8GdZ6sQT9YwnBJ/4Xwi96h9ifmvTKuRAeUaA7K2dxSio7hNDx2Dg== 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=ZFRiqYOADgod1HhFQwXXpJzQGHPRuHPz5syauC/0Loo=; b=ivHt7AhfkUC9+SMYdYhHL2iTiM9jaXK7ZKudD+bLCYhn3NT9tSeoob/5PElkcT5kNWYZW62Yb70aNHZkljsKORKPSIQrX4bZyv/jvulFtWSD98VLy5I6oe0OVuksf6q1xubeHXxO3XzsoT3k9YgiYBILyIyLFSbNr/WHIIbQpdvuvngeePveQnGMJDPLFZQoHtZF3p6sxNXnyY0rOO6MOkKdbMplvJuR03tOpfqyHdRpJtoFC5Z1oiUdJds+aEE6ydSW/1phaAAxrw5ttwIYJ4fJtGGv3j1Ti+WqcNQZ9D/HmgUtZZphT4RN9DhSb4XMBg/2FQh44XNolYEy4jMTnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZFRiqYOADgod1HhFQwXXpJzQGHPRuHPz5syauC/0Loo=; b=FH3PFcb9r+VjI3dhJarVsDUwyQB29GW6aoUjsSsoj4nXuHvrV0ZCqhSkvyDdIUkvvwydhTXOlCcn/qEZ1j5vp//35ZTSi4B56rPNYpi6kiErrBYw8sx+RBS+7ITZCY5NYc701amyzsw8M2WHoTd/4b75Ic/t9GjBaJLzRw0JqcftP/RCnB39IuJC/g1BhOfam5mZ8TKfbqSBprLXsUkCPklKiD/EOTttqzpCS8JqjYDaHNnPVkHSZnez09IhXermEjX+Qh8iRnOtIrcBAtBkZXpB2Gf7pMqeSUCfnAjTWl+JyrpT7+tvNSjnGB29RNL9S0fACCVc72OuM+4ejwY+lQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:18 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:18 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 phy-next 3/9] soc: fsl: guts: add a global structure to hold state Date: Wed, 22 Jul 2026 02:15:57 +0300 Message-Id: <20260721231603.67865-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P251CA0002.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::8) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: da89b679-2a4e-42da-4c30-08dee77e11f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|6133799003|11063799006|10067099003|56012099006|18002099003|22082099003|3023799007; X-Microsoft-Antispam-Message-Info: MK2etD0tRNdKYI3IZg78xHVtzulhRKobdOqc0cLUVeHkyhH7U6xpvPuv8P+/Fhrn84Qt8bhLzRcx+fLqmwbNIlWz80r5i3xxhdaigduffXxCIT9ggGYVd5Kx1WBtIGLapc6LMTl5ebW3ZL2RJSviOunTLu5+noBEZbVuUBhjUNmau0AB3yigbI5V3cTTOdLBlD5a5G8rUsMTdnRLORepI20iNoSLwZvk6yJao3oi5fXcz2zDKFQy+dkA8XXRSLhyoklSWnnlRswGgaRZ4YIF9vePW2Dv3d+mVzm32UXKj80yOxecIJz6hdDvfzYmuR+2kMs67qUzoYbK/9kF92N6zkBl9NH70/c3kAbKfnWX7N4Uz+1rTqcuv0JpM+8DapsWuy9mZsTt250EWopIqAWHBgfOceOhMjP/ML1AMfwXXv6TtJ4YuoNIe3y+gLEFxVngGC30S2XNiyojaMpWdq745SKM+Yo/Rzzlla2X2G8cOBLkM9FJ4K3p3Ba3zvXhCjG18aBplHtwZDRNqIybq3OQxL2pYhPwGqT+tBYGtIsSOelPCMF7rm6IDYz2HxmNZ2yyWfrrf6yv48DnWSrxwugV5OTz9x4bk3K4gWVzqIYTP+YpooUJEegKC6qMUT3/bqirxSkTbHfZa/oS5ktwFDK9mbFy6BtnNCHicGIwUxx0zLM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(6133799003)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8wACB/otcrSe3jHEcPFgISh8MR2K+UitI2FvL7Ji6/uKWgKAGHSMamYXxb2S?= =?us-ascii?Q?cwckD6DJgVxyboyAi63mgxBK0NyLAq6tHd849zpOPkQZnpSOqr/qSkmC6XRq?= =?us-ascii?Q?SKTQRUIWZSHPTTHOIxRyljaDLS1LZ/QbVagWD/RRzXfVT97hIZ9e3QJT9BRx?= =?us-ascii?Q?v01lTfvefG2JgXzLXTF8mU7PgM6Z3JcqNhppoQLaVkzsLALv/wdnPDLwaq+Q?= =?us-ascii?Q?Mvm8LWe+KRHCfADSRStrKD51X4rBAw1MveJPmwDfF+ObQJhRvUKvnxpWHaKc?= =?us-ascii?Q?jA2PoRosmF0eAfXrhmbrPzExs6BEfptSwKqRnZ5YNQtax6OEXeRLE7ncuANp?= =?us-ascii?Q?qXpzTk69W3PONHGWQeqExJzQK1AIdHR2JEvDSitZrfVWOZsAk82b810Iwf+n?= =?us-ascii?Q?zUnGn/7tS9xB0RBw6JCUHrqqopkn/DKs1fAlzpT7rc2Hnk1sNCiVe/8KLwV8?= =?us-ascii?Q?VPfrhahHyhAv4DX6ZzrtzQaMaAy/0EGhj6IBI0R4b7iUtQdhqtFC+dAr6yuS?= =?us-ascii?Q?uVA/8+DvHQWMG8l6aYGWptgYvJnQD99FbblPtP8nE2vjocdEEfJ9t8mpz1sm?= =?us-ascii?Q?dSgG4J40TV0FvWBwxmNFkxSDuF1ceqnmdOHgIqyF8PLAEGb0UnMqc+3DFCFY?= =?us-ascii?Q?OKyVPLbIv91ipHkIqjc0AB6qniSOKtTSfNJBUBh55vNS0uwZUccRjOtNiVvc?= =?us-ascii?Q?tVwbqDvoeECrGOzJB6vbmXjF7TFqKZ674aM/K96srNf903GMlR8jfgWMznOT?= =?us-ascii?Q?H80O1WGdSKJD2yoCFTg97ndNhP5BaGWq8+trA8lA//o8FqOKARwysEFvEUBa?= =?us-ascii?Q?4Q5rU17ScbzLj+xr7OkDR+wS0pGNy8q5aO04xh4+IpnVq2FONp76QQkL75UQ?= =?us-ascii?Q?iI0NSxuvOchoMawtUioE5RJnwsXVLvV9/qMobtUHhwU4KL4kNvUIMAMT6W5H?= =?us-ascii?Q?Ew52OojHYcL+tyRfy+YhxJxYgCv/L3ruItErQR77EACXQYm5Q8AE6Dd/yXJs?= =?us-ascii?Q?8R2+KKdJrM0kdQAiJdGqa2mzUQTV90avYig3r+R5UAnM3oQk7WJkyO+jP1sp?= =?us-ascii?Q?B/UbZG0tcdLPuMMfiXZ7PM89TVWeSz8tAaxjg3paYRL6k/NeZZeG8I1Z6Ygj?= =?us-ascii?Q?M+YBHgxPzysE8Hqw/TxllFtrsdU2rWMk/DrTMueb/Y4OlcHs0sBoJxxKshcW?= =?us-ascii?Q?dr8/ZSN+ErY5RXna8bEYZLxBynQ8K0fsc+AEbDEn+MoC8AvWEzzQYxgGa/hV?= =?us-ascii?Q?fPubXaQfKcR/TuoptRkzr/vbNgSW7TYZHkg7gtOqBKZaYku2LN6agTnfQWpw?= =?us-ascii?Q?YRJDDLw17uK20WGIwQryd9SlYjbykI5Ugej9YqGz3/TgLmGeHiN72L1tHlec?= =?us-ascii?Q?iTBYVlY3/CBwqdvmppzwv0+r96ewZoKUYz5siiWDdUbSkG3phfvC/yAfCxSI?= =?us-ascii?Q?h7dvfOzKDAwEgnCVGsOHGdL95k6htoUBWN0jDZci5XnN9OEmvOJlV2rP9Mad?= =?us-ascii?Q?MnBeRxoQPx1rOq26mwbiqaX/uFmVfYnuE5NBUHhAGeBpakC91+gmm5Zlxwhm?= =?us-ascii?Q?aTwuv/X0a08hMcl/8iDHsOvANKnkG75GLc6LjqNFNmGCfW6M1cirkzPXzKrf?= =?us-ascii?Q?3FR/s/SG/QjOk0pREvryAr6ocSy1WbLeM6SMJIdzz2I3NXrR40Xe9pazUAAB?= =?us-ascii?Q?TYpAFhW04c2D9eQ0nvUiiPQATtIvWMhcpgiXM4wv18QdzNNnAjBEVZFes6qo?= =?us-ascii?Q?5/UYtH/syQ=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: da89b679-2a4e-42da-4c30-08dee77e11f3 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:18.7226 (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: hjzz3QnxNxBhsfZbsKxYoHxrgc21S9a/BG+6nto1Oviele6N+va2njNYDdfg6pTStNv5fDBYrPDF7fuKVaICnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" From: Ioana Ciornei Add the fsl_soc_guts structure in order to pass information like base addresses, endianness etc between the init time and the runtime operations (RCW override) which will get added in future patches. There is no point in mapping and unmapping the DCFG CCSR space every time we need to make a read, just map it once and keep its reference in this new global struture. Signed-off-by: Ioana Ciornei Signed-off-by: Vladimir Oltean --- v3->v4: - change error handling to a dedicated 'err_unmap_dcfg_ccsr' label v2->v3: - fix error handling in fsl_guts_init() - iounmap() the CCSR range and set it to NULL on the "err" label rather than "err_nomem" v1->v2: none --- drivers/soc/fsl/guts.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index b97eb80cea95..bb65b62ed805 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -106,6 +106,11 @@ static const struct fsl_soc_die_attr fsl_soc_die[] =3D= { { }, }; =20 +static struct fsl_soc_guts { + struct ccsr_guts __iomem *dcfg_ccsr; + bool little_endian; +} soc; + static const struct fsl_soc_die_attr *fsl_soc_die_match( u32 svr, const struct fsl_soc_die_attr *matches) { @@ -187,9 +192,7 @@ static int __init fsl_guts_init(void) const struct fsl_soc_die_attr *soc_die; const struct fsl_soc_data *soc_data; const struct of_device_id *match; - struct ccsr_guts __iomem *regs; struct device_node *np; - bool little_endian; u64 soc_uid =3D 0; u32 svr; int ret; @@ -199,24 +202,25 @@ static int __init fsl_guts_init(void) return 0; soc_data =3D match->data; =20 - regs =3D of_iomap(np, DCFG_CCSR); - if (!regs) { + soc.dcfg_ccsr =3D of_iomap(np, DCFG_CCSR); + if (!soc.dcfg_ccsr) { of_node_put(np); return -ENOMEM; } =20 - little_endian =3D of_property_read_bool(np, "little-endian"); - if (little_endian) - svr =3D ioread32(®s->svr); + soc.little_endian =3D of_property_read_bool(np, "little-endian"); + if (soc.little_endian) + svr =3D ioread32(&soc.dcfg_ccsr->svr); else - svr =3D ioread32be(®s->svr); - iounmap(regs); + svr =3D ioread32be(&soc.dcfg_ccsr->svr); of_node_put(np); =20 /* Register soc device */ soc_dev_attr =3D kzalloc_obj(*soc_dev_attr); - if (!soc_dev_attr) - return -ENOMEM; + if (!soc_dev_attr) { + ret =3D -ENOMEM; + goto err_unmap_dcfg_ccsr; + } =20 ret =3D soc_attr_read_machine(soc_dev_attr); if (ret) @@ -276,6 +280,9 @@ static int __init fsl_guts_init(void) kfree(soc_dev_attr->family); err_free_soc_dev_attr: kfree(soc_dev_attr); +err_unmap_dcfg_ccsr: + iounmap(soc.dcfg_ccsr); + soc.dcfg_ccsr =3D NULL; =20 return ret; } --=20 2.34.1 From nobody Sat Jul 25 00:16:10 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 E77DE4582EF; Tue, 21 Jul 2026 23:16:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675787; cv=fail; b=K2ErnLrH+xrfTnnsbT4ho0WETvRJ34XCF+VjQz2O6zKlZwp38weIaGj4g2x2sT1GMUH4dMqkQ6wS9JcUn7FzMyppOB4eBJNoU0KPxdE8eSy9FJr0nqrNcUHLEPtzOpVSPxEnQ+pfBV269ayHdr6lxHbN5T/ay23U9Hi2R6ng1fc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675787; c=relaxed/simple; bh=K9l+Rqlh7xChbHbE4UT/StDDMxpUqMn4UjiF2hn1fgo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=SyS9cAh9Wvco/ONsK1WTG/E3inwRqMasmcFfnoDJH2j+rMXHEBi1WWa/FXexa7u9Rh7CyStWgGOmfHnq5wDGem+evK8UFcpHuzGRj6EBaY6o648Xn8pUTiqbU4s5ozRyPPiMY2Yql75sVchT1/e5BW79jPxwXI+7FEcTb8TN7oc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=FrtXn3Fe; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="FrtXn3Fe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rRwRhqidDG1vxjMz/450xszyJEkha/HT5xbM6jL2C8AjxUJn+3Zln7szZcPo+dmWGWfVKOoEDW9kHSDfYCz74y3neXn5tP1bJlB0n60NAzgEl4QYazguk1ioXzIth1fqC4ltShGLkm9R8Tl4iuHVZyDY92MWu5091qtiULTN8SH5L3ec60n1Pv99nrWgtppvuSdDCRJhU2UjMaijyq6RXiiv4PObOu8XeoIPH2cWkn2Aq6sgvhyRncUIdhk4s/L3A966ZNIZ71jQl9zDnv1qxKSwqN0xmSP2cLxoCbW22XYIJIsxmabJGgSFWE7HK/NXqvi182EgCwwXdoPlFZmMkQ== 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=CIDqTYfdqlp5E/uzugEoduQsc5A/FkAiwVoyI5m0dzc=; b=W0WUQR6G9cMVxN35/5LwnGRxckAsPPwpKonr/p9UXnrWYjDUzRDisjt02pn87KgAE1sGU8PjI4oV0ieJqWxxk/V3ILmXom1qZ6tTLBJBL/Hp16fswWb/JYzE6SjAvXsle+CkG+qwBP1dq8qn7wFL96E0oX9cqrhS49bR6h7uEhbxsKfuur0+z+RbjlKR4SWgBsdV9T+JXCB907lhc6izOW99v2hePKPhwyMCCSkgSiw3BSpEpDIL7lo2iHYFoq8vjUiIqnrKdxS0OEF2qtq/DX7C3YQeCjijaZO93U2M/XSEN+WtP2BAUh0RllZj9A8eel/VfzC9n2L/KUTc+6E7Yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CIDqTYfdqlp5E/uzugEoduQsc5A/FkAiwVoyI5m0dzc=; b=FrtXn3FerZrqZMNtbgE9Ax2aUCsNN0sOtvkJlpIaxpSY9G14RTayJoIEBbpaP/zNXMK9AuwCQqS/ccBrf6uvmUHLDix6ibmn6zjLQAKm9ytmBbIzgJaNIQba3/sYeJjm+PiWrYyGpB1WCW3//vX5mTpFkG1z+LOGV06887wGSAMecbuQiszcBY85UlRKzwkFB4tarFRQf6PhUzlXVRTs3n0of6Qm1IYQyCZ8nhj3yrj0gJCiNvp2fxoFmQ6lX1/9zRVu8LzYz+o4uxkwLu/RTHkNNyo6ucRAhid+20ocSe09Lj/34A5v4BNbn8pTle6E0HU/EafPrL4BKVdu86LmtA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:20 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:20 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 phy-next 4/9] soc: fsl: guts: add a central fsl_guts_read() function Date: Wed, 22 Jul 2026 02:15:58 +0300 Message-Id: <20260721231603.67865-5-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P251CA0007.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::11) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: a2e5380b-7182-4704-c3d6-08dee77e12f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|11063799006|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 3CDBePcqnV8E4BCtSIp9xeQ6ZHJybYIGAYcfuJ3tRNNFOLyecor+ZXhrVkPuGwNL0nXNnt+hualmqtIz+Ytb637ZIEAUZhBHd9ILwF4rjH6I/B9GJsYeyjypjvJd8GM5m3MuuVdVDYQhn4jtk4ILmqdYLoPlMTqZoxt6sjw78H/JnrOP8lx1Zm7zm9A6JNHPcdsDtTxNz06Gz1/w1l3lGWFfZO22Ay6YwHN3Bkk3lJlRIoUwz3FCw+S3kMso2T1WF9L3gLtWnOx8wcMrPq+dczppE+QJDggj2jQOJcV2YASqMVpE8qK+8C1DOagPGQ7iQMqR7ULOFmPeNZIVxQCJo49opuWuETRo8OkC0sgsuysvHvwp3q+z2UclYQKa45QcUw1eJaTYYrbEpNs7//MXj0ivIsgChLFhCzsURO+qH3N6/i6Rfj0WXyZQLaDmbFPVGFrghp3VtXY4uGm+L/ClUNcT6LbpTi8W9lciWiqW40gu77qJp5LwtjmIPAxFqr+YneP6f+CmPIXVKktIKTqE/MnHN8MVs9nq1sA+8MKciQbm//OwGx38Qz3s+W/LP4cJ37gmdnZExRkoM9LcS5d1T5NYRmV2++9nuMLAVGKzgcskANULtKxhh5s7sJp3xeBik0HmnCDYJoTE4UdylhzPHRm12Or4/iBZjBZ2ebeeerk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?M1a7UuZi6aseiALQHej3jJA3CA/YCFquL7p0bdGakgI5BTtG/hGgG7uDPH98?= =?us-ascii?Q?zbTaszRUiZ0BX725Sy+n44ogNvkUzZbrM62g8aalH4+kph6D7KN/aa0BFgac?= =?us-ascii?Q?V7kqQiVW8SbJR2BE3yllhubeqUdGEYfM3ShjZidDvYNZkMU7lZcwWwc84f5A?= =?us-ascii?Q?DY1ktmTZJQsh1X/xQtvzaHJvinQWWO4BYrY71ibwDTUNFY78jD//5V8VaiAI?= =?us-ascii?Q?AdpZeYRyOsw1j1Pb+t1xWfOJP1FPv8n4MOs5Ap18iJnbKrMKmLAi4h2t37hs?= =?us-ascii?Q?txjae52onkeE3VU/En2aKZwr0y0ofT5lpINVNsTgsaP0Zsq3VhMxttq5Vv8t?= =?us-ascii?Q?eTo6JWkJatKzodS9dfGUhld5u+tICKsNsd/M5fkYmMS4ddfo/N19EJzZHLoI?= =?us-ascii?Q?q+aZ8HEfklvchfyKIabljDHa3AMzvNHfFhSXbFv4okB5WKxjrbOcYDmWcwZ2?= =?us-ascii?Q?e3bZca4etRR4bC7dx6pJiXUMfyhhEeXyyyOo1yGCRavNNfmQRTnmI5TMo+6o?= =?us-ascii?Q?72wqlx9N5DOXhEP9NKy/MmFoYID9u00RRb+rPhrDRmbK3KfsfN/C2nRoQIDR?= =?us-ascii?Q?u4Bzyjymsnto9DYE6JN+Xq9HcESnomkmJS6MkLzAXC4JtSm4egVdQjaTAY/Z?= =?us-ascii?Q?dqhiKra8V0Ha4ELuLzWG8x9TyRUtm6Bp2Jsh70K6tYBwUbZxdjb0LULP3RRf?= =?us-ascii?Q?ip1nr73UXYIo8OYdtnU2+OXihidjIZhGu4nrff01PU0cF7DLngQyyN+cPkhY?= =?us-ascii?Q?R1nnG1V1OPpmhAix76RI6LC33F7GZLK+HXEjhU4FLhMMzKWpu4dsLmJ7nbe6?= =?us-ascii?Q?IIfQi9nVM7gX5GthoICEqQBKt0fhNm7Zuo2boCqzrFsfV1XKF+7T/Pd0X7z8?= =?us-ascii?Q?lRJgQsZA+66lVq21zHA6io8Bgp/pQ9nJN991htSuyR3k3GXkFgpjMd2a9JPa?= =?us-ascii?Q?ZdeqBMGAK6uh8KDXP8B6qPaD/t83jUE685MIF8Z7UokWTzBsN1pgsPmo5Orq?= =?us-ascii?Q?4+RleEXpFpSJzh3jAc+CNB3pxtEt1bckDenySNSUUmZD/XduRyiqwjx6y4+d?= =?us-ascii?Q?5ROZRCd7mbY7gLJ4/A8brnGabEfQj2ADGXHhiXzliieEAVNgz/kV79BhWKcZ?= =?us-ascii?Q?aVTy8TsCSAZLAAjYuRwSDYVEdqLFpaiMna31ROIsuEZ+sIREp4QLVGoFSjG3?= =?us-ascii?Q?MxGR5GQ9hAvyXmLemYgHI24ZF249O9OM46AAhlxYf2Hqp8DklgMsm7pHVk1E?= =?us-ascii?Q?22MPBkvZ4dPWWRnv9ZuLtZlw8FOvOoN4+3+lMkrrSjzcycP+B2mB1bAqoE1B?= =?us-ascii?Q?F8SVzCzsI2b9tSzNbW04HabCyeNMo+93q8uC/yJ6/716IQml82W88gRiJFam?= =?us-ascii?Q?1TOJSlsMlBbBu4HBvVlrzWWYXt0EGnDCwv3ttT9jQHucU7wakzyjPCih2POc?= =?us-ascii?Q?49Xd0OTdCjQ/3uklK6FcMDogWTC9WBczX1gRgKv0YHgart2Bow3vYPqP1K5B?= =?us-ascii?Q?AME1ltVQQafFtm38mhe4RHTh4vWI8hvmerJUNE1ZQyWumtyKku0vvgOUN0w+?= =?us-ascii?Q?nbcJk8mVlBxOngyiyejvkDdebPzvHAfUki4xJjQtGzJX4vM2V5hmATEvyApG?= =?us-ascii?Q?ZJNfy3DdV8VXSOi9qM8QeVISV26NjjPsJdSIx0D4sdDlqZ4e1DCKAHhzNITX?= =?us-ascii?Q?bgjX8JtF8iOg8Gi1ZMGQzpIsYqUkmPldhksNg+G25BwVhNxrfHpasHY3Cwv8?= =?us-ascii?Q?wzc3tAk0vw=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2e5380b-7182-4704-c3d6-08dee77e12f5 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:20.4086 (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: Dh20q1nYq//sKbInIIhx6rlVJc9b7A4jSi5Vdoi2D0r+6phDwwske8PfyFk2k5Qul06aAxAzXE//Rk4jXPv2ZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" From: Ioana Ciornei Add a central fsl_guts_read() function which will take into account the endianness that was already determined. No point is duplicating the if-else statement each time we need to read a DCFG register. Signed-off-by: Ioana Ciornei Signed-off-by: Vladimir Oltean --- v1->v4: none --- drivers/soc/fsl/guts.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index bb65b62ed805..8e5c3cae811e 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -111,6 +111,14 @@ static struct fsl_soc_guts { bool little_endian; } soc; =20 +static unsigned int fsl_guts_read(const void __iomem *reg) +{ + if (soc.little_endian) + return ioread32(reg); + + return ioread32be(reg); +} + static const struct fsl_soc_die_attr *fsl_soc_die_match( u32 svr, const struct fsl_soc_die_attr *matches) { @@ -209,10 +217,7 @@ static int __init fsl_guts_init(void) } =20 soc.little_endian =3D of_property_read_bool(np, "little-endian"); - if (soc.little_endian) - svr =3D ioread32(&soc.dcfg_ccsr->svr); - else - svr =3D ioread32be(&soc.dcfg_ccsr->svr); + svr =3D fsl_guts_read(&soc.dcfg_ccsr->svr); of_node_put(np); =20 /* Register soc device */ --=20 2.34.1 From nobody Sat Jul 25 00:16:11 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 9F0AB45A293; Tue, 21 Jul 2026 23:16:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675789; cv=fail; b=hWiUeIPvZiKsWNtYUD7xQokAgw2L2kH97nQzEx0vsKayX1UpYacPhM5h0dwBq5YA8fFPNW8xym7q1laafbhZfFFmzmWJCWvExjX5Ga9SvWwaqDP+FLd0ZYmrSaUpLjvXteDMJIRbeR10P4lIiHWE5VnsbtUr0gtiMN8Sd2Dl6L4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675789; c=relaxed/simple; bh=uMyW5MQmQKEyCNEx5WyOzZy4zWRT2UTD2y4aKMmVp1U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Cr6vVnHF5NY5aYtk8l9ip7FBFDbhZKJgelfTUPPJrMYD2zV8adN0lpjLwk5OiB323hZr4b2IN+gZNYqV1Uie0zIwxNG2+Es+XF+9emxh/gmiOq6oCiOphwktir0gQw+lEUeVUg5Oh3ebcK9oW/EsGdAYYg/vpbp4zJ0/XbXwqiw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=HDN9VI5d; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="HDN9VI5d" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MeihQWzMdGrKa73OEmP98mnI78GIlgIbkvkg1PuDTUlBWt/1H9l/TyxJeaWASu+JiSA/d+Tv0/ysesMzHwtYDlxHBLWQc0/SATO8mu9PFN5Ajr82hNbSVTXvMpUwlBRUjePzQYaR+NKmpJrrI2DZmlD6mqldA9MR54HrUrsaqin39ac/X6BVUpJrI9y8f+K+lDYC98aw0LVJ9gxIpyyQXPKzUlVCoV51Ts0HY5cbkK65qeJ6in5HooR26ZIjjLGfSjlFsWIiNPfuktlzRiAe4HBtiM/eGESrQ+KRYDANDQ+zHRTMXwIiAU60hgdSvGlneyXbCag//MCdf/uhiKeKkA== 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=t+g0e+Hb5UAKjandlK+7YhB4+rYzl3Z0RX0jeuzCbVY=; b=drK1mGzcaQnN0AeybA+DDHYWiGXNYBGM8mMAMBxKF8ckBabFgiTVwIVU1I/+oMwEtuklx+dc/0jbeY5c4NQtxAeVqwVb5oJpfRVm+E7J/kqr+j1b2gUGI/cisbGJe1UYxkDGXFricHQ6uPAPWU5tSTPVla2chXjwmD8Gcmg5RaQYhp7dWtqMUosByvtQ23zXjSSId/rVQwuzP5+0xZ3GuMimtwWa0nrUuk4igQwOTySlWlaLRMh0spx3+fHnQ4zfpoBmqwAGDjLruLQhTOtEjb40pOyin6H9wuqwE8En0dKdbRd+EjB0rj4HE8/2QbtvlvV/WFGYLwtjRF+CDCd80A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t+g0e+Hb5UAKjandlK+7YhB4+rYzl3Z0RX0jeuzCbVY=; b=HDN9VI5d41ggCWgS2yZAFfgeU6amfh2lIG9jIF6Fr9zQ+kovflCFePY/qfJZ3cBXmGzsxd+DImh72QJd01jUa/O7djIORwfTgnhqdCpFKyH05/6U4/TrkzdroxsaVE5tn95bbkirOE4IpRU99zLMRwe2YbphfoMTxUHDj0RntSwpbjywtO/Ok3rOSSJjOe8f4PfqG3LVZJPZLTbKhi8/vorVpiijINcV+x4PDn1g6el1jDrP3gqg6ERJZN3d+6qwnxNLG5ncKDm82UuUnet1U7qXUuj8OGm613WKk/VKxCT49LPRq5DF4xMq2/6Cq3s9NtWpP+bLnGmSGwPmtoI8BQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:22 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:22 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 phy-next 5/9] soc: fsl: guts: make it easier to determine on which SoC we are running Date: Wed, 22 Jul 2026 02:15:59 +0300 Message-Id: <20260721231603.67865-6-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P251CA0010.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::12) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: a6fba0f8-0e02-43e1-235f-08dee77e13fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|6133799003|11063799006|10067099003|56012099006|18002099003|22082099003|3023799007; X-Microsoft-Antispam-Message-Info: tc0AtHBv1ZlRlGp1+4fnyblX7rI98aGewGM1pcxJvGZujuN2CNFQ6pgJV/Cf3ys9+Xs08kCdyxBIpfVM7CLR568v3y3Tzk2JVPjV7yHdLrqYf/0l56ehFNIdqMzjakGNhXAsH+GK9wZ/zQwEutstE2EHFkxJt2pJ0+yK7/ghka4tfgqR6Ds0da8X1elkEjNlDiGwd5AHkQAc7FVC09vrepABDCFBXqRBtIA9rxOIJSUBSZxWmI0IIoqsUohwqJ5mkI7P32CiPJd9t41I/HXRJxb1YmWejr2uBMz8WroYaqlxhyF7s4QoZCHk4pZ4H0ZmtklKqza9pKZ9vr7xbTYQ4hueTMj2InlvtCfwTPcTCrYs2iNGqvj+wylabLEx6+mmT40sk0CyM+mNmMvIKYFO+EHkDmkpV8uzlWdtBlhPEmpj4CFnjb+nv+LwGdqc2wrJo1G9b3n4OC6yqUJoyBArQltpmJcdC2A69aHjlO9Nf+tRIwa4JqzqezRntESbFmkyq+/whoy7mFP0dqiUszf2M5IM18wBVaaUiyOHpjuhdXM7BdquMN6zaYe0MOMX2e/NCm+uHU/2p1PV+cstNkO0HSR0lzwVzAcPXZ4kE605E+LhmOGR4qWheYYW0So2wwrxQLI2IawzMzxyDAobR7C8yR8M8JCoExeVXhJOrGL5Fak= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(6133799003)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FeLdPDJ2oMA8am5leWS+CsUJL5Gy4Af6KjQc6LZ5lY65cBD/vGGZjapgl4A8?= =?us-ascii?Q?dAbf3DanMciWcHAw7cD7fltE3YPvZ1r8NYeUd+p7OcV2MnPZVkY8AC3cAf3o?= =?us-ascii?Q?d0zdCFTw4BziNDaMC0K/O5h5TSpRO0YnPdZF1slZgXsNirY6gB/XFH90jBCm?= =?us-ascii?Q?VxUK9F5aqR4IasSMa1xWWvWJAlyu0nNiGIR54durCnzZ6KNU86lzSxK/oLT7?= =?us-ascii?Q?vjRdrPnb0Dw3RE7b0inaaQWGGlR5LFtXd8eAYrZeXquqP66tiRJ0awCHvoCE?= =?us-ascii?Q?ujK+YGh6R82F8I1UbSbfdC9vTR8njWPObgTF+tCD4zAb56jxdZ6+NYzldgF5?= =?us-ascii?Q?QLX8O1jUtP7O4kma40kLxGpMtlyqdbnYqKJFu4zMY/uUCXKPzhe4q1nNRODC?= =?us-ascii?Q?ZYWNkfQHm6Mmpm/a81cLPNQDtFvo0eKjAQkE9aw/RTYQDWQ77RrxkiNSw3kB?= =?us-ascii?Q?WaDWBlMFBES6bbYl/SxQtsp8kAEHoCz1Us9YgGDp+Pf3OfD2bMcD32ET1XrU?= =?us-ascii?Q?jVxfK9e+Wz6zB6LFv1249LZEfOSp+EzEmWGpKy9k61WUfzpzNULOBwh7bH19?= =?us-ascii?Q?qa1EWldzBNY/SmpiA32VUrLgszkOJ7FqbLp6u2n7Wsp0p2pn3E5ewTHid+D5?= =?us-ascii?Q?XAGUpOGs2DHPTBayAu+mrR+bC6Jcgwzj7RxwdXdeVzucEl7HqwBIGjMhKug8?= =?us-ascii?Q?Fu+Gb2mQ/2nII/h1U8EZHumJ2Gfw/nCLzZqMvE2bFtxmWImYxPfRkmaBVhd9?= =?us-ascii?Q?YBcvPCTQ4iTgWrOtM+IUjdQUJncloGnbcLRycpIylezSsk/evgYFdD4RTX3l?= =?us-ascii?Q?tyMQ1543NiKiiv9no1yaDfBz6Rh8o8EfOifznEFlp90Se0/+uuEHmYNlEg4b?= =?us-ascii?Q?LiOKStAxJEw6KoPbHSID8oHACuFbJP3fKGm6cHHfE20ZjatlmCTODH/pIn34?= =?us-ascii?Q?GtFtT96MeKBUbibSDGfF5WjK0IQclp5aYS5xsa3OCWBMXX/ipV4RzxYz0yx5?= =?us-ascii?Q?E/XtXX3W3TJi+uxQ1zEE01ZHUgkmzelWgSvyQqBAchV7lhP9qOiKhutVt4M0?= =?us-ascii?Q?R5+i6LqwRuUz70VcOCxt5QoGhMv5lWMO1YSIhDP1bBeceuI7mg5i1yNAo4M6?= =?us-ascii?Q?JR5d4b16o9XSfJQLCDq1mAJmO27Pfbq+GIB7QJJ069OudgsCr7tx+tc5Tod1?= =?us-ascii?Q?NXOS9nGhLKyWD/dTR2RJvIQj585R6ufw1OnsIg+QbxRjJSWqEQlFjncew1OY?= =?us-ascii?Q?l+D2VMrEOUX0O050gHBlao8d9XQiGJjyA09BWovzDIYh8xiNQy0QRFvpJy+r?= =?us-ascii?Q?MCgB91I6O6fvtubsX3OJtYvJVEcAP0v4DyCr97cQd9vHucrYOQFXZ5g2ZKRv?= =?us-ascii?Q?jP3BDE5W/1uJiLDLD+y0ivi8E/DfCXGkJQvUALgqsq0YEVBL0jCQ7WEyOgqO?= =?us-ascii?Q?6+Xh3N1Wyr9MmfmhwkMZaqtOikmNZRzZzJbdxPsfXh2sA3It7/7Fj+Lpmtfr?= =?us-ascii?Q?u0udR7zQQn489NmFWAWagLIZRuBx1LibEkTiSyL1Oev7E3l2SHbTQL04aaQg?= =?us-ascii?Q?LG3k1HpxJ5AuUE4GrBKYLqeh/+1LWa3aWo3/W921GAwCq7S0wmCje51qHGjs?= =?us-ascii?Q?8y/IRM+9hyF3Sku8PPEmSrM6XtRUEuItV+T2AVesTjanWQrOA8OP8KjSWHhh?= =?us-ascii?Q?ZHJ5UXzRcp9lKk8ROaV1B6/vgvS4XkC+Wl1wcw08zgPYPh120s3/lSZIi0Mj?= =?us-ascii?Q?H1rYnIXGAQ=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6fba0f8-0e02-43e1-235f-08dee77e13fd X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:22.1452 (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: +APHbQiqt59yRRvYoQ84v1arCJbAHaA7w/iy6yVPDCfULCBwSwfHtNoEWR0J1H0gFoF17AZo338DE2tTwkp3/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" From: Ioana Ciornei The guts driver will need to easily determine on which SoC it's running when it will need to perform RCW override at runtime. The guts driver knows this already because fsl_guts_init() reads the QorIQ/Layerscape architectural System Version Register (SVR), but it doesn't save this for later lookups. Add a new qoriq_die enum to be used as an index in the fsl_soc_die array. A new fsl_soc_die_match_one() function is also added so that we can directly determine if the SVR is a match with a specific die. The SVR value read from the DCFG CCSR is also kept in the global soc structure so that it can be accessed when needed. Signed-off-by: Ioana Ciornei Signed-off-by: Vladimir Oltean --- v3->v4: adapt to different error handling scheme v1->v3: none --- drivers/soc/fsl/guts.c | 47 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index 8e5c3cae811e..15674c6734c6 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -27,6 +27,23 @@ struct fsl_soc_data { u32 uid_offset; }; =20 +enum qoriq_die { + DIE_T4240, + DIE_T1040, + DIE_T2080, + DIE_T1024, + DIE_LS1043A, + DIE_LS2080A, + DIE_LS1088A, + DIE_LS1012A, + DIE_LS1046A, + DIE_LS2088A, + DIE_LS1021A, + DIE_LX2160A, + DIE_LS1028A, + DIE_MAX, +}; + /* SoC die attribute definition for QorIQ platform */ static const struct fsl_soc_die_attr fsl_soc_die[] =3D { /* @@ -34,21 +51,25 @@ static const struct fsl_soc_die_attr fsl_soc_die[] =3D { */ =20 /* Die: T4240, SoC: T4240/T4160/T4080 */ + [DIE_T4240] =3D { .die =3D "T4240", .svr =3D 0x82400000, .mask =3D 0xfff00000, }, /* Die: T1040, SoC: T1040/T1020/T1042/T1022 */ + [DIE_T1040] =3D { .die =3D "T1040", .svr =3D 0x85200000, .mask =3D 0xfff00000, }, /* Die: T2080, SoC: T2080/T2081 */ + [DIE_T2080] =3D { .die =3D "T2080", .svr =3D 0x85300000, .mask =3D 0xfff00000, }, /* Die: T1024, SoC: T1024/T1014/T1023/T1013 */ + [DIE_T1024] =3D { .die =3D "T1024", .svr =3D 0x85400000, .mask =3D 0xfff00000, @@ -59,46 +80,55 @@ static const struct fsl_soc_die_attr fsl_soc_die[] =3D { */ =20 /* Die: LS1043A, SoC: LS1043A/LS1023A */ + [DIE_LS1043A] =3D { .die =3D "LS1043A", .svr =3D 0x87920000, .mask =3D 0xffff0000, }, /* Die: LS2080A, SoC: LS2080A/LS2040A/LS2085A */ + [DIE_LS2080A] =3D { .die =3D "LS2080A", .svr =3D 0x87010000, .mask =3D 0xff3f0000, }, /* Die: LS1088A, SoC: LS1088A/LS1048A/LS1084A/LS1044A */ + [DIE_LS1088A] =3D { .die =3D "LS1088A", .svr =3D 0x87030000, .mask =3D 0xff3f0000, }, /* Die: LS1012A, SoC: LS1012A */ + [DIE_LS1012A] =3D { .die =3D "LS1012A", .svr =3D 0x87040000, .mask =3D 0xffff0000, }, /* Die: LS1046A, SoC: LS1046A/LS1026A */ + [DIE_LS1046A] =3D { .die =3D "LS1046A", .svr =3D 0x87070000, .mask =3D 0xffff0000, }, /* Die: LS2088A, SoC: LS2088A/LS2048A/LS2084A/LS2044A */ + [DIE_LS2088A] =3D { .die =3D "LS2088A", .svr =3D 0x87090000, .mask =3D 0xff3f0000, }, /* Die: LS1021A, SoC: LS1021A/LS1020A/LS1022A */ + [DIE_LS1021A] =3D { .die =3D "LS1021A", .svr =3D 0x87000000, .mask =3D 0xfff70000, }, /* Die: LX2160A, SoC: LX2160A/LX2120A/LX2080A */ + [DIE_LX2160A] =3D { .die =3D "LX2160A", .svr =3D 0x87360000, .mask =3D 0xff3f0000, }, /* Die: LS1028A, SoC: LS1028A */ + [DIE_LS1028A] =3D { .die =3D "LS1028A", .svr =3D 0x870b0000, .mask =3D 0xff3f0000, @@ -109,6 +139,7 @@ static const struct fsl_soc_die_attr fsl_soc_die[] =3D { static struct fsl_soc_guts { struct ccsr_guts __iomem *dcfg_ccsr; bool little_endian; + u32 svr; } soc; =20 static unsigned int fsl_guts_read(const void __iomem *reg) @@ -119,11 +150,16 @@ static unsigned int fsl_guts_read(const void __iomem = *reg) return ioread32be(reg); } =20 +static bool fsl_soc_die_match_one(u32 svr, const struct fsl_soc_die_attr *= match) +{ + return match->svr =3D=3D (svr & match->mask); +} + static const struct fsl_soc_die_attr *fsl_soc_die_match( u32 svr, const struct fsl_soc_die_attr *matches) { while (matches->svr) { - if (matches->svr =3D=3D (svr & matches->mask)) + if (fsl_soc_die_match_one(svr, matches)) return matches; matches++; } @@ -202,7 +238,6 @@ static int __init fsl_guts_init(void) const struct of_device_id *match; struct device_node *np; u64 soc_uid =3D 0; - u32 svr; int ret; =20 np =3D of_find_matching_node_and_match(NULL, fsl_guts_of_match, &match); @@ -217,7 +252,7 @@ static int __init fsl_guts_init(void) } =20 soc.little_endian =3D of_property_read_bool(np, "little-endian"); - svr =3D fsl_guts_read(&soc.dcfg_ccsr->svr); + soc.svr =3D fsl_guts_read(&soc.dcfg_ccsr->svr); of_node_put(np); =20 /* Register soc device */ @@ -231,7 +266,7 @@ static int __init fsl_guts_init(void) if (ret) of_machine_read_compatible(&soc_dev_attr->machine, 0); =20 - soc_die =3D fsl_soc_die_match(svr, fsl_soc_die); + soc_die =3D fsl_soc_die_match(soc.svr, fsl_soc_die); if (soc_die) { soc_dev_attr->family =3D kasprintf(GFP_KERNEL, "QorIQ %s", soc_die->die); @@ -243,14 +278,14 @@ static int __init fsl_guts_init(void) goto err_free_soc_dev_attr; } =20 - soc_dev_attr->soc_id =3D kasprintf(GFP_KERNEL, "svr:0x%08x", svr); + soc_dev_attr->soc_id =3D kasprintf(GFP_KERNEL, "svr:0x%08x", soc.svr); if (!soc_dev_attr->soc_id) { ret =3D -ENOMEM; goto err_free_family; } =20 soc_dev_attr->revision =3D kasprintf(GFP_KERNEL, "%d.%d", - (svr >> 4) & 0xf, svr & 0xf); + (soc.svr >> 4) & 0xf, soc.svr & 0xf); if (!soc_dev_attr->revision) { ret =3D -ENOMEM; goto err_free_soc_id; --=20 2.34.1 From nobody Sat Jul 25 00:16:11 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 926B645A292; Tue, 21 Jul 2026 23:16:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675791; cv=fail; b=FOxShSHdybpGqmya+XTHnCQg09j6B/vOVWUq7POJuO7hCmmiuU0+qTYik9HdwlczJN0WxI3ymt/iyW9Y3SlG0cUB+6eVTIrCdw81KWPN6CF73j1vs6rL6kDIcTFHzCbD8bR9SHRVgCEcBjaaJqsultUg+CHh/uoVSykroZEqTww= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675791; c=relaxed/simple; bh=hBsxchzKeE0UGTpxzadUkjJkYchuIu3pT5/D5fSUpXU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=mmaDDVCp2aQA//z8PoDeyJZARoTPOrEtgOOVgO4ciwH2KlWwgLoJSTwijiJLk6HJDpsl5E9IIjKGBtLPjyWs3a8PbFmusNkPmysP5WdIxPXBu6jkIRbkH2kICl8INuntAxl3994pf4yAlQe3AF7OSrTnvT/oNaezPmpcj90zKJk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=oG2Bhm1B; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="oG2Bhm1B" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i/3HSPnwd4wXocBfCOLUsC/ekhyV7sMnCi8c9Bp4nMdvybEe8axGyd9IEiJ1e9XVKsj1pLAxcmQbWVqayeBOtzeOTK6uhWwcSqvfJiQw9C8MztUOh5mS8qYjVmq4NWeXBTLprbBe8qKVZvv5gxHbgZMLlwy2S4WuhTjOLyX9MnpRL9rW66rXaqL6njnh6fhICEcfUbsjx31TCePd9UHBsrFDkqS19HIBnPLy1xPIZJH0kIPdwHavuvbqQCYoRQZKrIzeGoC2BxqOUTSehnDiV+eSZZTDiQ5dg7DUTJVy5W6xpkTVrBHK2AU7AUr7AoD1TLXo5L1pxXdIhBkcnnr9nQ== 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=MYB23kwk5aBzZ3ZWy0IJZ4ZcX4vE1Dk9+/eT5zIeQhg=; b=O744GMDEohbSavlFZbN5JSCrhM1rWBUfRmzPBPGN3hF6YW80cVbfhva2nGFn11P42aXWWnS/YTZ5A7VFNYO/2H+Zhbj/YxGH1DYmQrpKF78HZgVrZ/Qh09RpSROyOyS481E4CIgXcQCj1v7INkwikGxixlkbDCrW6daET9wdC+Zvj41Mj9OMBXER7t1tCRmzcO6SpxQpHt8i9AWeWkbrSnCNoCa6TaOT59OX3mX9WMzSxp8bJmhOwjcwft4e0fv5vdPSUso2Nj7Lytz3jqZfq0rKxnQPKW1QKPEcvOjSGa47pEcYhbIIRpwwZQonVEmOVK4Dlq1nInh0x7dqdoe8mA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MYB23kwk5aBzZ3ZWy0IJZ4ZcX4vE1Dk9+/eT5zIeQhg=; b=oG2Bhm1B6dC3PLDviuhVzTSahIXV5SOQcZWccJqAszArANIbN5jiMXnl6ASNNu5Fk1oCQGSNWC1LBfkPa5vO1F0T+RIUJ8nDctt66Cew+NzqAl+NXcKjanLqpDqPbCjBy8spTmaFQfqn61vF5TnrsYAp6O5rRbsFPDfrjoIjF5KFmx1o1FD9IeWej71hMEBDHN67nSf3GkJcYFs6kZ6BfkNUICU6cWFOaSNakYWF6O2eQZe/WEZBC5IjOy0rYEtQnaZDxVRjy8HoqD+Ke2KWYuN0/n6pwXYH6iIppnhrzBzSBBr0j3EXSFg+QsVqXUwBeVuo5EJi8m9gNJPgwCz54g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:23 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:23 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 phy-next 6/9] soc: fsl: guts: make fsl_soc_data available after fsl_guts_init() Date: Wed, 22 Jul 2026 02:16:00 +0300 Message-Id: <20260721231603.67865-7-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P251CA0014.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::14) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: e5412568-c2db-48e4-1cd6-08dee77e14fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|6133799003|11063799006|10067099003|56012099006|18002099003|22082099003|3023799007; X-Microsoft-Antispam-Message-Info: HZMSsrRmvabJGpfR22PKrQcjLZLUBwoPVj/QRsSE6Aj2hvTLSvprA9mAAB2XziO67v+/xaL1RTI4Shr7Ps/s9AqbnXLRZNOMcmGnlt3lhXNQF/PAf/9mE1AWfaHoerrPR+bBaYxhlCatkZIAd8YEEbNp9qJYeqK5ZJjVq4PMBaW0uSEZRIU8dPyuiKBekLFa/NWHdCS6Mw5y/iW1wpzA1UUa8sQpCFt+LGhQ+KYuxlvd8TphjDFGydPoms/wRcYi/Vnb6tw9LLNPjZRXdXukqABGnyNXywM0V5A/DgglxBrSjmTIjeDYYvO5u5GHBXBNqP3OjuUUBnkBl5UdOfNwJGvf+mZS3FdfaQ7vfucsvYhJruAA04jd1TIGuIqlaLhOHXS9bqupE9yqKqbULZlnfTQJpsGJcAkCFJX70m3mB3/10AFgMHBpKQ72oD7rRHjbgI2rKs+kcjrHpNStOoj3I896rRqHYmsLS/+xAd3tMur098zDwenLwnrowQI1SyyG5GF1Cu+K1zY7amjLySaquC8SaIDBr6BKqEols9ybnwGdOOSrL1HcqnLOh8+8R6+DlkFwxnzPO/3PVfgzT9YMSlJH9i3YMQiEq9npt78iGFzMtPs3Q+/7sF2N6yElRL4IKRL/CZgiptDqWav7tDRBMg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(6133799003)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+6j7Sej2e4MmTZJVIjtkpAImsXzBjZgCFQmx0qGmfWtICco2sHn2czVl/Fzu?= =?us-ascii?Q?fypyPt7yuucmq2O24XVjooT+8P25fn8k/o1ZRqXVlKPZI6xIlXHhpEMDXUeB?= =?us-ascii?Q?Z3JY0FAwLLjiX6UAUSLepbUHHd4VQhGSrVkSIV+l+i7a6qPsuiznUH5gtdMM?= =?us-ascii?Q?cbukjTQghX6ucyfbYnE2H9AB7O41BFqAZkhPMiIz+6x7cqkzqCdr9Rpfnf4i?= =?us-ascii?Q?BUKl63bl2XNArZLol8la2oK/D8w0k/BCRIIj8BZYzagKRUAtnYL/WsAfe9IO?= =?us-ascii?Q?mKfBCZc5OCVWbulaFRbTpiPkIgFbl5Mn1NS4Yj40cswPaYqHzkx06pXVAVKM?= =?us-ascii?Q?E8N+3Ry+90pca25e5lHBLWwe2OpruOtpqzgokugbBvrV+WKtB8vvFQruQnxk?= =?us-ascii?Q?D8hZQaoBY9vT3STeILhGwU1BFaQm2JHB4LrMXiOgg9U5WTzbaNsOFdUtblkx?= =?us-ascii?Q?OQt3r5Gei5RbqpCswruxDd64APOJjtnfQwa32GrXYAVLzJHGJIBKTryKsKgI?= =?us-ascii?Q?D7CNpJ1YBvKvswpVI1AMz5z6rpQoRO30CyL5JEyc4rtj/9z5FRryrqRD2sAn?= =?us-ascii?Q?o3gbzeGDcQ28D9waZ6QcNNamrrUxh8xCEBUH3thXDLZMVJJhNT2P9D4VLTBh?= =?us-ascii?Q?uyhmb1U/ww0oVcPrrabJpgiPr2ea+SmVUv3csvZjVNLV9MAOQcRzvOQaHpml?= =?us-ascii?Q?OdEQqXBPZSDpq6/aVzIdRr5uyaLJy6zhOp87SqgcDY0Q9zK1gBTXFEl/zlAj?= =?us-ascii?Q?9UePS3QarJVJ9ixzPK8Mz4TLKB2/LgXGItIWgegKubpQ+G+9/B3O5T7EWqfc?= =?us-ascii?Q?wbJ8/zn5QFWpZ8og2KsQro4zwkuG4VEEoA1SR8C0wsK2GmSjYXo7S/M/KrkA?= =?us-ascii?Q?glfJ+fsRCuqjbWlN/slb0GfWbndFXwg+y2UmD8CiJu4EdwUO/Ddectm4s3eG?= =?us-ascii?Q?uvkHeuoItr6XKZaIPElCcXqp4sN/10Sr5NbsmeN7NmAWPHQrX5qs5YBQ/Exk?= =?us-ascii?Q?OQO7CMooAa8QQxN+D0mD9VeE56o4HJLlpS4rWMb6TcL0EHN/EAS338LO1IiM?= =?us-ascii?Q?H8Z1pe1ORe11zJwbR3Of35vqCgmnP+FTPGszMqmsAYusAOM8rXceOVs3K9oq?= =?us-ascii?Q?s2MIIsU+NmpviEUzFIuLQ4h33ZWYaUYImdotYgVCF1ma3J7m6IMSy+e5A1Ln?= =?us-ascii?Q?T+AxwgnOzvghRWgZV2JH02YG+O0Mzzrl7uLfOTLmuT16Z2DBIvqDeMpLh7mq?= =?us-ascii?Q?ZxnCKN9jNDBOMJiYzuesOOmzqSRbMr7XyURx820mszXJ48dUP7nf5RPSlSnA?= =?us-ascii?Q?4WZs/E5T82YvWB3zUOJdu+Tlgs8e9Q02l6XjovdOEFLo1Z8H4BqicyPPc/nO?= =?us-ascii?Q?OB55No5k1bKS9eymQEZMCk8MSNvhwMsiAmJ2/C/x4TOCRBAwgBOXdT84RtAM?= =?us-ascii?Q?Uw1HtrjrBvDOALcGxrws/pOJGXxN092UiCJ6vr09plVklY9xtcjF0nxQozMI?= =?us-ascii?Q?RqkC0QS7HBSI3I9CdVJN162f/j5DuoFKiZRhrGi7voHduQxst7Rvf6IJJa8C?= =?us-ascii?Q?69gOECbCV5Hh2XRYsfNieUhGo2QLxkebwnoAwzcivSmznS5OlRr45BpvOL02?= =?us-ascii?Q?YI5IwuiEKQa0xOoYayh0am0v+FQ+BNPG18Mrt3kAWEPvHz0z3o0hVq/Yy9ek?= =?us-ascii?Q?8ndnTStsp6WBq26Swaf5+dphOBsialU8HLCRRX98WRXDTJaXa65QY0o8deAi?= =?us-ascii?Q?p0qbQzPyTQ=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5412568-c2db-48e4-1cd6-08dee77e14fd X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:23.7968 (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: lCUa9Er45jyj0dgt3Y/6YFArAgQY/dYuNAOtDptJMMStNK1ZuoTFtkBHoEJRVt6z9slblehwZA+5R/P7+iMmQQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" In a future change, struct fsl_soc_data will be extended with methods for performing RCW override. Since this will be performed from a calling context outside fsl_guts_init(), we need to keep track of the soc_data that we determine at fsl_guts_init() time, so we can reference it later. Signed-off-by: Vladimir Oltean Reviewed-by: Ioana Ciornei --- v3->v4: adapt to new error handling scheme v2->v3: don't leave soc.data a valid pointer if fsl_guts_init() fails v1->v2: none Signed-off-by: Vladimir Oltean --- drivers/soc/fsl/guts.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index 15674c6734c6..c283d44b68a3 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -138,6 +138,7 @@ static const struct fsl_soc_die_attr fsl_soc_die[] =3D { =20 static struct fsl_soc_guts { struct ccsr_guts __iomem *dcfg_ccsr; + const struct fsl_soc_data *data; bool little_endian; u32 svr; } soc; @@ -231,10 +232,9 @@ static const struct of_device_id fsl_guts_of_match[] = =3D { =20 static int __init fsl_guts_init(void) { - struct soc_device_attribute *soc_dev_attr; + struct soc_device_attribute *soc_dev_attr =3D NULL; static struct soc_device *soc_dev; const struct fsl_soc_die_attr *soc_die; - const struct fsl_soc_data *soc_data; const struct of_device_id *match; struct device_node *np; u64 soc_uid =3D 0; @@ -243,12 +243,13 @@ static int __init fsl_guts_init(void) np =3D of_find_matching_node_and_match(NULL, fsl_guts_of_match, &match); if (!np) return 0; - soc_data =3D match->data; + soc.data =3D match->data; =20 soc.dcfg_ccsr =3D of_iomap(np, DCFG_CCSR); if (!soc.dcfg_ccsr) { of_node_put(np); - return -ENOMEM; + ret =3D -ENOMEM; + goto err_clear_soc_data; } =20 soc.little_endian =3D of_property_read_bool(np, "little-endian"); @@ -291,9 +292,9 @@ static int __init fsl_guts_init(void) goto err_free_soc_id; } =20 - if (soc_data) - soc_uid =3D fsl_guts_get_soc_uid(soc_data->sfp_compat, - soc_data->uid_offset); + if (soc.data) + soc_uid =3D fsl_guts_get_soc_uid(soc.data->sfp_compat, + soc.data->uid_offset); if (soc_uid) soc_dev_attr->serial_number =3D kasprintf(GFP_KERNEL, "%016llX", soc_uid); @@ -323,6 +324,8 @@ static int __init fsl_guts_init(void) err_unmap_dcfg_ccsr: iounmap(soc.dcfg_ccsr); soc.dcfg_ccsr =3D NULL; +err_clear_soc_data: + soc.data =3D NULL; =20 return ret; } --=20 2.34.1 From nobody Sat Jul 25 00:16:11 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 62EDC439010; Tue, 21 Jul 2026 23:16:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675793; cv=fail; b=j+lmtebp6SKpxZgg+o6K6VDUuraatrs65NLo9rTSAF1nLoTBkP1jgEZLBDsBwGZhqOhMsTklLGXV4GkwoNH0LzascYu4HvujcMbr2R/MXQy6nhuECjfmndG6CeVm2t1PROEmQiFB58E4S8R9dHQdkHcCQRjt9SV8bkf/UIiX6XQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675793; c=relaxed/simple; bh=FYVTffs5zETNbR1w2QxfUN/gtqbRyPMCVGo9s4qF3ic=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=SkMusTc/iK0ma462M/ZD0d+BEbPnYM6jczsLFZn42QbwsCY5tuD9D8ND6wxvwcrdeF2I7p/nwqExK4rr8y/Ddm3y8mR9Herpf5915a/tPjO/Ph1tcVfVkeLrSkp2DxbrBK9poabK8EeByz5rSh9DGJ35RHuiE6WqqzxOjerOuRA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=kZ9tAUQT; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="kZ9tAUQT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DAAUEOu9UY63HQcF64U8/3v6j9rpP7QVDHLIWan4gwzaMTBtZiMXVg282oO53fKCPlGFdwI4rerSr1PKStylwaEBGH5i+WF76sdRQJF8lvl5Ww148MZqxrlamdCwkFvrd4mWaJ2UuqgFNW2sVPlVeIUYW537GZDLCNTUqvH1+Tf+r8ZXf5st+fUHRk2Oi5ZiykDVEHl8I0QoWEzeE0zHZv6S5fUMk/GIK06WO2duvP1UrWqX5zvY9KYeHcWaEVOc+ncF3Vn3dWMutBf5bnrEvxfPGeMsKv4zruceP+feO15jtGydRCPQmdxQOuc+/G4li4lmzStp7Dn/REotzzqQXw== 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=KKegREu3glqndmGvfEg0H7wqjsqOj8GsK70+YRgf2Us=; b=NMP3wyVZzVcOHiTbQhIdg36u7BeKbPg7jSpPUIIp97/PS9D9TfI8ExEDvXxbwmupLM5CfnNYlDw6zYBrnNqUu5WCKAd/xlCln0cfhastwBwFizb/WeVuYgy2PgBo00XT5lzIcRYgXW/R0QiI0/bunIUYR3q3tE5KZcYj6UOle8WXmTYiOGuWV2B2TjA0ukXVT/ikb2x6sD1TJ/FIs4on9JT17jyPw7MmJXjvMlW2eNET5XvwYy7ysmbC+wUbVNevSeoojr7m6KGoXzdj+qsC9CeeER+JiRnid5Dcr+e4OW0TLLYRk4EIA8bnDnFriv7shBskS3Y0nTo8wLF6jhqQpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KKegREu3glqndmGvfEg0H7wqjsqOj8GsK70+YRgf2Us=; b=kZ9tAUQTrYFfBXF+gzyL5FKjdxTOx5mWDvefXxiFnQ66tlecafprYX+9H0P4hazxV52WbDpwRWihktWd5pz3L3myRRMbDiwkaAktT81g0/vvAAsIdhbB5YE8uE9GKGNHdkVoMEpg5nTiOuOBvZyBQvCGz5ys9KBPuwVpeaZ71QZQUISxd2tpL9n+wnvlusQ77ls+MGC4dzUl7LxUXK6GcoES4wjjVwL/tmSKeH1r0yq79GnhjgMzKl74CbU6KyYiyjY+A/dACTeFgHd1MAAihW/ZMXCFzjFRuw5VdsBaVF57q1kHhdS14/dSCpIx2wom1szFcj3JrxRwod2wD36mGg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:25 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:25 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org, Conor Dooley , Conor Dooley , Krzysztof Kozlowski , Rob Herring Subject: [PATCH v4 phy-next 7/9] dt-bindings: fsl: layerscape-dcfg: define DCFG_DCSR region Date: Wed, 22 Jul 2026 02:16:01 +0300 Message-Id: <20260721231603.67865-8-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P251CA0006.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::15) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: effcd2bf-ba0d-466f-59eb-08dee77e1600 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|6133799003|5023799004|11063799006|10067099003|56012099006|18002099003|22082099003|3023799007; X-Microsoft-Antispam-Message-Info: ltJVMCj8eMthBQu2qHjj/CIFz7h+8njEyibubc8t5TSBVAUlSc4uAHW0WtydDGQRNg/D/d6JaSvaOrmtDkP2NxqXwpKcp32W/eHGSqIap6KEt1hD3cofvi4VN/VsYVzSDe5ceuGJNkddg7oFRo8bzFuprUNs4UNZuYF+ONQy6BGYV+ozqnJttwhmrWzKTZjb5CV+RS7T2fWNYE3C4tlOdoe7n73S70scYgjQMYGwWwTTauowrfgBNSz/ngRUVERyMkA7yC2DKVQKth6FlaSJUaI2qBL8TBS0MN+YkDCDMGzGuGv4Bhh5PKCWa5V3vAAWBZTagJ8/06KM/bvNe/QTX+pLdUNqMgOFeaVx/vMqy1eVwpYuZpvEdSZH6wKyuKNIKipT8TXSHrOjmzqrtCnUwPLIPZF+dRZXbvB85pkFsb2+E/Z2pniHJm/k2yPdTnoc0wLV/nEhSkh8GZ5bWgVXxv6RfpUNzHaV1FBAggVhGRO+7vRlaQFLdaWZH4GEb7R3L0KA7B/uI93xQ4oKcYXzxMfvaG9OGZ/6pVto6KtOc3IgIuxtTMsDYmNi3KW/u4M2LTfYAjgKWfVNciFUnnRB9RYE6OWqjwNtIwU8e+OCGPFeNekA4Vu1qHe92Q0sOk/PsiSLc4aJCNwwLH3AFpFDeioZsLiZr/E0wE/DWaImUVM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(6133799003)(5023799004)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z5gORMieo6qS0M3aAqctk9dVSZmur+TGI5Tk/Y8WnsFZYGCrpmivJFVDHI5z?= =?us-ascii?Q?Cmq8g0/cnClmDmpJLSdhUDpUUrQ/+0YJjbq0Y0xcRKpVZFbAvUC7Zx6qgiwr?= =?us-ascii?Q?DNtSKJC0kAWOc8eitmbHoWBYs7GHTebGp+MxLPixiRV0y8peiDsdQNbVeEFt?= =?us-ascii?Q?BdA1XiA5KuxNMsgwULLkUrSMJW6hRdj/dXOpo6509kkdQpc0PWxqIlmXDFRm?= =?us-ascii?Q?yK9rocjwsv0xG5ohYtRSnjzwuSU08wt6tPLrnH+crAAZZYudCBz+XqIG6qE+?= =?us-ascii?Q?FJ/PHoAdwwmgWo1c98DyHsgHCGrizIUOjDGomkPJOaygvQfk27cQDpVacXrt?= =?us-ascii?Q?FKy/dTCyuprQztkaUVxpbqgIy0uEXOPX4kOQv18AqYj0ZtxzrHvgw5+T0LYu?= =?us-ascii?Q?Lr6OHjPcB+lAgv9tDUE2Egar6hT+C3rHXdVPgJoJqjQVRqWH0aOxn/ru2E0b?= =?us-ascii?Q?xnYlVOpYEu4FwnGuKhBPluRr5Fy2QkTmoxHeSdXNHkVbInCgXHp43vCXfFKp?= =?us-ascii?Q?A5IFCSpnYMYlDp4clDxWiC91A+/LfinV7nBKSzohnJDEGfeZlzI2kncd5fId?= =?us-ascii?Q?FZsNrmAbRnfI9ArI0XYgJPIiP3l+CpDrSQ8ZjLuYFToO1GxksXjqWQ1c0ti+?= =?us-ascii?Q?TGosBLTa08xq9V//QkGyx0cq09W1ia9E4b6jzN4GXb8zpAq81hCkOfSYSsIJ?= =?us-ascii?Q?qnkzjfbv5EH7XH97+f0HzdFyhZaTyOhFOnnYZ4ebNYwIxQLvNVNUu1q5PGZg?= =?us-ascii?Q?L2evboYoMnzGWR40oIsyqes//aKEmEeHtUBjtHUGcOKTqxAYpsVAGVwSRKhi?= =?us-ascii?Q?KAwu+i8w16Xv8N8MEaU76iu+mRf9OJzbWr0QrGAccTXXnR9ZE+/uXDWciKrw?= =?us-ascii?Q?IOxvHy4h3Tk4fFla0rjK8vDLmZpBoIbCPWMR5KNdAJmf/BE1KTJoydiP6za/?= =?us-ascii?Q?Wu53bMowVoDo0nZH6Lm7fPJd++wSxT9rulMWzFYHQZK31VxP5EdhKo7GLZtC?= =?us-ascii?Q?JLp4uyOEq6dYMUQf9BH1QyXP9P8rvKq8j1NBxupXySefvt3p+gKymbUdX98p?= =?us-ascii?Q?eYqfaNGiQ0i4SFJ9Uwcu9RTT9j2pE4Nlx3QJdGNxgJq2nOrYPnku1v+5X4UM?= =?us-ascii?Q?ek0FodsOO6+3qZOpMmaVuE27ViCYRI+y8eawQJ5TfElM5ibWyX6QLU8FhdKK?= =?us-ascii?Q?Vm3Bj+qT2JPDi1cq/CtWpBUAAe9tf9Eq25hyFMGIQvI1kDBwlTzl2joLzX8h?= =?us-ascii?Q?S2t7VDakI0sPL3Gkjw4oVi15S5vbcR9MkqT2AA5NK+nIelLda7xpJC69O4d4?= =?us-ascii?Q?FgI2QNP9GBVyFRUaFp+DkFCqY4a2UNWEELZWWDJB/yEdPsmgtctzV/u0/ByU?= =?us-ascii?Q?wvnGt4Hwa8CtD1nTEIBs9GY1LdHxW4XScOY7H/cnZkIJljGSfkn20yxD98zv?= =?us-ascii?Q?6SSlkKAV+7/jvN1glWyRUluGz1HycN9isRBlxz/sPv7sRCk2k5qK9gQhWiYW?= =?us-ascii?Q?RQHjwWyq30Di5G2Pmh3ZoPN/9cnwyEgQeZQuSz1gsmBL6kb2mj6ru77OLe7D?= =?us-ascii?Q?SZJQ2tzQmZkoTKev8yB+bo7xGmrWOsVbSQ0QlpCesqY0ki3ofbERNNV2laOK?= =?us-ascii?Q?kWCkJhJrkA+rWBBgmTSp0QtMSQYnFDKI2R2lxTdq2gOvTU0Y+H8HegBaVd0U?= =?us-ascii?Q?ynXvhPb2AdQHABbookoJ07i76Fu7osKuhcr/pIupYo7z5ETrCQkD6mzJruyZ?= =?us-ascii?Q?1UsJnUVXlA=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: effcd2bf-ba0d-466f-59eb-08dee77e1600 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:25.4963 (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: QL+DJ62d2uV/qNmuaKFr4jdxE9c7BOmuGdCUwGwHGDXJFdigSHgTKPe9wGd3dJ0zOjwDcNhcR3NWm4fs3un/gw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" In Layerscape (Arm) and QorIQ (PowerPC) devices, hardware peripherals are accessed by the CPU through a portion of the SoC address space called CCSR ("Configuration, Control, and Status Registers"). All hardware IP blocks have their registers mapped here, and the Device Configuration block makes no exception. However, there exists a secondary range of the address space named DCSR ("Debug Control and Status Registers") which, like CCSR, also holds registers of hardware IP blocks, except the DCSR contents is hidden in all public reference manuals. The intention of the CCSR/DCSR split, to the best of my knowledge, was to place the functionality that is too low level for normal use, and which is necessary only for debug, in a completely separate address space which can be hidden. A use case has appeared where networking SerDes lanes need to be reconfigured at runtime for a different protocol (example: 10GBase-R to SGMII), and the architecture of the SoCs does not normally permit that. The Reset Configuration Word (RCW) is a data structure read by the SoC preboot loader (PBL) which contains stuff like pinmuxing and SerDes protocol mapping for each lane. The RCW that the PBL has loaded is visible in the DCFG block's normal status registers (from CCSR), as read only. Turns out, the RCW is also mapped in the DCFG's shadow register map (in DCSR), in a write-only form. Writing to the RCW registers from the DCFG's DCSR space to change what the PBL has loaded is called "RCW override". It has been validated that the RCW override procedure is necessary to reconfigure the networking data path when a SerDes lane performs a major protocol change. It changes some internal muxes which connect the PCS to either the 10G MAC or to the 1G MAC. Defining the DCSR area of the DCFG as a secondary 'reg' array element allows operating systems to perform RCW overrides. Since it is introduced late in the binding's lifetime, it is optional. It can be identified by name, but also by index (first 'reg' is CCSR). Note that while all SoCs should have a DCFG register block in DCSR, we only need to expose it for the SoCs where the RCW override procedure is known to be needed and has been validated. Signed-off-by: Vladimir Oltean Reviewed-by: Conor Dooley --- Cc: Conor Dooley Cc: Krzysztof Kozlowski Cc: Rob Herring v2->v4: none v1->v2: - add Conor's review tag - update email addresses of DT maintainers --- .../bindings/soc/fsl/fsl,layerscape-dcfg.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.= yaml b/Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml index 3fb0534ea597..fc14fd0bf84b 100644 --- a/Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml +++ b/Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml @@ -36,7 +36,20 @@ properties: - const: simple-mfd =20 reg: - maxItems: 1 + minItems: 1 + items: + - description: + Customer-visible DCFG register map from CCSR address space + (Configuration, Control and Status Registers) + - description: + Customer-hidden DCFG register map from DCSR address space + (Debug Control and Status Registers) + + reg-names: + minItems: 1 + items: + - const: dcfg_ccsr + - const: dcfg_dcsr =20 little-endian: true big-endian: true --=20 2.34.1 From nobody Sat Jul 25 00:16:11 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 3F49144E03B; Tue, 21 Jul 2026 23:16:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675796; cv=fail; b=hpFqHzXyviIuqXRQiZyK/s1CKRv1TF3WOyJiwJ4x4eKcm5+cQdi7E5ZphTAzXmxSinyMYcxGAXEROuE/uI6GciW+t++L/qF7Y/JguN5g4pt7HF8gQyxn5a7pB58RgovcoaCS3NAgPT6s8jSODyX/9JVVqmyyacv+UcQ0HeP4uto= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675796; c=relaxed/simple; bh=49VMAe/9hDTFWtX/zgm6N0ADLdQHEIfsSGtc1EWAFFY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=VlwVy9vU+BC405qBlwhIL2GX+Za5J0BnMAdAnvJaBi/nKPmhdC/DkBkF8DYXmMji2hVD+XEN/DFL10tV5ZqEq8+u468kAAraGsU9y2EgslPUW4QWfJ/39oy+y68TCJYr0H/kU6dypMwmgAmqC9bXthynAKSLksQiyHh4FUwhZZw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=E7cLqQ5Z; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="E7cLqQ5Z" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wA0Ycq3e3P2d5d88viUdEfCATVxhWH/hCG9apQP92qiz5YrN9TB3ZAsX4PLgO8epYc6AYTys/9NZfA0t13QoFTvJiaV/iTqiY0r+DM1idzmnS1S8ULGuwxhEMINbJfyI++uNSmSpqka/mUwuBLFyqHzc1ATSGIZXhqKQs16o4EPTxA2B0Qo1rJ96Rytg1bV4PmICKrZS0rJlU/ooX8ZfpXy8+2Q2rUKE4vAI+s30gKwPr5i0OEWUYeDmKplcuAjrhb0ToSKuYLcCA/l5WE4g/UveRk/9YpNJPNj0GPbIEwoMi9i+LAscW4awiu0jbXUu5aSTR8SfbZmQw6yVKWe8YQ== 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=K6zr0PJgH9vc2maNc0jrHeCEELjjNSCTI14uHDR1lSY=; b=QaYGx7KEB6WPq0bliiDzLOg3nvTHnCw6uY5XdzivvQFOrQrlqGh68/e1NyWDdo0FlsqL+veUxFszUuBdPC1k2LPd1B46vFWajwW/hjwpCunIn/m3oMjimgngIJI4EZz/BQ52AVnOtDYml7ZPDpojS+4WB+nC6mZ0Px4sI9lQyUwZoKmsAIlfb3e6xWHDSCSHqq9DmnvcoDDqD26bNRA2T20zv38V3/nMCErt0m/bK+upVLTOiunw35v4cS7LhVZIRpebLDyIGhQi6WatpW8GS8bq3btUM97HXg5MBZ4OQUDh7S2cfwlym0LrQbJG+K16XHuJABMQbx9oCC7vAMC9Xg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K6zr0PJgH9vc2maNc0jrHeCEELjjNSCTI14uHDR1lSY=; b=E7cLqQ5ZMSXRoJ/GFLrHHOU1/t+EM2hXR7Nao/Fhyk/j6/Rj/RpkIl0eWgL6r4tdQEl+j20lX2LIg6yWYr+L4N0Pxov/H7OSv+fkr50GNNgvxBO/9FuvGYsmPq9TAFOjz+ifXMzFvu97NaicFoecCYVa1j+12SFAJbdx7YVkQN7iZLru9nozDrf50cwtXbruds/0ujbNh6t7R2iEXXvWUyGT30L/qQk8ojarN3bIOwwf1KJLg81Q/1A4O2E0XGq7/qs1YkuRy859AAxPwpZMj2xLDibRN+Hk9e8cC6QLBKzGL0okQz3XD/h/vLZkXIcB8scegIEN0SU436p+y9TbGg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:27 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:27 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 phy-next 8/9] soc: fsl: guts: implement the RCW override procedure Date: Wed, 22 Jul 2026 02:16:02 +0300 Message-Id: <20260721231603.67865-9-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P251CA0012.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::13) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: 91ab6ee0-871e-4b90-4ee0-08dee77e16fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|6133799003|11063799006|10067099003|56012099006|18002099003|22082099003|3023799007; X-Microsoft-Antispam-Message-Info: LLFL3L028viGDZqMucEn0RcN0WZobxiZgT9pMmzQry57YxguLOaujPefbFKAUVqkndi7VX50F9dRwy+umKaENO+ApoWo/yqNNeowOKVivrBR/cSPYiQRhabdZPjQrpz36EBx/MVh5tLteTVpuv42nrcQlZF+z0d+nprQoAtOC5FCwXqt1x8NOL7O5uJKXtSNw1nXJdi8PprOugN7xyG2Xxn+V/lPPf87iuFyNWTxfwQc4+R3gQoDBASElNVXsX5Ac76msrWoz8EHQzRN1G+eO7PK8V4D9/2LqGQ75tO9XQsFUvdSGFn03jKwCZZukjAuQNAU9h3TXcwj6M0tiN/4OTfiLtmSZM8lJ8J23//KfTw7IxpOhGU08q5kDeNIMgIJYvXM9/h0liJ7lTPjWwon7M/Lf8FhFGlgS/M/KjKB04ZCFUxasrLnf+40eki2uSse+dJYQE3eMnl/rk+mhcAbpSunxVK50bhhb1+GQyHVD67Lov6AtQElBBK7czYODinlSXA7gWctES28fKY9zcV003G4EPe5NZp4b/aYtE9cxX2gwGaoKji6HRdpsyGNfXmxBOsjVuNiZAnMTXsGzWHqkWyOCmqkgFbAfsdQbWDVmkwRuq/evuwo+zH1m3dZstcv8fn34gWdNJ8a0yHjGto1S6IYGEQx3m+yF/Nm/FBzGNQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(6133799003)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UjC4gO6YeXHC/mmLMzKK8zY3rIUfRQG/FGwzZTY+TIGwxIuW8IGV74FPoirO?= =?us-ascii?Q?+u9cO3LAWGJIixKoXHugJIz1532h91bfxMHirNzNj81zV9s19kXhHaCyZKQO?= =?us-ascii?Q?35i0SZudYtkGVNe2R8gB4wBztX6XP0mCztz6JMyUUKCG94VnUJ8KOe7msXzU?= =?us-ascii?Q?I+k/R1zhEVh3a8aW8cumhoTYzppeYaiR7fuJtrlCuuCYYXKuiTFEofgFSca9?= =?us-ascii?Q?KWZA4S42ToSBf+hKKjMwwVeuGTDvmkLQ7MfvCPnpRz4g79qKuRQIOyr3OPpc?= =?us-ascii?Q?KUevk8qgsFbfvIRyG6M6cfdXAIHpphlLhNddWRhKhMqXxkTDCBYl4At35o6P?= =?us-ascii?Q?kWYS/c/JqBEQ4ioW+O3+QOgKLaUjKBX2rIf5fL8keYcXp286bV4pFXv6KI7k?= =?us-ascii?Q?Wui2wUzTAvYUjIp4T8zRP1fc26y987NbZX7fgQ/2cm/ws8OTR+KglPiXQwaK?= =?us-ascii?Q?U2rbt57qKljVp4S+uRpNHeMNXGCXbbZheYgdgyJQZFZOJ1fo7L5NNP6H0hR/?= =?us-ascii?Q?zIM2PivHy2x/AeQPkW8BN53Iel2TSqJwbuej+TsFLUM2D07D8zxiwmN21Yju?= =?us-ascii?Q?dmf0rKhRZVWqOmMusCW03glC4sIqQ42nMTEv7G63Hy7JvOem+0Gad9LjS+FZ?= =?us-ascii?Q?/oObPHe5HuP98zJX3SKWrVTqUgcBkV9tihr9WRpfcMs42I9BLrY9LAneL1m/?= =?us-ascii?Q?scZFEdfuD34BUXiu08eJkBkW9dBsq/YB2xsB2swpYiAABA1Wh0820d+jYI8f?= =?us-ascii?Q?czHr4byIwh7oOO7B+4wJ73O9OFiIP642WIx2U7bHGJq1pXYtSEwZ/+9ImrKb?= =?us-ascii?Q?AJ9FHXC90UQJWh6M0fPL9oPzgrqS9p/1B34XpwFrmzPtmP3BIvg3mhIkIPtN?= =?us-ascii?Q?Qf+YbweRu4Hun+PH80p1O+lfOQmK5zyVDyBdYzV7+V//0KnyfRm3cigCCVVx?= =?us-ascii?Q?X+4cOZW1kF5ZC969Mz5ayuwVisHXOaAi33PECyicEZxMeF+Qsrz/sK3nBeCU?= =?us-ascii?Q?d0GP1POeemqrav4uTVyeceVK/3UmZgQaSJu1gCSJLInVrBTE8A47oFy7LF6K?= =?us-ascii?Q?f/SjIJYqI6+quvlDhAZSkt84a+ZCS8BqNYRwtqM1bUMKqUXt5HlTQZV20eD0?= =?us-ascii?Q?kXyDMg8gqp9yoIbyOPgLCp4vhhR5atOd5LZv6SPHY7AbEaZ/zBPHfYX/hoPn?= =?us-ascii?Q?HboTZWxkjH+RPqMoRw93eh7PAjGd2QhoZqyIZ/nFFKEqaLAnxGpRgiSmUFOz?= =?us-ascii?Q?o7XloGdllrp3zHmESFYz3h+dTxG0rId3FaXaGCY4A4HYODZrPug7uhiO4Zt4?= =?us-ascii?Q?jNkYKE60WQFy9D80FNCvIBOHtJk54dvtWG+qdneaXb78KyHZZboNujcxSur5?= =?us-ascii?Q?9yWBcXXuo8aZvBX5Fo7hrPEsWCdk5+ClThk7yiBW8V57YtURu5JdAjFTiwPV?= =?us-ascii?Q?1sKYTpXYNC0bESSTb7cSlpRKXGYYYs2Pp6imr8uDkLJHnHphq9wk0u8ro9h0?= =?us-ascii?Q?30iBDdXz0l4I/7GkKXDdxKVPiM3W3zCcwxFqKWyxEScnTOqLgATyMA4N43Np?= =?us-ascii?Q?NpR5KK2IAEd6Hye5ggc5Gouyj8zzPfxa5kQsIsonZF055gn25VhnpKurndAO?= =?us-ascii?Q?LlWE0wX2z44C8K2t9Ux2xXINbrzcOqcfeIJP11ubFRiReskPa88hBlfdkSwy?= =?us-ascii?Q?+VooquwQR3oEEjsywg1gTyOiDUU4IvA/+WgEBu2JjYvVoNGM4VpALYda6mO2?= =?us-ascii?Q?cCUr+cYm6w=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91ab6ee0-871e-4b90-4ee0-08dee77e16fb X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:27.1781 (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: 6iZIMf8YPd/F8N+oRxbIdWULySTkN8W56hZrV8PRI0KxTKm3BpIanQ8y9w+qgkVhevCLY2Rx/UFppq4W8iGBmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" Add support for the RCW override procedure which enables runtime reconfiguration of the protocol running on a SerDes lane. The procedure is done through the DCFG DCSR space which now can be defined as the second memory region of the guts DT node. Support is added on the following SoCs: LS1046A, LS1088A, LS2088A. The procedure is exported to the "client" driver - the Lynx10G SerDes PHY driver - through the following functions: - fsl_guts_lane_validate() used to validate that changing the protocol on a specific lane is supported. - fsl_guts_lane_set_mode() which can be used to request the RCW procedure be executed for a specific lane. Since the RCW override procedure is different depending on the SoC, the private fsl_soc_data structure is updated with two new per SoC callbacks (.serdes_get_rcw_override() and .serdes_init_rcwcr()) which get used from the generic fsl_guts_lane_set_mode() function. These two callbacks hide all the SoC specific register offsets, masks and values so that the _set_mode() procedure is straightforward. Signed-off-by: Ioana Ciornei Signed-off-by: Vladimir Oltean Reviewed-by: Ioana Ciornei --- v3->v4: - move spin_lock_init(&soc.rcwcr_lock) before the of_iomap(np, DCFG_DCSR) assignment, so that fsl_guts_lane_set_mode() has no chance of using uninitialized resources, but will fail cleanly - adapt to new error handling scheme in fsl_guts_init() - add comments and a print in fsl_guts_rcw_rmw() - remove fsl_soc_die_match_one() from fsl_guts_serdes_get_rcw_override(). Shouldn't be necessary; implicit from presence of soc_data->serdes_get_rcw_override() method. - fix serdes block and lane count bounds - replace fsl_guts_lane_init() with SRDS_PRTCL_S1 decoding v2->v3: - move iounmap() of dcfg_dcsr area on the 'err' label - use __ffs() (standard API which also works on armv7) instead of __bf_shf() (an internal helper meant for compile-time constants in bitfield.h) - only operate on lanes on which fsl_guts_lane_init() was called in ls2088a_serdes_init_rcwcr() - use read_poll_timeout_atomic() in fsl_guts_rcw_rmw() to clarify that DCFG_DCSR writes are supposed to reflect back in DCFG_CCSR - check soc.data in fsl_guts_serdes_get_rcw_override() to ensure fsl_guts_init() succeeded - put parentheses around (lane) in LS1088A_RCWSR29_SRDS_PRTCL_S1_LNn() and LS1088A_RCWSR30_SRDS_PRTCL_S2_LNn() macro expressions v1->v2: - drop DT maintainers from explicit CC - keep devicetree@vger.kernel.org CCed on entire series - include missing - namespace SRDS_PRTCL values for LS1046A and LS1088A, even if they are the same. For LS1028A (not covered here) they are not. - prefix SRDS_CLK_SEL_{GMII,XGMII} with LS2088A_ - reorder alphanumerically (LS1046A should come before LS1088A) --- drivers/soc/fsl/guts.c | 399 ++++++++++++++++++++++++++++++++++++++- include/linux/fsl/guts.h | 18 +- 2 files changed, 409 insertions(+), 8 deletions(-) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index c283d44b68a3..28361c63e26c 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -5,7 +5,10 @@ * Copyright (C) 2016 Freescale Semiconductor, Inc. */ =20 +#include +#include #include +#include #include #include #include @@ -15,6 +18,28 @@ #include =20 #define DCFG_CCSR 0 +#define DCFG_DCSR 1 + +#define RCW_TIMEOUT_US 1 + +#define LS1046A_RCWSR5_SRDS_PRTCL_S1(lane) \ + GENMASK(19 + 4 * (lane), 16 + 4 * (lane)) +#define LS1046A_SRDS_PRTCL_XFI 1 +#define LS1046A_SRDS_PRTCL_100BASEX_SGMII 3 + +#define LS1088A_RCWSR29_SRDS_PRTCL_S1_LNn(lane) \ + GENMASK(19 + 4 * (3 - (lane)), 16 + 4 * (3 - (lane))) +#define LS1088A_RCWSR30_SRDS_PRTCL_S2_LNn(lane) \ + GENMASK(3 + 4 * (3 - (lane)), 4 * (3 - (lane))) +#define LS1088A_SRDS_PRTCL_XFI 1 +#define LS1088A_SRDS_PRTCL_100BASEX_SGMII 3 + +#define LS2088A_RCWSR29_SRDS_PRTCL_S1 GENMASK(23, 16) +#define LS2088A_RCWSR30_SRDS_CLK_EN_SEL_XGMII_S1 BIT(14) +#define LS2088A_RCWSR30_SRDS_CLK_SEL_XGMII_Ln_S1(lane) BIT(6 + (7 - (lane)= )) +#define LS2088A_RCWSR30_SRDS_CLK_SEL_MSK GENMASK(13, 6) +#define LS2088A_SRDS_CLK_SEL_XGMII 1 +#define LS2088A_SRDS_CLK_SEL_GMII 0 =20 struct fsl_soc_die_attr { char *die; @@ -22,9 +47,21 @@ struct fsl_soc_die_attr { u32 mask; }; =20 +struct fsl_soc_serdes_rcw_override { + int offset; + int mask; + int val; +}; + struct fsl_soc_data { const char *sfp_compat; u32 uid_offset; + int num_serdes_blocks; + int num_serdes_lanes; + int (*serdes_init_rcwcr)(int index); + int (*serdes_get_rcw_override)(int index, int lane, + enum lynx_lane_mode lane_mode, + struct fsl_soc_serdes_rcw_override *override); }; =20 enum qoriq_die { @@ -44,6 +81,48 @@ enum qoriq_die { DIE_MAX, }; =20 +struct rcw_full_srds_proto { + int srds_proto_val; + unsigned long xgmii_lanes; +}; + +static const struct rcw_full_srds_proto ls2088a_rcw_full_srds1_protos[] = =3D { + { 0x05, 0 }, + { 0x07, 0 }, + { 0x09, 0 }, + { 0x0a, 0 }, + { 0x0c, 0 }, + { 0x0e, 0 }, + { 0x10, 0 }, + { 0x12, 0 }, + { 0x14, 0 }, + { 0x16, 0 }, + { 0x18, 0 }, + { 0x1a, 0 }, + { 0x1c, 0 }, + { 0x1e, 0 }, + { 0x20, 0 }, + { 0x22, 0 }, + { 0x24, 0 }, + { 0x26, GENMASK(7, 6) }, + { 0x28, GENMASK(7, 4) }, + { 0x2a, GENMASK(7, 0) }, + /* 0x2b: unimplemented because of XAUI1 (lanes E-H) */ + /* 0x2d: unimplemented because of XAUI1 (lanes E-H) */ + /* 0x2e: unimplemented because of XAUI1 (lanes E-H) */ + /* 0x30: unimplemented because of XAUI1 (lanes E-H) */ + /* 0x32: unimplemented because of XAUI1 (lanes E-H) and XAUI2 (A-D) */ + /* 0x33: unimplemented because of QSGMII (lanes E-H) */ + /* 0x35: unimplemented because of QSGMII (lanes A-C) */ + /* 0x37: unimplemented because of QSGMII (lanes E-F) */ + { 0x39, 0 }, + { 0x3b, GENMASK(6, 4) | GENMASK(2, 0) }, + { 0x4b, GENMASK(7, 4) }, + { 0x4c, GENMASK(3, 0) }, + { 0x4d, 0 }, + { 0x58, 0 }, +}; + /* SoC die attribute definition for QorIQ platform */ static const struct fsl_soc_die_attr fsl_soc_die[] =3D { /* @@ -138,9 +217,11 @@ static const struct fsl_soc_die_attr fsl_soc_die[] =3D= { =20 static struct fsl_soc_guts { struct ccsr_guts __iomem *dcfg_ccsr; + struct ccsr_guts __iomem *dcfg_dcsr; const struct fsl_soc_data *data; bool little_endian; u32 svr; + spinlock_t rcwcr_lock; /* serializes concurrent writes to the RCWCR */ } soc; =20 static unsigned int fsl_guts_read(const void __iomem *reg) @@ -151,6 +232,36 @@ static unsigned int fsl_guts_read(const void __iomem *= reg) return ioread32be(reg); } =20 +static void fsl_guts_write(void __iomem *reg, u32 val) +{ + if (soc.little_endian) + iowrite32(val, reg); + else + iowrite32be(val, reg); +} + +/* Some fields of the Reset Configuration Word (RCW) can be overridden at + * runtime by writing to the RCWCRn registers contained within the DCSR sp= ace + * of the Device Configuration (DCFG) block. The layout of the RCWCRn regi= sters + * is identical with the read-only RCWSRn from the CCSR space. + */ +static int fsl_guts_rcw_rmw(int offset, u32 val, u32 mask) +{ + u32 rcwcr, rcwsr =3D fsl_guts_read(&soc.dcfg_ccsr->rcwsr[offset]); + + rcwcr =3D rcwsr & ~mask; + rcwcr |=3D val; + fsl_guts_write(&soc.dcfg_dcsr->rcwcr[offset], rcwcr); + + pr_debug("RCW override: RCWSR%d 0x%x -> RCWCR%d 0x%x\n", + offset + 1, rcwsr, offset + 1, rcwcr); + + /* Updates to RCWCR should be visible back in RCWSR immediately */ + return read_poll_timeout_atomic(fsl_guts_read, rcwsr, rcwsr =3D=3D rcwcr, + 0, RCW_TIMEOUT_US, false, + &soc.dcfg_ccsr->rcwsr[offset]); +} + static bool fsl_soc_die_match_one(u32 svr, const struct fsl_soc_die_attr *= match) { return match->svr =3D=3D (svr & match->mask); @@ -167,6 +278,97 @@ static const struct fsl_soc_die_attr *fsl_soc_die_matc= h( return NULL; } =20 +static int +fsl_guts_serdes_get_rcw_override(int serdes_idx, int lane, + enum lynx_lane_mode lane_mode, + struct fsl_soc_serdes_rcw_override *override) +{ + const struct fsl_soc_data *soc_data =3D soc.data; + + if (!soc_data) + return -ENODEV; + + /* serdes_idx is one-based */ + if (serdes_idx > soc_data->num_serdes_blocks || serdes_idx <=3D 0) + return -ERANGE; + + if (lane >=3D soc_data->num_serdes_lanes || lane < 0) + return -ERANGE; + + if (!soc_data->serdes_get_rcw_override) { + pr_debug("RCW override not implemented for SoC\n"); + return -EINVAL; + } + + if (!soc.dcfg_dcsr) { + pr_debug("Device tree does not define DCFG_DCSR region necessary for RCW= override\n"); + return -EINVAL; + } + + return soc_data->serdes_get_rcw_override(serdes_idx, lane, lane_mode, + override); +} + +/** + * fsl_guts_lane_validate() - Validate that SerDes protocol is implemented= and + * supported on current SoC + * @serdes_idx: one-based SerDes block index + * @lane: zero-based lane index within SerDes + * @lane_mode: requested SerDes protocol + * + * Should be called before actually requesting the RCW override procedure = to be + * applied using %fsl_guts_lane_set_mode() + * + * Return: 0 if RCW override to protocol is possible, negative error other= wise + */ +int fsl_guts_lane_validate(int serdes_idx, int lane, enum lynx_lane_mode l= ane_mode) +{ + struct fsl_soc_serdes_rcw_override override; + + return fsl_guts_serdes_get_rcw_override(serdes_idx, lane, lane_mode, + &override); +} +EXPORT_SYMBOL_NS_GPL(fsl_guts_lane_validate, "FSL_GUTS"); + +/** + * fsl_guts_lane_set_mode() - apply RCW override procedure for SerDes lane + * @serdes_idx: one-based SerDes block index + * @lane: zero-based lane index within SerDes + * @lane_mode: requested SerDes protocol + * + * Return: 0 on success, negative error otherwise + */ +int fsl_guts_lane_set_mode(int serdes_idx, int lane, enum lynx_lane_mode l= ane_mode) +{ + struct fsl_soc_serdes_rcw_override override; + int err; + + err =3D fsl_guts_serdes_get_rcw_override(serdes_idx, lane, lane_mode, + &override); + if (err) + return err; + + spin_lock(&soc.rcwcr_lock); + + if (soc.data->serdes_init_rcwcr) { + err =3D soc.data->serdes_init_rcwcr(serdes_idx); + if (err) + goto out_unlock; + } + + err =3D fsl_guts_rcw_rmw(override.offset, + override.val << __ffs(override.mask), + override.mask); + if (err) + pr_err("RCW override failed: %pe\n", ERR_PTR(err)); + +out_unlock: + spin_unlock(&soc.rcwcr_lock); + + return err; +} +EXPORT_SYMBOL_NS_GPL(fsl_guts_lane_set_mode, "FSL_GUTS"); + static u64 fsl_guts_get_soc_uid(const char *compat, unsigned int offset) { struct device_node *np; @@ -193,9 +395,188 @@ static u64 fsl_guts_get_soc_uid(const char *compat, u= nsigned int offset) return uid; } =20 +static int ls1046a_serdes_get_rcw_override(int index, int lane, + enum lynx_lane_mode lane_mode, + struct fsl_soc_serdes_rcw_override *override) +{ + /* The RCW override procedure has to write to different registers + * depending on the SerDes block index. + */ + switch (index) { + case 1: + override->offset =3D 4; + override->mask =3D LS1046A_RCWSR5_SRDS_PRTCL_S1(lane); + break; + default: + return -EINVAL; + } + + if (lynx_lane_mode_uses_xgmii_mac(lane_mode)) + override->val =3D LS1046A_SRDS_PRTCL_XFI; + else if (lynx_lane_mode_uses_gmii_mac(lane_mode)) + override->val =3D LS1046A_SRDS_PRTCL_100BASEX_SGMII; + else + return -EINVAL; + + return 0; +} + +static int ls1088a_serdes_get_rcw_override(int index, int lane, + enum lynx_lane_mode lane_mode, + struct fsl_soc_serdes_rcw_override *override) +{ + /* The RCW override procedure has to write to different registers + * depending on the SerDes block index. + */ + switch (index) { + case 1: + override->offset =3D 28; + override->mask =3D LS1088A_RCWSR29_SRDS_PRTCL_S1_LNn(lane); + break; + case 2: + override->offset =3D 29; + override->mask =3D LS1088A_RCWSR30_SRDS_PRTCL_S2_LNn(lane); + break; + default: + return -EINVAL; + } + + if (lynx_lane_mode_uses_xgmii_mac(lane_mode)) + override->val =3D LS1088A_SRDS_PRTCL_XFI; + else if (lynx_lane_mode_uses_gmii_mac(lane_mode)) + override->val =3D LS1088A_SRDS_PRTCL_100BASEX_SGMII; + else + return -EINVAL; + + return 0; +} + +static const struct rcw_full_srds_proto *ls2088a_get_full_serdes1_proto(vo= id) +{ + u32 rcwsr29 =3D fsl_guts_read(&soc.dcfg_ccsr->rcwsr[28]); + u32 srds_prtcl_s1 =3D FIELD_GET(LS2088A_RCWSR29_SRDS_PRTCL_S1, rcwsr29); + + for (int i =3D 0; i < ARRAY_SIZE(ls2088a_rcw_full_srds1_protos); i++) { + const struct rcw_full_srds_proto *proto; + + proto =3D &ls2088a_rcw_full_srds1_protos[i]; + if (proto->srds_proto_val =3D=3D srds_prtcl_s1) + return proto; + } + + return NULL; +} + +static int ls2088a_serdes_get_rcw_override(int index, int lane, + enum lynx_lane_mode lane_mode, + struct fsl_soc_serdes_rcw_override *override) +{ + switch (index) { + case 1: + override->offset =3D 29; + override->mask =3D LS2088A_RCWSR30_SRDS_CLK_SEL_XGMII_Ln_S1(lane); + break; + default: + return -EINVAL; + } + + /* RCW override only supported if we know how to handle the initial + * RCWSR29[SRDS_PRTCL_S1] value and turn it into an override. + */ + if (!ls2088a_get_full_serdes1_proto()) { + u32 rcwsr30 =3D fsl_guts_read(&soc.dcfg_ccsr->rcwsr[29]); + + /* If a SerDes-level override is already in place (probably + * left there by a previous boot stage), use it. + */ + if (!(rcwsr30 & LS2088A_RCWSR30_SRDS_CLK_EN_SEL_XGMII_S1)) + return -EINVAL; + } + + if (lynx_lane_mode_uses_xgmii_mac(lane_mode)) + override->val =3D LS2088A_SRDS_CLK_SEL_XGMII; + else if (lynx_lane_mode_uses_gmii_mac(lane_mode)) + override->val =3D LS2088A_SRDS_CLK_SEL_GMII; + else + return -EINVAL; + + return 0; +} + +static int ls2088a_serdes_init_rcwcr(int serdes_idx) +{ + const struct rcw_full_srds_proto *srds_prtcl_s1; + const struct fsl_soc_data *soc_data =3D soc.data; + u32 rcwsr30; + int i, err; + + /* SerDes 2 supports only SGMII for networking. There should be + * no need for RCW override + */ + if (serdes_idx !=3D 1) + return -EINVAL; + + /* SRDS_CLK_EN_SEL_XGMII_S1: SerDes Clock Enable Select XGMII Serdes 1: + * Enables to select GMII/XGMII clock according to + * SRDS_CLK_SEL_XGMII_Ln_S1. + * If the GMII/XGMII select override has already been set, use it. + * Otherwise, derive an initial override for all lanes based on the + * full SerDes protocol table. + */ + rcwsr30 =3D fsl_guts_read(&soc.dcfg_ccsr->rcwsr[29]); + if (rcwsr30 & LS2088A_RCWSR30_SRDS_CLK_EN_SEL_XGMII_S1) { + pr_debug("RCWSR30 =3D 0x%x, using this.\n", rcwsr30); + return 0; + } + + srds_prtcl_s1 =3D ls2088a_get_full_serdes1_proto(); + + rcwsr30 =3D LS2088A_RCWSR30_SRDS_CLK_EN_SEL_XGMII_S1; + + /* We need to configure the initial state of all lanes for + * the SerDes block #1 + */ + for_each_set_bit(i, &srds_prtcl_s1->xgmii_lanes, soc_data->num_serdes_lan= es) + rcwsr30 |=3D LS2088A_RCWSR30_SRDS_CLK_SEL_XGMII_Ln_S1(i); + + pr_debug("Setting initial RCWSR30 =3D 0x%x based on SRDS_PRTCL_S1 =3D 0x%= x\n", + rcwsr30, srds_prtcl_s1->srds_proto_val); + + err =3D fsl_guts_rcw_rmw(29, rcwsr30, + LS2088A_RCWSR30_SRDS_CLK_EN_SEL_XGMII_S1 | + LS2088A_RCWSR30_SRDS_CLK_SEL_MSK); + if (err) { + pr_err("Setting up initial RCWCR failed: %pe\n", ERR_PTR(err)); + return err; + } + + return 0; +} + +static const struct fsl_soc_data ls1088a_data =3D { + .serdes_get_rcw_override =3D ls1088a_serdes_get_rcw_override, + .num_serdes_blocks =3D 2, + .num_serdes_lanes =3D 4, +}; + +static const struct fsl_soc_data ls1046a_data =3D { + .serdes_get_rcw_override =3D ls1046a_serdes_get_rcw_override, + .num_serdes_blocks =3D 2, + .num_serdes_lanes =3D 4, +}; + +static const struct fsl_soc_data ls2088a_data =3D { + .serdes_get_rcw_override =3D ls2088a_serdes_get_rcw_override, + .serdes_init_rcwcr =3D ls2088a_serdes_init_rcwcr, + .num_serdes_blocks =3D 2, + .num_serdes_lanes =3D 8, +}; + static const struct fsl_soc_data ls1028a_data =3D { .sfp_compat =3D "fsl,ls1028a-sfp", .uid_offset =3D 0x21c, + .num_serdes_blocks =3D 1, + .num_serdes_lanes =3D 4, }; =20 /* @@ -221,10 +602,10 @@ static const struct of_device_id fsl_guts_of_match[] = =3D { { .compatible =3D "fsl,mpc8572-guts", }, { .compatible =3D "fsl,ls1021a-dcfg", }, { .compatible =3D "fsl,ls1043a-dcfg", }, - { .compatible =3D "fsl,ls2080a-dcfg", }, - { .compatible =3D "fsl,ls1088a-dcfg", }, + { .compatible =3D "fsl,ls2080a-dcfg", .data =3D &ls2088a_data}, + { .compatible =3D "fsl,ls1088a-dcfg", .data =3D &ls1088a_data}, { .compatible =3D "fsl,ls1012a-dcfg", }, - { .compatible =3D "fsl,ls1046a-dcfg", }, + { .compatible =3D "fsl,ls1046a-dcfg", .data =3D &ls1046a_data}, { .compatible =3D "fsl,lx2160a-dcfg", }, { .compatible =3D "fsl,ls1028a-dcfg", .data =3D &ls1028a_data}, {} @@ -240,6 +621,8 @@ static int __init fsl_guts_init(void) u64 soc_uid =3D 0; int ret; =20 + spin_lock_init(&soc.rcwcr_lock); + np =3D of_find_matching_node_and_match(NULL, fsl_guts_of_match, &match); if (!np) return 0; @@ -251,6 +634,8 @@ static int __init fsl_guts_init(void) ret =3D -ENOMEM; goto err_clear_soc_data; } + /* DCFG_DCSR is optional */ + soc.dcfg_dcsr =3D of_iomap(np, DCFG_DCSR); =20 soc.little_endian =3D of_property_read_bool(np, "little-endian"); soc.svr =3D fsl_guts_read(&soc.dcfg_ccsr->svr); @@ -260,7 +645,7 @@ static int __init fsl_guts_init(void) soc_dev_attr =3D kzalloc_obj(*soc_dev_attr); if (!soc_dev_attr) { ret =3D -ENOMEM; - goto err_unmap_dcfg_ccsr; + goto err_unmap_dcfg_ccsr_dcsr; } =20 ret =3D soc_attr_read_machine(soc_dev_attr); @@ -321,7 +706,11 @@ static int __init fsl_guts_init(void) kfree(soc_dev_attr->family); err_free_soc_dev_attr: kfree(soc_dev_attr); -err_unmap_dcfg_ccsr: +err_unmap_dcfg_ccsr_dcsr: + if (soc.dcfg_dcsr) { + iounmap(soc.dcfg_dcsr); + soc.dcfg_dcsr =3D NULL; + } iounmap(soc.dcfg_ccsr); soc.dcfg_ccsr =3D NULL; err_clear_soc_data: diff --git a/include/linux/fsl/guts.h b/include/linux/fsl/guts.h index fdb55ca47a4f..8d5ffb985fee 100644 --- a/include/linux/fsl/guts.h +++ b/include/linux/fsl/guts.h @@ -13,6 +13,7 @@ =20 #include #include +#include =20 /* * Global Utility Registers. @@ -91,9 +92,15 @@ struct ccsr_guts { u32 iovselsr; /* 0x.00c0 - I/O voltage select status register Called 'elbcvselcr' on 86xx SOCs */ u8 res0c4[0x100 - 0xc4]; - u32 rcwsr[16]; /* 0x.0100 - Reset Control Word Status registers - There are 16 registers */ - u8 res140[0x224 - 0x140]; + /* 0x.0100 - read-only Reset Configuration Word Status registers in + * CCSR, or write-only Reset Configuration Word Control registers in + * DCSR. In both cases there are 32 registers. + */ + union { + u32 rcwsr[32]; + u32 rcwcr[32]; + }; + u8 res180[0x224 - 0x180]; u32 iodelay1; /* 0x.0224 - IO delay control register 1 */ u32 iodelay2; /* 0x.0228 - IO delay control register 2 */ u8 res22c[0x604 - 0x22c]; @@ -131,6 +138,11 @@ struct ccsr_guts { u32 srds2cr1; /* 0x.0f44 - SerDes2 Control Register 0 */ } __attribute__ ((packed)); =20 +int fsl_guts_lane_validate(int serdes_idx, int lane, + enum lynx_lane_mode lane_mode); +int fsl_guts_lane_set_mode(int serdes_idx, int lane, + enum lynx_lane_mode lane_mode); + /* Alternate function signal multiplex control */ #define MPC85xx_PMUXCR_QE(x) (0x8000 >> (x)) =20 --=20 2.34.1 From nobody Sat Jul 25 00:16:11 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010066.outbound.protection.outlook.com [52.101.69.66]) (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 D26424582D3; Tue, 21 Jul 2026 23:16:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675798; cv=fail; b=lv7jDCajrj89wYE0uFYVSYmEnq0XNVJuYvdzbHL/w2tqgQ06KbQJ6+Gb2Wau5AJ1io7wD7CNTlou/V7MIGluLDQy5yScAZrdBKr11B1P8Qc/3AW3c4nGiA1/8ymA6+mzzDWRgjqeJpEWNJQ7s1gi+j/sPnH+i6HiTUsH8/bFMMk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784675798; c=relaxed/simple; bh=2+dBt5aSpj6+L/O9TWwTfJMERyx2Qr8+EDloehEb2ZU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=sZWMYn/5O91eynYxdnLwvhhLRyWcOpUtH9rpUQRHNk+zrExybJ9cmBoiQiFLcC2n1ETJ8nkQ3QN+2C5DiUkQLtBE3Bmjpy6+5cz54ztiOLM+gY2T+vG025KPCDdPqzOJwI/5aLxInPzipz1q9sUw4sp8creXLM2Zi964uQ5Bvm0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=Wa0DZdNY; arc=fail smtp.client-ip=52.101.69.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="Wa0DZdNY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Us+24GC928WdNCXUD4SvHet17DEQQJFa4bP/TsDFZV7wB/Crvu7OWq3fqrqYZRLrfuhGlLM70/dXTkfCoOLLtv2I62l8PeTjjmlKj4bwlNCwfJlIzYpqFZ0EwLAFlX52HtriQAG6vkgQxJaaa78KCczGehdxQjFnerDoyoCuGOsIzJAhFQwzR48wpPXwrovHfm5fMdNZJM9DOBlRl6E06CxUQqDQfVnOWC1NBWHgcLuEQV/dEBa4O/XVMoHv8LdPqJci4XcH/GDN736FpBbpTFE9LrtzW2oJYUO46Iyrte+5nXEOYi0nIsS73qMLVCqnpoTt4zwS7wZbvYJCPyOqHw== 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=tkO96bpp4Fik/CoANpI5arj9Vn7TGtDhXpFGdR+H+k8=; b=NCeWx662uSwVDG1Br4sfAdep7gCWOxKKr7gOG3SDaqKxru4+tmW9lq/00dPDYk6PvXs6AhR/lQ2cd0Ob9kv/b+T5DR8xZw0e3fxRPscPhhls+K0CUeVLb3i8aMeYWpWnzE+uhTLJKE8g8scNaXQSjfuEQfGVYCtY1gvVndRYRyrPHRwY5jmLWUx3x0033h4jubNAuXpex+W4aZP2TG//NIuUPaIDfmfbHOMfk2OJ3jQ2xurfuaIq3Fc2Emox/NbKYoIo3RwvSiK7itP/dAUC/MMeqDA7knuJSqAUfTbi6GJazWBYdMxjpIQyrfcqKjDAam8dHcnT9gUmB08lLJw+cA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tkO96bpp4Fik/CoANpI5arj9Vn7TGtDhXpFGdR+H+k8=; b=Wa0DZdNYvOWZrWCRffiuaNvApS6yPBLvM6SEpWZUbhcoS+bolPX5TwdDpieGvXPnN5T+cM4gh+JzHjm0W9OofmkzbqgR0V6F+RT7ECXhaAnc3/ZS0TVZUxZqQT0m3FGb1pbRBMdEDRVAK4WZjAlLmvhp10MWwxsdxEakN9/6eermV83krnNyrbSAeT67ZOBPR0S6d30Aa8mqwbKqCegZh5US+rFpnE3/HiGP+PLja68amJ7do8lhfpMB/ox0kBRQiIrCBA+r8xLFyFXxrFgbd50XwmW2EPP1MukDp4XB7dhuMSb2BYj55muVOG3wzQ3094GsvQrpbIoMcyR33+WBEQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) by VI0PR04MB11817.eurprd04.prod.outlook.com (2603:10a6:800:2ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Tue, 21 Jul 2026 23:16:29 +0000 Received: from AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023]) by AM0PR04MB6900.eurprd04.prod.outlook.com ([fe80::7fda:8431:ca1b:b023%5]) with mapi id 15.21.0245.009; Tue, 21 Jul 2026 23:16:28 +0000 From: Vladimir Oltean To: linux-phy@lists.infradead.org Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Ioana Ciornei , Vinod Koul , Neil Armstrong , Tanjeff Moos , "Christophe Leroy (CS GROUP)" , Michael Walle , Shawn Guo , Frank Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 phy-next 9/9] phy: lynx-10g: use RCW override procedure for dynamic protocol change Date: Wed, 22 Jul 2026 02:16:03 +0300 Message-Id: <20260721231603.67865-10-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260721231603.67865-1-vladimir.oltean@nxp.com> References: <20260721231603.67865-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0111.eurprd02.prod.outlook.com (2603:10a6:20b:28c::8) To AM0PR04MB6900.eurprd04.prod.outlook.com (2603:10a6:208:17d::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6900:EE_|VI0PR04MB11817:EE_ X-MS-Office365-Filtering-Correlation-Id: edc8883a-5920-4d3b-2331-08dee77e1807 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|7416014|376014|19092799006|1800799024|366016|6133799003|11063799006|10067099003|56012099006|18002099003|22082099003|3023799007; X-Microsoft-Antispam-Message-Info: TLRUI6u2a8z4OtQdZb+2gM4rCFE0gKIbbvaXOYWRhVVCQpiEhwnnCIGPMoJE6eWemdijfpB3t4oZjQO4l5D+qD7QM6KfaMUCxxOR/uQGbqLNZVywDa4rYrNNrDNv4fOB4PNWqc2wCuxg1WCjwHTpWiDT7EB2HZGzpjmt6luqDOr/Aelw2deSjA1vkbB/Rwczr1hcNsZX0l3PDsWUxJdE7GoJ0MyzaBQZugIDuMGBaLsA5XF7hy+ADFAKLbr9sQzT21aqMqM3dbDhJ3q/i5ERXhQRCq/9KPscC+stI6sZT314tY6RUzb2i0sSYIU6k+XHkcRhQPemuoqWM+QDjvROGMjC8wiSedGmw3NM+Cx3wFPSrAggLmJ322Jb02AKGz548YtsDWrTB3SykS1fAIFb5xIv+utWFUpOB37dCwcAOhaZDnvu19JysgICTi6qmDRDY0oyQKy4Wh004jGJbnHVe4Lfs72r1jit4J7iAlXq1D8vHWMhYe0VNi5TKJMequT3hRE6GFyT6WJeptN+jIt+n3EYlC1XnHPBOQ5YHDSg9Lgk+lcKCy43W2PBvTr9hy6vmf5CGFQsuQsiELlzG7TzxQ+3f0bzVN9+FxNkSkWVwBuord4eDpf9oEWG4w+Qz7aNYvhp1wgQC+Td3D3lkhzO69kYU/DC7fars6kPo6kZ86k= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6900.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(7416014)(376014)(19092799006)(1800799024)(366016)(6133799003)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BH/YldC4ChvA2qJwOTGfTTb4dLYUuUmiGjF6qfl2JATSD5+WpgjbDNtbiBtD?= =?us-ascii?Q?x4Bb/W5hHcAjzp+M/pzvsUEfVcCm/hvmDnFVrFuc6R/Bzu+i4gpQLJs3BtKL?= =?us-ascii?Q?9U3O0o1gH4yktr9DDIPQrPgXlhmDxViYXSuoYPYBPQEb2EjeOTq9wwMP4mOS?= =?us-ascii?Q?gi6m6kxEWfvjXldYfhomIQoHcYGIbAG1oPOYeGndmJkf/JkTDqXohfX31I98?= =?us-ascii?Q?qNoSKyWP3wtzUmc1nK6jSF+L0ZE4b3c6wocKQ69TIyW03Pi5+psQ3OwLTBK7?= =?us-ascii?Q?OJS80kTsyuQkcQUaU4ndWY6zR+3iR0X+MLblHFM2xuuPFlC9rXwrLf/Q+1EW?= =?us-ascii?Q?YjJM4W7hOsnVHg/FGm35UIdVCxzA622xcYf/oUo533zTa3RXmhBTOE2F6spz?= =?us-ascii?Q?qw9adBzLlu1yGtG1x/z7Vg6CGAZ0SrE/7cDTXCMDaMUVqh89WMoD8hIv31YU?= =?us-ascii?Q?3iRAdGh3LSv25bhE7hpLx0yNygOOiOfCc48SS1qj7GEqq9uP/eQHBY6LCGtg?= =?us-ascii?Q?/YqdC1ikwemc9EZ25PaCn/dWdYDXbSTF2yrqujsuXUEWiI9K3QOA+c6g+zH0?= =?us-ascii?Q?Dzw4iBivZ/9l7ZuRv3qaSPq+nWrUzLByQbezcYyveKtd5w2SVI1IBmGEF0NQ?= =?us-ascii?Q?J3W0LH//eJ0t/D996VhVwK4YcW/G2NtIZZ5SMPPo3evhUPj4xfkWqbMjh74h?= =?us-ascii?Q?Cj2A9DE6oAs075Id+cwrIx6zWjG7LN9mddcTE+WuAl7JPKBDc9ckPrzy8gv6?= =?us-ascii?Q?+jXy5QthA2NwMS1qBXbw8qCbfEaReEQ+pLOKbNNP+1qHcD7kbKvjFPkVRstQ?= =?us-ascii?Q?Sgv2Rr0zRrvl13sn1tbG/o9APMuSXF5OrMGpgJYLuQD93SdlFsb3yK4aACCA?= =?us-ascii?Q?1vITyHN5dPx0cIifcm/lHqJ1fpPeDCmH1TzMCoTl/Jh679J/yhWmYQkXDsxT?= =?us-ascii?Q?Q0wola1e884MHK4+vhLJYVqjWtvJokPTMSSp9pOJXbk3HgGu4KFyH3myz9/5?= =?us-ascii?Q?0oPIP1jF5RNFR4tCR4jCmyiYIYceWte/+TbkGOAuSY5ir98wyPeC4OMyYhR0?= =?us-ascii?Q?rjbNamxCyH4otY8PuLx6P8XRamo8O4l13dwMaZtDiLp4bHuUR3qr46hTnx8c?= =?us-ascii?Q?XytIXLL08J7By00Te07ElEmA0DLYSqZtYdt37wUC7HA3gPEY/FYwqrsoR6I4?= =?us-ascii?Q?TD675j/NzyKWCYHkaEMeAqIwXjyIkAigEIeur6bpstK7ewCHPvwpbFxbI/nt?= =?us-ascii?Q?r/DHKBLuTnJ2LhhdkzW4OCRsFQ9N5/bYxrUpKrFSi+yZ4m3SV5haYWE3EsVi?= =?us-ascii?Q?Y67HIofYzYp6875z/yHiwVHRk3KxOaLjo0M43PvA9liYmzdlKtwVxjvoOjks?= =?us-ascii?Q?F2sOlEF8o7mU7KE/3Fp57ldpfB5az4RDUsjkxlz2uzRn/juDDn7L4hJC8ll4?= =?us-ascii?Q?dbkA6NjSvKPcTFfkNofiNwjJYzFxKQBCZPiZK1c7qy59f1TyK9TFOASmfLgz?= =?us-ascii?Q?zPQFMv587aaunNQqqFVyAPTEGTk7reeULra6vry+yryD03p9joUY256LMfFB?= =?us-ascii?Q?zeBZ7nTMqJclOnvb52FvW/bPAl9ZtB3yvnNLWcIQiwn/JAGDNwT+5MneAVOc?= =?us-ascii?Q?5jF1v2SGqGnTN7XddsuZ0slZjZMt0uUpnZpJRHfYu1lTsy38fIokHQwKjIMm?= =?us-ascii?Q?Wbn+0smwRlaroP4nq3hnEpoVP3eNs3c0lzIGJWmR2lp6YGF6Av3e3b/AO2Db?= =?us-ascii?Q?MpoRK75Pbw=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: edc8883a-5920-4d3b-2331-08dee77e1807 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6900.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2026 23:16:28.9077 (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: fF1AQNwwD1Fex3v3QPQxq3hwjnthGpN8RF2tIujEnOzg69IDcTzEjFWN40MGuABouzO1Z1xPJ177v/NVKAs1JQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11817 Content-Type: text/plain; charset="utf-8" Up until this patch, the only protocol change supported was between 1000Base-X/SGMII and 2500Base-X. The others require an RCW override procedure which was lacking. Since now the guts driver provides the means of applying this procedure, make use of it and remove any comment which mentioned the limitation. Signed-off-by: Vladimir Oltean Acked-by: Vinod Koul Reviewed-by: Ioana Ciornei --- v3->v4: - drop the lynx_10g_lane_read_configuration() -> fsl_guts_lane_init() call. The guts driver now uses a self-contained procedure to figure out initial SerDes protocols by decoding RCWSR29 on LS2088A, rather than relying on the SerDes driver to tell it. v1->v3: none --- drivers/phy/freescale/Kconfig | 1 + drivers/phy/freescale/phy-fsl-lynx-10g.c | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/phy/freescale/Kconfig b/drivers/phy/freescale/Kconfig index 5bf3864fbe64..d4e189fffbf8 100644 --- a/drivers/phy/freescale/Kconfig +++ b/drivers/phy/freescale/Kconfig @@ -58,6 +58,7 @@ config PHY_FSL_LYNX_10G tristate "Freescale Layerscape Lynx 10G SerDes PHY support" depends on OF depends on ARCH_LAYERSCAPE || COMPILE_TEST + select FSL_GUTS select GENERIC_PHY select PHY_FSL_LYNX_CORE help diff --git a/drivers/phy/freescale/phy-fsl-lynx-10g.c b/drivers/phy/freesca= le/phy-fsl-lynx-10g.c index 38def160ef1a..60c85d08c33e 100644 --- a/drivers/phy/freescale/phy-fsl-lynx-10g.c +++ b/drivers/phy/freescale/phy-fsl-lynx-10g.c @@ -8,6 +8,7 @@ #include #include #include +#include =20 #include "phy-fsl-lynx-core.h" =20 @@ -1167,14 +1168,7 @@ static bool lynx_10g_lane_mode_needs_rcw_override(st= ruct lynx_lane *lane, =20 /* Major protocol changes, which involve changing the PCS connection to * the GMII MAC with the one to the XGMII MAC, require an RCW override - * procedure to reconfigure an internal mux, as documented here: - * https://lore.kernel.org/linux-phy/20230810102631.bvozjer3t67r67iy@skbu= f/ - * This is SoC-specific, and not yet implemented in drivers/soc/fsl/guts.= c. - * - * So the supported set of protocols depends on the initial lane mode. - * - * Minor protocol changes (SGMII <-> 1000Base-X <-> 2500Base-X or - * 10GBase-R <-> USXGMII) are supported. + * procedure to reconfigure an internal mux. */ if ((lynx_lane_mode_uses_gmii_mac(curr) && lynx_lane_mode_uses_xgmii_mac(new)) || @@ -1189,6 +1183,7 @@ static int lynx_10g_validate(struct phy *phy, enum ph= y_mode mode, int submode, union phy_configure_opts *opts) { struct lynx_lane *lane =3D phy_get_drvdata(phy); + struct lynx_priv *priv =3D lane->priv; enum lynx_lane_mode lane_mode; int err; =20 @@ -1197,7 +1192,8 @@ static int lynx_10g_validate(struct phy *phy, enum ph= y_mode mode, int submode, return err; =20 if (lynx_10g_lane_mode_needs_rcw_override(lane, lane_mode)) - return -EINVAL; + return fsl_guts_lane_validate(priv->info->index, lane->id, + lane_mode); =20 return 0; } @@ -1205,6 +1201,7 @@ static int lynx_10g_validate(struct phy *phy, enum ph= y_mode mode, int submode, static int lynx_10g_set_mode(struct phy *phy, enum phy_mode mode, int subm= ode) { struct lynx_lane *lane =3D phy_get_drvdata(phy); + struct lynx_priv *priv =3D lane->priv; bool powered_up =3D lane->powered_up; enum lynx_lane_mode lane_mode; int err; @@ -1225,6 +1222,13 @@ static int lynx_10g_set_mode(struct phy *phy, enum p= hy_mode mode, int submode) if (powered_up) lynx_10g_lane_halt(phy); =20 + if (lynx_10g_lane_mode_needs_rcw_override(lane, lane_mode)) { + err =3D fsl_guts_lane_set_mode(priv->info->index, lane->id, + lane_mode); + if (err) + goto out; + } + err =3D lynx_10g_lane_disable_pcvt(lane, lane->mode); if (err) goto out; @@ -1314,6 +1318,7 @@ static struct platform_driver lynx_10g_driver =3D { }; module_platform_driver(lynx_10g_driver); =20 +MODULE_IMPORT_NS("FSL_GUTS"); MODULE_IMPORT_NS("PHY_FSL_LYNX"); MODULE_AUTHOR("Ioana Ciornei "); MODULE_AUTHOR("Vladimir Oltean "); --=20 2.34.1