From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D0DB427F85; Wed, 26 Aug 2026 13:41:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751663; cv=fail; b=mN1IRa/XZuCGeuNE6IShHHPT7ZXjlsQso3V7L9uDd5fJb8iZQg+0iSb5MHMMWvMu6IcghLCbC4VIpiap5YpDW2+piIx0DLIyEC7k/9d1KSUxyxcRlRXry/O9PWLqZW93RIsYd0cUwwh+kot8mb8ZyrYYJV8Ikp1hnTTEaZy0rUE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751663; c=relaxed/simple; bh=7Dfi22EKeBKr42lOAF59B5fJo2nJROufcJPqdftf80I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=CB3VGJxP0ctMaozx9mtDtkcSrSlifEjG8F1xNcfYV3inZGe3MM42yisS6ig0GXQEO/awEATydEBUotHeZ+ew88Q8b7Klg6kNk2Yt2tX8i0Dj4v7lBiYjCyq4ECH7GoHgCqtOm00n9hdbCVpagpMkm5ZesMGdyJPXskZdLgrosyo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=a9AzpXRS; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="a9AzpXRS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MO/R/OEuJNSh5VWhA/VsIUZzY6NJt7jbD0mXOTa1TbrUpkSFMpjuIFMWmJjPe/HCTImH+kpcm7yNznGi0GdbCPWftVu/eoRNcffGy7wLZ1YvO7eCgob4yRMbxUlqe3IbdBWrAgp/AG6XDb/cuXiNNbnDqfSfNhJksCHAWv4rdHumu3Vzk3PagLse+kRGle1shygaazKBivStuEY9568Khu6ViBP1xHVUGMDR/PG5ULL4a6LOFHq6SDBY5D3N232dIL+kKmnq4KzDrAE0Zdwt5JCapsMwiAybGoGP/JX/f8GTKAfA6SUGwSeXHQJO3Hkof/U3jxRw2UJr3420moIVHw== 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=GVZNPNMr++D5ypHEgOfxXl4Ig0PZ6IVIaZcK3VQEOBU=; b=HessZw1T60cOiaSDevPRCyD3U74ZfgpnXym4JB72DmGgyTpR39szHiPbpRnjFYRNOLSl9XYCcWDx3CzHs8jj4TPnHEn7weDsDZ18xDt3LgOPxN0JYctT7e5Ud+ZRNd3kqTerMNi56eM4SUBRrYyvq1Hh2Vq7CleHCNzQF/6abt+ruuJis74jK0O5RANSq1CnaT6AKHWUKe6IKk8r4q+yfxUBAACRFh+dyYBTuhv8tlL7vjIrt3o1dgmDr0b2wEeQzHlqlheh4c2qPJC6OWp8NXhpdypW1E23h0TGVZTA4UiyLDIWgSWpcqFaMWBMb33TL40qKgQvHiO7Ya3MVa1GyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GVZNPNMr++D5ypHEgOfxXl4Ig0PZ6IVIaZcK3VQEOBU=; b=a9AzpXRSiuvdkoNbe4shujjPmk9oJga1RNChemxdmJPwrtCuj+miEBNdKcKVUIA+jEgBy38yN3QLqXzaWknwgGDnGG0sfBfJrahkx9+5hrlYiQhPy7Q3B+C7+N2uHmvpamzYwQXyg9AQ0urPvS98mNqQBNLUOS741c0g7zOZEMp0ZRPH0CJvKS41xRpWuthJzl+x1lxNlrgXl1RYAz0d4v3mWKD6cFG/deqkLbR1c5hyggP/DCHpmZDoAus2h5Fi8UK5+eFXn/+iW4KDXMl8UbmYE0HhDYptOpIcJbD5DdT/kStxLYD73CQdImeAEwJgWEmUe7wsFfrbnamQPGwD0g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:40:55 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:40:55 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 01/10] ufs: unipro: Move Tx/Rx FSM state definitions to unipro.h Date: Wed, 26 Aug 2026 15:40:39 +0200 Message-ID: <20260826134048.854748-2-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0382.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f7::20) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: 203a3e0a-7482-4080-3d9e-08df0377a71b X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: 8Ga3ws8wNp4F1SD9Pf5bDUKtbh1vMkdCoBYql0lS/QkH/s8/ZtQCJluos3lbVb2nGeNW/SkfAaeNeheptIrPDxWslrmyM+xesk5rd2POU7T25HLsg902RbfStWQMX2bf1+/z1rJnWyJedhzzENWzVY93xTEoSJVXQa1EzLTEmoe1hvP1yQAB4XvYt3u9ouyDGo5pFWX2AK9eCclqhwMZfRu5eErL1TL2x4x7pSk3EBNNbQMljxFuh22d//4WJJV8FcAQirhPkELsgz3AUM4SdfxylN4Nzo2MNFtZb4uHOfEYrvendbz8yDvPC3mkcCPMNcB9HQQ8/FofxCjCPciKN94DG6LJnG/RiPo68BrArxkg3FrMGPNQ9hE2h9qdc+kIMEsNrU9vuo3QQH6lRtuc7DXUvSk+FgF5k0DAX9/ExAZ8Iw/N5vckTbgCnzqLc+RUMXDuCrt/7B6wL3RxG3gcyiIAkoUyDpJiPx6NXlyQ5OfCg0fsYGjmLdKXXiUGW+KJaFBBvNVFe+wf1i4BHOIB82Ca9hdxusvVO4Dadnd20KlqnIFWDijqZwz5xI8UD9OL1AzJGa6smjiIQM3+xFa11lSKfbUo0pOkxCoi1WlwSmHsZuNWNfP7vKFeBy7R705YkEIJv2DDAxJLeuXD53TGXe7lV3dqlomgQDHEWDnlh3mDpxZtJY7sXJioEKpVrNJadRw4YgbLO+R7/HfEef04Fw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WlJ3WTNoUlVtOC92VjU4Y2tCWHRJZGxkVWwyWnhhcmJrUVQ1aEIva0FVcUlJ?= =?utf-8?B?MVpaZnBPRmdkNzBJUzMwLzFMNkZZTFA2MWY2QUZzdzA5VjI3L2dLR25VVERI?= =?utf-8?B?QjU2YzRpYzJTWCtPV2VlOWFucHE0dlZhdkhYckNLRjJrSkRXYy85WFpKZWJ1?= =?utf-8?B?cEdqSDdnVVFJSk9tVVJDdGdqNTcyWXhDcTdlQUZPY1NTZk5TelNxVEFsa0hS?= =?utf-8?B?OUt4cnFoN2hMeHY4SmlJdTV4VUJRcTZLWkRHeDFCM2NBcDlBNU14eW5rR3Mx?= =?utf-8?B?SHQ3bXRSTnVFM3dzRFFLRm9RVGU5Qy9GdHYvNG9UNXg4Zng2OVg2b3lhUHlo?= =?utf-8?B?VUpDSTVaczFyY0o1UTg1QWY3aTJ2d0lpblhDc2ZTc05FSVYwYmpVMDJZR1gw?= =?utf-8?B?WmpLaHVYM3g2U09oYnZGQmU5eGtLR3JzWFVEWnhYdlFPNmtjaStuN1JWZDhp?= =?utf-8?B?a0xTbEdURGduUSt3S2plYitXeC9IN2pKT0JHRHA1VEFFdHRmOCtXMmhac1VG?= =?utf-8?B?MmdqbE1UOEVhNTJiM3paVW4wakIxSUVBVllUOFNHQi9WcWZNekdFMS9UM01m?= =?utf-8?B?S1BqbWU0K1QrS2E1aFBqYW1WRzQ3bW0wd2R4aitTek00elExeUlrN3Q4WjVz?= =?utf-8?B?WlBQRmhIUWRYTFpEQllkOGY5M2hGS1pnRU42ZjhXajYyUXhnNzNraEtxVmRS?= =?utf-8?B?cVBDUHlTeFBNbzFZOXUxMnZ3WXVKVndjVXFoNE4rTDhkK1BBdTNvU2xFdUtW?= =?utf-8?B?V3RXblFJUVdlbjAwdmttTXZ4VHFjZVdvQU83Um9mTENmQmVWdGtxTExrL0pw?= =?utf-8?B?dFZyL2YyZWo2cStyOTZzV2VGM3docStKRDV0MEkrT3IxNUlKbHp6VXVFb21J?= =?utf-8?B?N0VvcWZPLzJvRnZwNTdLemhNTGZLbThYWGlrSzJpZTZnNkhQZ2NJK3hvVG9P?= =?utf-8?B?S3RBZlpTQVBCQndRa0hsVHI3TU1XQ3NmbGpzbCtYUHM5SlFwZDR0bDhKMk1a?= =?utf-8?B?Zks5b2FOS1dJR1YwV3BjcXlNYjE2TEJ6cFZoUTFWcHp4aHBKZzB5bmx4OGFG?= =?utf-8?B?a013S2c5WTBTUWZsM2JPRlN5Mml0N01ROHA4cG5meUx5RWNIcExkclE3ODFp?= =?utf-8?B?WTJnbWtnUGtHZXc5ZUhrMkl4dm92SFN5eW1KQmEraXkrL1FzZFk2alpSckdJ?= =?utf-8?B?YXlGVi8zcWJEUFVXMUJYSlc1WVh4M2sycTFqbFZ1QU40WkxSdFRjemxWSVdx?= =?utf-8?B?WUdJSzVnVXhtOHFPaFVyMzdOT0FTY1FOK2hhaTJweWxiVzYzeUh1UlJFWGd3?= =?utf-8?B?WklyM0NYa0tYRVBWQUlwMmUwQS9COWs3V3pua1ZGbWNrVTNzMDZhdWxIaUY5?= =?utf-8?B?YVBaZ005Nm1OR1pSd1F4Q29vcE9CbDJnbXoyK3d0QjZFVXFXVjJELzFXVkpS?= =?utf-8?B?UDR4V3VkR2ROYWo5S20ySHUyZWhVQ0VlSEJsREZCbEsycFVRMC9ya2hZUFh5?= =?utf-8?B?SHdBSGhOVGo0S05VMUo5dGJUQ1lFdDF3SE5STFAwcVVpVzVOSlZsYzhyVU9l?= =?utf-8?B?dVlpSVRrVkVYajc2eDcvYkMxR2dMdWd3c2pSdGU0Z2crRXBhTDJWOVpTZkZC?= =?utf-8?B?SmY5RklyRlZnazBmQnNXTlVjMys3b1dYbVZkdU94RGE1SFhra2hRTDRXSUJW?= =?utf-8?B?aTVlTDBsMjVPenBGeElZaERWaCtEYmF0NFBUZXRyTEtYems2b253elJqNW5H?= =?utf-8?B?YWxsUkFtajlhT3ZwVm80ZmJmRHloWFlZNVFLTUx6ZVJsN2p4U0JRVGV1UVdL?= =?utf-8?B?RVRuM2JIR1RQekxwYXVNREhzVWFMeEE5cHNhQzBSblE5UGthK3ZqdHVDRkRJ?= =?utf-8?B?d3pyYTZncHhxbjFVcTRUc2V2bUFCTWc3RVRRZjB6N2ZmejhvcTVZTVJSNFFK?= =?utf-8?B?Z3ZocThhVUR5d2M4KzlUTjJQQW9JT2lsZ2pzbGN5RHlxR0F6V3g3UCtnVE5p?= =?utf-8?B?S05RNGRlNG5jUTZEM0VHUjBrVzh2VlVRNkRmRkxmeUMxQzBKWkZSSU5PZHpS?= =?utf-8?B?dU1ZQkdEYVFFU2RJN2M5ZG5ocktGb0ZTakFKb1hRWSttQWlZU2J3NHhEVTg1?= =?utf-8?B?eXVBVS85T0FvaW1KdlVCMVhzcjZ0aC9wZ1dTZVlOYXNDc25veUVtNnJzcnk1?= =?utf-8?B?RUgzRmJhc2U4L29FUjRpMVVwV2w5bzNyQWFtZnFtSXVzQ21UVXZ2Nmh4U3Vx?= =?utf-8?B?M3JEOTNuYjRmb2QwTmNCRndNa3JSb283Mk1OMGZSQXVpOXovbzFLTmMzYWdw?= =?utf-8?B?OFp0VG5pYXZOTGc0eHh6UXVxL1ByeUp3YkZDaktsSndoTWtyS1NQOWZ0U3dx?= =?utf-8?Q?tzz9uMYPNn90T9fg=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 203a3e0a-7482-4080-3d9e-08df0377a71b X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:40:55.0203 (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: 2O6LuertweSHBgGZatLP3X/QUvW+5K1bPfDbckb+x+kGp3DOrjqfhWh/oGtwxBp1zVnhKbYUh6tu3Zb4VEKLcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" Move the Tx/Rx FSM state definitions from ufshcd-dwc.h to include/ufs/unipro.h. These state values are UniPro/M-PHY related and are not specific to the DesignWare UFS host controller implementation, so unipro.h is a more appropriate location for sharing them. As part of this move, drop the driver-private TX_FSM_HIBERN8 define in ufs-hisi and ufs-qcom and repoint their Hibern8 checks at the shared TX_STATE_HIBERN8 enum constant. This is a no-op change: TX_FSM_HIBERN8 was 0x1 and TX_STATE_HIBERN8 is 1, so the compared values are identical. This also prepares for using these definitions in a subsequent commit. Signed-off-by: Larisa Grigore --- drivers/ufs/host/ufs-hisi.c | 8 ++++---- drivers/ufs/host/ufs-hisi.h | 1 - drivers/ufs/host/ufs-qcom.c | 4 ++-- drivers/ufs/host/ufs-qcom.h | 1 - drivers/ufs/host/ufshcd-dwc.h | 19 ------------------- include/ufs/unipro.h | 19 +++++++++++++++++++ 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/drivers/ufs/host/ufs-hisi.c b/drivers/ufs/host/ufs-hisi.c index 993e20ac211d..2d214ce9620e 100644 --- a/drivers/ufs/host/ufs-hisi.c +++ b/drivers/ufs/host/ufs-hisi.c @@ -34,8 +34,8 @@ static int ufs_hisi_check_hibern8(struct ufs_hba *hba) &tx_fsm_val_0); err |=3D ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(MPHY_TX_FSM_STATE, 1), &tx_fsm_val_1); - if (err || (tx_fsm_val_0 =3D=3D TX_FSM_HIBERN8 && - tx_fsm_val_1 =3D=3D TX_FSM_HIBERN8)) + if (err || (tx_fsm_val_0 =3D=3D TX_STATE_HIBERN8 && + tx_fsm_val_1 =3D=3D TX_STATE_HIBERN8)) break; =20 /* sleep for max. 200us */ @@ -56,8 +56,8 @@ static int ufs_hisi_check_hibern8(struct ufs_hba *hba) if (err) { dev_err(hba->dev, "%s: unable to get TX_FSM_STATE, err %d\n", __func__, err); - } else if (tx_fsm_val_0 !=3D TX_FSM_HIBERN8 || - tx_fsm_val_1 !=3D TX_FSM_HIBERN8) { + } else if (tx_fsm_val_0 !=3D TX_STATE_HIBERN8 || + tx_fsm_val_1 !=3D TX_STATE_HIBERN8) { err =3D -1; dev_err(hba->dev, "%s: invalid TX_FSM_STATE, lane0 =3D %d, lane1 =3D %d\= n", __func__, tx_fsm_val_0, tx_fsm_val_1); diff --git a/drivers/ufs/host/ufs-hisi.h b/drivers/ufs/host/ufs-hisi.h index 5a90c0f4e90c..6af6a268458d 100644 --- a/drivers/ufs/host/ufs-hisi.h +++ b/drivers/ufs/host/ufs-hisi.h @@ -43,7 +43,6 @@ * M-TX Configuration Attributes for Hixxxx */ #define MPHY_TX_FSM_STATE 0x41 -#define TX_FSM_HIBERN8 0x1 =20 /* * Hixxxx UFS HC specific Registers diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 291c43448764..75f569dd5cfe 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -393,7 +393,7 @@ static int ufs_qcom_check_hibern8(struct ufs_hba *hba) UIC_ARG_MIB_SEL(MPHY_TX_FSM_STATE, UIC_ARG_MPHY_TX_GEN_SEL_INDEX(0)), &tx_fsm_val); - if (err || tx_fsm_val =3D=3D TX_FSM_HIBERN8) + if (err || tx_fsm_val =3D=3D TX_STATE_HIBERN8) break; =20 /* sleep for max. 200us */ @@ -413,7 +413,7 @@ static int ufs_qcom_check_hibern8(struct ufs_hba *hba) if (err) { dev_err(hba->dev, "%s: unable to get TX_FSM_STATE, err %d\n", __func__, err); - } else if (tx_fsm_val !=3D TX_FSM_HIBERN8) { + } else if (tx_fsm_val !=3D TX_STATE_HIBERN8) { err =3D tx_fsm_val; dev_err(hba->dev, "%s: invalid TX_FSM_STATE =3D %d\n", __func__, err); diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h index e20b3ca50577..b7b68333fc32 100644 --- a/drivers/ufs/host/ufs-qcom.h +++ b/drivers/ufs/host/ufs-qcom.h @@ -11,7 +11,6 @@ #include =20 #define MPHY_TX_FSM_STATE 0x41 -#define TX_FSM_HIBERN8 0x1 #define HBRN8_POLL_TOUT_MS 100 #define DEFAULT_CLK_RATE_HZ 1000000 #define MAX_SUPP_MAC 64 diff --git a/drivers/ufs/host/ufshcd-dwc.h b/drivers/ufs/host/ufshcd-dwc.h index c618bb914904..a5e40e7604a1 100644 --- a/drivers/ufs/host/ufshcd-dwc.h +++ b/drivers/ufs/host/ufshcd-dwc.h @@ -39,25 +39,6 @@ #define RX_AFE_CTLE_IDAC(n) (0x4001 + ((n) * 0x100)) #define FW_CALIB_CCFG(n) (0x404D + ((n) * 0x100)) =20 -/* Tx/Rx FSM state */ -enum rx_fsm_state { - RX_STATE_DISABLED =3D 0, - RX_STATE_HIBERN8 =3D 1, - RX_STATE_SLEEP =3D 2, - RX_STATE_STALL =3D 3, - RX_STATE_LSBURST =3D 4, - RX_STATE_HSBURST =3D 5, -}; - -enum tx_fsm_state { - TX_STATE_DISABLED =3D 0, - TX_STATE_HIBERN8 =3D 1, - TX_STATE_SLEEP =3D 2, - TX_STATE_STALL =3D 3, - TX_STATE_LSBURST =3D 4, - TX_STATE_HSBURST =3D 5, -}; - struct ufshcd_dme_attr_val { u32 attr_sel; u32 mib_val; diff --git a/include/ufs/unipro.h b/include/ufs/unipro.h index 9c168703b104..bf063edc284d 100644 --- a/include/ufs/unipro.h +++ b/include/ufs/unipro.h @@ -466,4 +466,23 @@ enum { CPORT_CONNECTED, }; =20 +/* Tx/Rx FSM state */ +enum ufs_rx_fsm_state { + RX_STATE_DISABLED =3D 0, + RX_STATE_HIBERN8 =3D 1, + RX_STATE_SLEEP =3D 2, + RX_STATE_STALL =3D 3, + RX_STATE_LSBURST =3D 4, + RX_STATE_HSBURST =3D 5, +}; + +enum ufs_tx_fsm_state { + TX_STATE_DISABLED =3D 0, + TX_STATE_HIBERN8 =3D 1, + TX_STATE_SLEEP =3D 2, + TX_STATE_STALL =3D 3, + TX_STATE_LSBURST =3D 4, + TX_STATE_HSBURST =3D 5, +}; + #endif /* _UNIPRO_H_ */ --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C6E242BC39; Wed, 26 Aug 2026 13:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751666; cv=fail; b=rEziZ66nKa6KbdzpkvsrhnrT+Yq/W/lH+S+cUPseAFmhJIZ2x1G9gFEx5GjxtCS75Wu1mVMffSYRAG8Awzi2GJgQschHs3vaV51SiIGcpB+Mw1Che2Q+JY6gHxGo54+1n2sdS8+IXnegfVm/J0dp9V5+Ksp2GQ44KjKEpUQluG4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751666; c=relaxed/simple; bh=Pvoldui4TqUzxH96n10p4Ht1WV44SHxFe2Pj2ND03Ls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=VvY0sDq4JswNWo2Z65JKR2O3VK8R+EXHi76VSj1+e1YJiX0Jtf1k+JAhvikZ3MO4aeIM8Tx1YTnk+EAkaXATQuusgt2mn85X563UUgbJfJ1/u+LM7r9RpPq98DLzLTdVc5/NTzJkbSjTDdDpQ1FU6oLm0L93VAIOiYRq+GLv2g4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=OYaVrrgE; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="OYaVrrgE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Pol/CnZDWMU5CUsXmUBDAa2uCrkbg7KWwMJtdPu9L4GQa/kqfZ4daeVRduWOkagDP/RrEUqn/uJFdnhPT8PSUFWqJSdJw4mpBWkU6qOzn95T0Q8HOJlziaJUgqrgbM52VLg8Xtuozn7w85HTFYSaWNL3Z6Tzzah+oPPYrWFDWcvk+so2VGVq74xZm89hL2XUFu2nsIKkNBKSqXp/mQn3R4vy76t/zJGHrU1kirRBx/ej1lASN+DYt1QERMtljRIoD13/SKa6hD8XJofKVS8GQYNfRvlrtKB3VozhIZU11tTO21LwY/TEv2EdmDUSHfuL+pxm9cbc6bQW4gorcVVsnA== 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=7ZgopwHOTMWcL2jVyCnKzavYy90keYDSAxmRhAEAfrM=; b=mocqnQL4Tmi5yDnYt6LDTDoUhVIn+ohIz0PZ3Agytw/cy0EdsMNFpaBv9UjczwE2NVttA/X8HQfiGYZ3X3KTsQUZefqPjvGYdjdVkfB1MBmCeZ/Sm4wxxZbBpkEHnvGWP0AXlnQMTHwYt3AJXwEJX6ETiMPvnAzBgcC4Kb9m83RgEvSZWW/j0Q4kROKCJCCyFyHrvcl/tAc++hurQp6vrfKkjoQx/qfEnrO+/RtMJLEJqSUnDixV+O49hCATxboHRusUbJOQpQPhup8+iriz5ffja91xefWTLgjXR4mjG4t8L65ZAGQiR+ihYECQcM+j/u4NI/LzHAPqFc/YsFXdXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7ZgopwHOTMWcL2jVyCnKzavYy90keYDSAxmRhAEAfrM=; b=OYaVrrgEIL8E5UXYzkqo9NO740H84S7mdOPsoo0wA9TbRrzS/Q6WW7JSgjiv7Ug1WOZLzS9rhgzdjaCHzZdg2722k+0rJfr3Wxz2EFJf9kQSVKJ+o+20lmvZC9VI4311ADhCN+9tNegITFJNNbCN+IaVlwZZwdcTx7OX4uGVsJt4/7bTbgZIcrV/7k/QLUNSNMFVtS3l/aC13S/9xUQwjOQAZmFC24CtEpjIBQ1PxZ+ecqiJYV2lGbIVXg+Q4OgvSnYDo3Yx+zrThLT+j9B9ooDrWpshIoDw1sNUCUAtF6liNyYHc4TeQkIi+uZnNFetycs/ZUAC8C5epYFjo2YGig== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:40:57 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:40:57 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 02/10] ufs: unipro: Add TX/RX FSM state attributes Date: Wed, 26 Aug 2026 15:40:40 +0200 Message-ID: <20260826134048.854748-3-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0381.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f7::9) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: d1bbe1e6-844c-4419-987f-08df0377a83b X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: f39oqJVMDEss8RuHTCV5N7fLO0r0GB7w4A+8kUzG9r1zv0eDatkZQopn1UZjhV1sJXSCR3VJy7cWBH0lUJfPutcrzCsOVE9bEYhbJtZdv99DXBQDvl8h2BstKqGGQ0D8vJXrnwlWHNfm7SrbPLx0sTi0HbYYevll2M+d49rfKUBdRJaWlET3gqPGltcNp8ZhlZB44fDac9ZBWH+KUlnp/x7EhqKLo5WLvK8nqz43Xr1hon0qqoDefJlybQkX0XA+sXHY8FaqgU+d8eku41pisiua3NcKzLv3CAe3E3WVG1BQek3BZsmJAjZugDkgMDk+8cwkRJZC3PwiIgLkT56z4vjGS/u8onU6UDCXo8+6O0C8YUOl4H77nKdyZgW87dzuVNNtKgx21AomsmpYlCN1+PptDChpzxf82RT4vbKqdw1ceFcRooezEPMhYFz4xKmaA8v+3LxfJQJBskIkxIaVEC3WDp6haB7ZXCkQ2qE+dW5S4FYnXv9XRsWy7HTHfNTx2Ki/UIOA1wj0xHn1LmW/e+Yp4TqaQD/cRiTv67dfNgY0oNMFhEN8DVcdM4Sk0TuKMgQEJkCqrwhHXsXYxyE/+oI8EixCy9nv2/Ch+LwcNwhz4zwdm8AL7HfzNlfS7IWUztgPxG9cYe3dcBGZSvjfk9hM4/Zyf0Ytmj2JNmniHxWhQZPdq5MMnb7g4Uo8oNncx0H8aOk7DiffcOpssiQU/A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TWV0UmNnV1ZZWHpCNzM5YTV3RnJqbGtrRjZrcU5ZQS9vL2psd01sT1FqK1N4?= =?utf-8?B?THplOGhlUnBDY2NOc1QrRHMxMXdxRTZMejdwMWVzSDZRMjJ6VnJOKytzdGNQ?= =?utf-8?B?dlpVdHMwVzZZM1pxcGhyd0tiVThmRWRpb1REMUdWZWJEekJ5SWx5QlNKN1J2?= =?utf-8?B?ZEVVZThBVUJxR2NwdkZ0aDl1K3QzZnZhbTcyUkpIR1V6NS94ZGhzZ21jNnM1?= =?utf-8?B?WDYrMHFVVXBIMnhhUXFCTnVXZUpJNzVzNHVQOHc0S1NWVnpEZ2oxTHBuSEJQ?= =?utf-8?B?MTFPYXdvTTIzZnh1OFBuWUZpOHBQdUZFS2lta3phdFE3SnV2VlMvNzVhL3M4?= =?utf-8?B?U0dGblFMNXg4YkRCZzN0UW5oeStEdmtQL3RIVVdDU2VJVjF4MlZQVnNmWHlS?= =?utf-8?B?MElKeTB4eVhZZStYUmFQZHM5T0RiMlg0NDd2K3dGbmhMajF3aUt5WGt4WlFM?= =?utf-8?B?ZXpYSTJEU0ZmdmJjWFRiWXNrdnJhS2ZWenBTZFh2bVI2Wm1tOUNjYkExUnFO?= =?utf-8?B?bzVOZVZsZ3VhZjhlV2U4MXg3bjhpYWNJSUI2TlBpQ242bE9VRGRNcWZaZWJZ?= =?utf-8?B?S0YwTU9yamVUTlpQakV5QndOdksySHo2OGlMaEh5WEtoRjBVWmdIaU5XTHhX?= =?utf-8?B?VGhQTDFjRWlJZzU5dXFDTFh5QURpZ3hJdzhCU1c1bTdrUXd3blMrQjZrcDFj?= =?utf-8?B?blBIYTNGZG1WRHRCR3I2U3VKRkt0UGozMVlhYXhmaTRzenNmSnROYXlBK0lT?= =?utf-8?B?Nzd6RUFhMHh1VkVnVWVSVGxERVh1NGU0MHB4dmZza25jUXAvbFRQVlp2U0Y0?= =?utf-8?B?SHpHT3VPQi9yd2h5Vy9BM1hic0VqS2c5RkJOK202aWFWcmFlenNEaWo4U204?= =?utf-8?B?UmVEWWdCY3d1N0wyVHNuUDV5SXpoZSs5REJiaU5CdERSUjdlbU03ZWtCUEFa?= =?utf-8?B?SzN1MUtVbUFrcWdTaTBqNkhWa01TcTZkeUVCMHNBTHlOQ3RnVXBqeU14dkgy?= =?utf-8?B?V0lQcFNQUzFCUGY0T0drT2svUUJCZUEwaTJGbDNmSS9ucVBTSVdVVDMxVHhh?= =?utf-8?B?RmVSN3paK202RHJ0UURuRWM1RXlRb1hZemttZ1RnT1hKUHRMNFRMS3U5UGVQ?= =?utf-8?B?QlZZaTM5enZtTDg1T0N2MTE4RTlwQ01VTHFFWXBMK3VndG9jYjF5QU1nRTFv?= =?utf-8?B?U2NCRjFsaXJhMnZyN1kxeG5xbkJGekZQSUo5ME5GOEt0UGE3eFVYRDl2V05U?= =?utf-8?B?cW12cnpWRjVLNVduN20yWHNxT3dqQWhUMmc2ZU9mZThNSktpTzdjK0pvOVNa?= =?utf-8?B?bExMZ2xNRXJuNFZCZEgzbityM1hlWEhmZFBwRUZjWXNTa2lKckQxb1ppMHgr?= =?utf-8?B?eUQzNmdwUTBlV0dJdU9iR0xSWjI1aHpvRGJYRTgvTG5Na01NRlRTNDRUSWhN?= =?utf-8?B?cjFFV3hQMGlkZGN0M281dSsrYVo3d3NkcUN3Vmx3cWZWRUw1SmxWNk1tSytF?= =?utf-8?B?OXJhNGdxb1RPVktTZEM0aFRpK0QzeGZvdnFzQ3Z2K3dJUUNOWU8rdURUS1VD?= =?utf-8?B?TVlZQlUrTi9PMEcyUkQ4b2RLVWhyMnI1VGNDa09uTEhzTVh0Sko4T0xpZFB0?= =?utf-8?B?anJYRWNDQmUwQWpYREM4SFlCY0w2WStNUmczSWczVE9NcFM0NUdPUjIxckov?= =?utf-8?B?OFBiMkJXZlNGeDdpMUNZLzZ0VDh1eTZ1RUZtQXo1d1BaY09oZUgrM1JoYzB6?= =?utf-8?B?YkVrUW9EdTRsT0JvOVgrZ0ZiRzNPN2NNSjRsNkU3TVozQ21jazg0bEo2Qkdu?= =?utf-8?B?ZXJ1aEJBQVlVRCtqR044NHA1YnZNNnk5eGF3NGV3bzIvSGNYT0ZlOVZVcUFS?= =?utf-8?B?L29TUzRVT2lYTlZnMTA0NUZncHVtQ1VpUlV2cGc2UmdFQmdPcGRlUFZKUVAw?= =?utf-8?B?M25tdmZMUVNxU3FSMXdPbnRtOGh4SjJkZmtja1FmTzJrY1Znd1FKd1hSQXRR?= =?utf-8?B?RVNGVkNGTGlySEpvU01VQmJiZ0JYdlZPWXdvaGwvc0dRY3VwR2J1bElXY0xK?= =?utf-8?B?QlR2TGJXV2tod3NMUFBic1JhWDZKTExJY09nTUJuMHFINGdETlBrbnV4NXBj?= =?utf-8?B?WFVveE9Ob1FLVFBka1RvWjVvZGFKQXNId3FXdU9uZmV4b1lxZVloblBkZGFG?= =?utf-8?B?bGxoWXc5L3VSQk9RalpnbC9hbTJiTk0rZklQUDllUzk0S0QydzUxMnlDUmtk?= =?utf-8?B?b0wvY2dLRlZhR0w1bFJIV3doaW41YitIRklmRzNEVUtGSHIyb05vY3NVK3lj?= =?utf-8?B?Wk9lVUdqbURaNGVDWUw1VFZmQ245NzUxcWtPRzJPZWFESnQyVzFWbkw4ODdV?= =?utf-8?Q?O9mN4/KEtDyaUgsM=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1bbe1e6-844c-4419-987f-08df0377a83b X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:40:56.9090 (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: 9Ouw5k9AB4IduB3Xz2JFxuA7ngDoINCj70lPVtAmzcsoVqx8F3dnkn/REw9+VfPeTqdsZqPnsxVbcVaqKgFZDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" Add TX_FSM_STATE and RX_FSM_STATE to include/ufs/unipro.h, as these are UniPro M-PHY attribute definitions rather than host controller specific ones. Remove the duplicated local definitions from the HiSilicon, Qualcomm, AMD Versal and DesignWare UFS headers. This also prepares for using these definitions in a subsequent commit. Signed-off-by: Larisa Grigore Reviewed-by: Frank Li --- drivers/ufs/host/ufs-amd-versal2.c | 4 ++-- drivers/ufs/host/ufs-hisi.c | 8 ++++---- drivers/ufs/host/ufs-hisi.h | 5 ----- drivers/ufs/host/ufs-qcom.c | 4 ++-- drivers/ufs/host/ufs-qcom.h | 1 - drivers/ufs/host/ufshcd-dwc.h | 4 ---- include/ufs/unipro.h | 2 ++ 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/ufs/host/ufs-amd-versal2.c b/drivers/ufs/host/ufs-amd-= versal2.c index 2154d6286817..0d4d5e98ad65 100644 --- a/drivers/ufs/host/ufs-amd-versal2.c +++ b/drivers/ufs/host/ufs-amd-versal2.c @@ -112,7 +112,7 @@ static int ufs_versal2_enable_phy(struct ufs_hba *hba) u32 time_left, mibsel; =20 time_left =3D TIMEOUT_MICROSEC; - mibsel =3D UIC_ARG_MIB_SEL(MTX_FSM_STATE, UIC_ARG_MPHY_TX_GEN_SEL_INDEX(= offset)); + mibsel =3D UIC_ARG_MIB_SEL(TX_FSM_STATE, UIC_ARG_MPHY_TX_GEN_SEL_INDEX(o= ffset)); do { ret =3D ufshcd_dme_get(hba, mibsel, ®); if (ret) @@ -132,7 +132,7 @@ static int ufs_versal2_enable_phy(struct ufs_hba *hba) } =20 time_left =3D TIMEOUT_MICROSEC; - mibsel =3D UIC_ARG_MIB_SEL(MRX_FSM_STATE, UIC_ARG_MPHY_RX_GEN_SEL_INDEX(= offset)); + mibsel =3D UIC_ARG_MIB_SEL(RX_FSM_STATE, UIC_ARG_MPHY_RX_GEN_SEL_INDEX(o= ffset)); do { ret =3D ufshcd_dme_get(hba, mibsel, ®); if (ret) diff --git a/drivers/ufs/host/ufs-hisi.c b/drivers/ufs/host/ufs-hisi.c index 2d214ce9620e..bd223bda1ce2 100644 --- a/drivers/ufs/host/ufs-hisi.c +++ b/drivers/ufs/host/ufs-hisi.c @@ -30,10 +30,10 @@ static int ufs_hisi_check_hibern8(struct ufs_hba *hba) unsigned long timeout =3D jiffies + msecs_to_jiffies(HBRN8_POLL_TOUT_MS); =20 do { - err =3D ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(MPHY_TX_FSM_STATE, 0), + err =3D ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(TX_FSM_STATE, 0), &tx_fsm_val_0); err |=3D ufshcd_dme_get(hba, - UIC_ARG_MIB_SEL(MPHY_TX_FSM_STATE, 1), &tx_fsm_val_1); + UIC_ARG_MIB_SEL(TX_FSM_STATE, 1), &tx_fsm_val_1); if (err || (tx_fsm_val_0 =3D=3D TX_STATE_HIBERN8 && tx_fsm_val_1 =3D=3D TX_STATE_HIBERN8)) break; @@ -47,10 +47,10 @@ static int ufs_hisi_check_hibern8(struct ufs_hba *hba) * check the state again. */ if (time_after(jiffies, timeout)) { - err =3D ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(MPHY_TX_FSM_STATE, 0), + err =3D ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(TX_FSM_STATE, 0), &tx_fsm_val_0); err |=3D ufshcd_dme_get(hba, - UIC_ARG_MIB_SEL(MPHY_TX_FSM_STATE, 1), &tx_fsm_val_1); + UIC_ARG_MIB_SEL(TX_FSM_STATE, 1), &tx_fsm_val_1); } =20 if (err) { diff --git a/drivers/ufs/host/ufs-hisi.h b/drivers/ufs/host/ufs-hisi.h index 6af6a268458d..08dccfbec404 100644 --- a/drivers/ufs/host/ufs-hisi.h +++ b/drivers/ufs/host/ufs-hisi.h @@ -39,11 +39,6 @@ #define MASK_UFS_DEVICE_RESET (0x1 << 16) #define BIT_UFS_DEVICE_RESET (0x1) =20 -/* - * M-TX Configuration Attributes for Hixxxx - */ -#define MPHY_TX_FSM_STATE 0x41 - /* * Hixxxx UFS HC specific Registers */ diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 75f569dd5cfe..b2081ed6197a 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -390,7 +390,7 @@ static int ufs_qcom_check_hibern8(struct ufs_hba *hba) =20 do { err =3D ufshcd_dme_get(hba, - UIC_ARG_MIB_SEL(MPHY_TX_FSM_STATE, + UIC_ARG_MIB_SEL(TX_FSM_STATE, UIC_ARG_MPHY_TX_GEN_SEL_INDEX(0)), &tx_fsm_val); if (err || tx_fsm_val =3D=3D TX_STATE_HIBERN8) @@ -406,7 +406,7 @@ static int ufs_qcom_check_hibern8(struct ufs_hba *hba) */ if (time_after(jiffies, timeout)) err =3D ufshcd_dme_get(hba, - UIC_ARG_MIB_SEL(MPHY_TX_FSM_STATE, + UIC_ARG_MIB_SEL(TX_FSM_STATE, UIC_ARG_MPHY_TX_GEN_SEL_INDEX(0)), &tx_fsm_val); =20 diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h index b7b68333fc32..fc24ed995ff3 100644 --- a/drivers/ufs/host/ufs-qcom.h +++ b/drivers/ufs/host/ufs-qcom.h @@ -10,7 +10,6 @@ #include #include =20 -#define MPHY_TX_FSM_STATE 0x41 #define HBRN8_POLL_TOUT_MS 100 #define DEFAULT_CLK_RATE_HZ 1000000 #define MAX_SUPP_MAC 64 diff --git a/drivers/ufs/host/ufshcd-dwc.h b/drivers/ufs/host/ufshcd-dwc.h index a5e40e7604a1..0406f2bb576b 100644 --- a/drivers/ufs/host/ufshcd-dwc.h +++ b/drivers/ufs/host/ufshcd-dwc.h @@ -27,10 +27,6 @@ =20 #define CBREFREFCLK_GATE_OVR_EN BIT(7) =20 -/* M-PHY Attributes */ -#define MTX_FSM_STATE 0x41 -#define MRX_FSM_STATE 0xC1 - /* M-PHY registers */ #define RX_OVRD_IN_1(n) (0x3006 + ((n) * 0x100)) #define RX_PCS_OUT(n) (0x300F + ((n) * 0x100)) diff --git a/include/ufs/unipro.h b/include/ufs/unipro.h index bf063edc284d..d9fcdf922482 100644 --- a/include/ufs/unipro.h +++ b/include/ufs/unipro.h @@ -34,6 +34,7 @@ #define TX_PWM_G6_G7_SYNC_LENGTH 0x0034 #define TX_HS_DEEMPHASIS_SETTING 0x0037 #define TX_HS_PRESHOOT_SETTING 0x003B +#define TX_FSM_STATE 0x0041 #define TX_REFCLKFREQ 0x00EB #define TX_CFGCLKFREQVAL 0x00EC #define CFGEXTRATTR 0x00F0 @@ -72,6 +73,7 @@ #define CFGRXCDR8 0x00BA #define CFGRXOVR8 0x00BD #define CFGRXOVR6 0x00BF +#define RX_FSM_STATE 0x00C1 #define RX_FOM 0x00C2 #define RXDIRECTCTRL2 0x00C7 #define CFGRXOVR4 0x00E9 --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4B6C3BFAF7; Wed, 26 Aug 2026 13:41:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751668; cv=fail; b=j3Bvyv0gr3pYUDWU+uiqJvofrNGJoBNExpvyM5rWS4uwIR7jim1h5Utyl4PSQ1uneoQ1bSq8PCxoVxJS2n525zGLck4n/dpq/QjvWPH5QbHuVLdkCgjeUbynBPSCmWX+Ulchdxbsyd+BpIs4DcL6kxgit2KT/tF6ybd6fZdc764= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751668; c=relaxed/simple; bh=WgxfhdcneNQKxphU7XUa9S8jOzZu3NgMAj3XiPJs7YY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=B4qMf/CeUy30WgAK0+RTrC3h+gZdiRGhKa7C95kqYDiphWsiz+ZSidApaiCuyWHPDfdSPapoFjxpZfPUtn0ThGasYacMX7JYvC+VatWiqCT8Sue+zvi5ZjlrOehJwSmOs+zMij2vsXTlaF8E7RgZYIbKT2FA4duTSq4xetXysFo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=KAIjC07d; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="KAIjC07d" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=etuBMPPNQYUkv3Apiw2nSz7XlhqBH2XdTEoTZCMJPZjDaxlrnObc/iLSFc3PzlRb9KKflMCop8TwZVG8L1rvZfHN68drXbB1HGicYfd3c9b0zYuiK37MiKehUwWDKQsaRVhxrPSyvyZ8fuI3/vgrgS1wnHFHaP8GtPVoLFmAaXbebv9XQ2Y/8kwVxGrb9RGGrejiVo8vJArz8ES0ujLVZA2qUdespAWLv3Bo6QoEL/DmP8W7TPpskYoQmcfueXFApbekHby7VkJvoO3QcGv0c9IXT21C//KcmAfvO8udu6fyuu7xc4qH56xwmPe7aAZE5HBOR03cIrfBuqIrtno0xw== 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=7VKraCcVoUYaT+fHlG6gWjNXoLGAu0jQ978z4qyCPlM=; b=GlwtVmoDi8BiF7vyn+qKhUfK89YONKmjMPYmkB/fA+aDJQwaV7ObWKWNDNYWLvGt9x8fiT3oPEc04wo0BNpEL0XQFwEb0IPC6cDt2Qe9Z0k1PFa6FIfZ164TesQ5QPVZ8fyx2hVaS0Xh13PDyairIhKxSNDEtk60bcEB2p5BqKsfuohmlA4x2Ur2BD9yDEegTRP2cTVJVfG5VbpBkfC9ZhMMsFjIY7Fj2AUHJ370RqACEsMhWV3iC6L2tyipnghzGOj+Ybdx6NLrqjDp8TgYvSVJxj0YEvUkU1mPPeSuCb66vzv0f7+cFxDKxjZdauqB7Kz5m08Zrd7ivBBgh3vgxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7VKraCcVoUYaT+fHlG6gWjNXoLGAu0jQ978z4qyCPlM=; b=KAIjC07dRcEgO6VqSNqN3dh1HUad0CyQqJjsWpViKfTsVSZgv5+wL83PLOaEOt6XELd4DvbtmRa804kUNYBhsrBvQQ3BAqIQZbwz7d5ULKtvj+QMzJiMKJzcOAizRBmC01BeaqDhDP1d9IveB5pE97sMuRHj0MGSnRhqwVwRKju+l30T7ZSE/buYyz13mznfQHktalxhC8v6yVr7J7+5x1J6ni7/moVU5eLtSr7CiTIjYguF4blMmxcdEqGEkvnAEZpOA63jNspKHBnDAns4PXw9IPU+MR7iUnLKqPdqukCMAlOPlz9N+SdM0SNaPQS0Avu4HBkP1LPlRaxsz7VyyQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:40:59 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:40:59 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 03/10] ufs: host: Add common Hibern8 TX FSM polling helper Date: Wed, 26 Aug 2026 15:40:41 +0200 Message-ID: <20260826134048.854748-4-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0386.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f7::14) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: 02e619bf-7320-4159-6bd6-08df0377a987 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: +VhtmK4DRyC+E7O1kHkRhGUf+FhMqMkJPu+0Ue5BacFZGuIjApR2yMMJ/RkczDl3aaYtpsX011wr4gfCUgX0OaGcLG22A3iswVVuG9nClrYKxNz0wl8pJj1tPfVfQHprmF/cRBbylScsA6nqTRVq2aPPaGDugnpR6+lNTBKrPNKEQN86Z26dp77RnQgB2NHRLxgfQw2I+GfSfcvNVnGot0SBoR4k/K10uilW71pz06/IDSAOxESJWLm1as/iUXrpcIV9U2jS16coPjTq1+FfUDvxBzDDgQQ419GiJKJEDvCeN/HqCv7ROBw5qBcJ3R3gfxiMmpJVfQhYMy4SxhW5m/eo7Hczq3Z8wo9pnLEkeJea/emPeL6cHVfhdr38BSkcWvi40DaOp0a+GSbdp3gIjkSYHVQYQ6IRu750TBLIMGeXq6Gbb+mK9HAo6Xz82C590ygL3s19WWWUSgsPfWbvnljbCQHFwAAXdxATmRrnKL6a27mOwX1CySqgnrNrnuVqMPbC1plNxwBWxtoTg6F0MEIHAl+9j9iMLS1UR57z3kPAaXQT0aTwGjOKJz60AOLlF+hkYvDjaiu9CppJp5ohMF95W/qt9sbJXy7EvgiTdxPH7TxbuOTIXl/8acBgNW56ADwvIjp5d3sbwKrl7xU4v5q+0aC8OYmvEG9SJl/c6ElOSVnD33YC8TFeVDk596b0MjE7iVSag2yJ6GriUyhx2Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a1RaanJHWDFuUXk3bENkTGxmTk5IRTYzMWZBdWZmQVdVb200YVVqTCtxMkRD?= =?utf-8?B?V2xPMWRrTVVFamF3RFFOY0M4dmFoTkUxZEhjM3NMdnZUY0NueEovaWVNZ25D?= =?utf-8?B?eG9YUW5yRUhPcG1TUEZ4cExXWGszNVIzTExIbDVQUFlkQ2Mya1VjSDM2TUxl?= =?utf-8?B?RXFGN3R5NnpGbnBDUTh6MjdEcUdYeWdiMW1nREJqSDY2WURkVFJtUDZhZ2tF?= =?utf-8?B?ek8vR2xCRHQyZjByUTZuVjRXaWFFODFweHZJaUR2V0FFRVlvd3lBSUZkNFFO?= =?utf-8?B?MUNjWFRFUWQwSzFsOERIOUxxVUwzM0dlZ1pudWVMWHRNUzVPblJkcXhVSksz?= =?utf-8?B?Y25NeUxuY0tXei9JWno2Q0hBY3JZZURDL0pGcGtzSXpVWW1VSDFRUkU2ZHpj?= =?utf-8?B?WlZUb1p3U25VbWJHZEpBcVVab3ZKcS9TYW43TWVwKzV0S0lCNExUZ2d1dDN3?= =?utf-8?B?Ym5TNWl3cGFoNnRyYit1RmhQMG4vRWQ1cnVNRGV4c3l4QUpuZ3ZRdUQ5NDlC?= =?utf-8?B?a1E2VGRGNmUrbVp6UU1ISDh0MFFYMG5HY1VxbmYwTi9aNHl1NENIejhPaTMz?= =?utf-8?B?N1VIRjM2SWdZZGNmYXpwZWxwU3N5SklCOEZ0UDRaZW1LZm0rT2x2WHFCN1g3?= =?utf-8?B?SXFIalIyQkRlOUtLZG1DQ1BkTGV3MHh3ai95aURSVTFJRjgvazZLS1JnV0l2?= =?utf-8?B?ekxZN0JnL0hDaDBTbk5BTE1WS3ZuYlFBTTdoalRHRFNOanZBbXRGKy9HZDl0?= =?utf-8?B?OUNMM1djYUx2alZhVHpzMFNsTEs0Yy9HSllRdzJFYkFUN1pENHZsUHFnZzVy?= =?utf-8?B?QjByZTNKYmJDVFM0bnBsYU1DTHU3MUFhRWVNTHNvakNnTDJWRHExRlQxMWg0?= =?utf-8?B?SUlhYkxRRDkrT0dSOTN3TFN0MTEwVHQvM1JOYll3azk4bmVNc3ZYb0hhNXBw?= =?utf-8?B?ckFLKys0OUJXOTZqZVprejNRdkFBSGZSK2dWeGxTZk5PelgwdFQ4UWNhaEZn?= =?utf-8?B?NFpLVGM1WmNrV2dqU3VVbWtneGNzUDRuNm1GaHJ1U05LY3hNQldVb0I5bGI3?= =?utf-8?B?b0xmYlBkVEE1VytYR1F3eDVqVzBadGJndGZZcG5GYjBuRE1jZ2svSHB3eTMv?= =?utf-8?B?aUFKZ1hxQU9VRlM4bjRxRjgvOWVML2d0dFFVY3JuVThHaXdMQU1EVElWem1v?= =?utf-8?B?a1praVNMdGUwTFpCRUl5eDhwY0xSSGxKMlFScFVxemw3ajg5S2I5aWt0bTN0?= =?utf-8?B?aUZpdHVVZHNkZ3J5c3JOMk1qMThjdm9NdTNzNEZjMjVrRVFZdHgzRGRnZklq?= =?utf-8?B?RW5NNDB0NXU3UEhGTkRTdGE0akVhdkNYZzFIZHorUlFsMlJIVEtyWDRveVAr?= =?utf-8?B?ZWZXUnVxUVhadlNETkxtNGJ3a0RVL2xGQW1XNVVwWmNaSFd6THRqN1NUb1Ix?= =?utf-8?B?RWZ6QWN0Wlo3bVZFenk0ckxOaGFzdEpsU1NPNDhKY1RaM3ZkYWtPRkFzaWUx?= =?utf-8?B?UmVwbitCbFM2YUcrVDZzbEdqZUZXSjBqa2wrc09PdHc1cy9mT2NHVDUxRTZw?= =?utf-8?B?bjZwNFVpajFMV3FpZzEwSERSN2ZKc3BEbGlaZ1R6Z3BESmFvcUlHdUwxUlY0?= =?utf-8?B?ME1hUU85dDdnRGJLSGd1KzJ4U1lGUUtKSHZKbm5NaHgzSSt5RGEvQm5BQVlv?= =?utf-8?B?MDMvZER6VXpSOEJ5RHpZZWk2SklVTmEyYVV0VExiNlg2UGRYd3V0Tmg2QVA3?= =?utf-8?B?N0JTMHFMV2dGNjJPOWMvZzlMcERINFB2b2Q2TDZDRDhJUjhjSVBkdzZ2cGhv?= =?utf-8?B?WE1xVnltU2hhNkFVNktzRjV6bGdnYWVvVzNiSFJaYUhORkJ3Q1p4c2JyYzNr?= =?utf-8?B?SmhoWFlsWmNlRUloL1BaaGlNSVlKSjVSeWpxRTlSV0xwTzdtRWFyaHJBM3RI?= =?utf-8?B?aGsxYkZkN0NPY0R5Q0p4VjZNanpoWWxIWEl0R2lGVDdZTkN2a29Md3R4TU5M?= =?utf-8?B?NG1ONWpPQzhid3ByZmtIaUE5dWMza2ZiWXhuM0lpam5vT2NVTjlONXlBMSs2?= =?utf-8?B?K1pLdEVieHRVNXNmazdGbmRJQTZva0tVOFRFdWZIR0VBS3JuQU12NkRHQm5p?= =?utf-8?B?NUtJN0tRSnM3UTlUOWxKYnhhWDJKM2gyNy9ESHdkSjZxMTFCZWY3RzlLeDV2?= =?utf-8?B?S2xVYkV6UWpaR1pEM1hLY3UvNzhuTFplRGpvQS8vK0NVUU5GQStJZWZoYWpE?= =?utf-8?B?OGRHRWE4a1BVMEtWMWZpczlVY3FYb0Z3bWpGQWN6N2k1OFIxdHpmU21pclIr?= =?utf-8?B?RHoxc2RMUzZ0SGdtYVAzUTZmTFUzMWRwdGlNWTRYN3pXRGVXeGxCOHJuWWYw?= =?utf-8?Q?hAWSnzcFuClU8u/U=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02e619bf-7320-4159-6bd6-08df0377a987 X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:40:59.0938 (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: +/KGw6XO4fT1IeluJBT7KuvCasjDMQOcPZFQLxm+7MvPYtfVQKOElTzYDnhtcqkjtpOCiTITFBbC+exdb6yiMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" Factor out the common logic used to poll TX_FSM_STATE until the TX lanes enter Hibern8 into ufshcd_check_hibern8(). The HiSilicon and Qualcomm drivers currently implement similar checks using the UniPro TX_FSM_STATE attribute after link/PHY bring-up. Move this logic to a common helper in ufshcd-pltfrm so it can be shared across host controller drivers. Switch the HiSilicon and Qualcomm drivers to use the new helper and drop their local implementations. This also prepares for reusing the same UniPro-specific Hibern8 check in a subsequent commit. Signed-off-by: Larisa Grigore Reviewed-by: Frank Li --- drivers/ufs/host/ufs-hisi.c | 48 +------------------ drivers/ufs/host/ufs-qcom.c | 42 +---------------- drivers/ufs/host/ufshcd-pltfrm.c | 79 ++++++++++++++++++++++++++++++++ drivers/ufs/host/ufshcd-pltfrm.h | 2 + 4 files changed, 84 insertions(+), 87 deletions(-) diff --git a/drivers/ufs/host/ufs-hisi.c b/drivers/ufs/host/ufs-hisi.c index bd223bda1ce2..76d77bc30322 100644 --- a/drivers/ufs/host/ufs-hisi.c +++ b/drivers/ufs/host/ufs-hisi.c @@ -22,50 +22,6 @@ #include #include =20 -static int ufs_hisi_check_hibern8(struct ufs_hba *hba) -{ - int err =3D 0; - u32 tx_fsm_val_0 =3D 0; - u32 tx_fsm_val_1 =3D 0; - unsigned long timeout =3D jiffies + msecs_to_jiffies(HBRN8_POLL_TOUT_MS); - - do { - err =3D ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(TX_FSM_STATE, 0), - &tx_fsm_val_0); - err |=3D ufshcd_dme_get(hba, - UIC_ARG_MIB_SEL(TX_FSM_STATE, 1), &tx_fsm_val_1); - if (err || (tx_fsm_val_0 =3D=3D TX_STATE_HIBERN8 && - tx_fsm_val_1 =3D=3D TX_STATE_HIBERN8)) - break; - - /* sleep for max. 200us */ - usleep_range(100, 200); - } while (time_before(jiffies, timeout)); - - /* - * we might have scheduled out for long during polling so - * check the state again. - */ - if (time_after(jiffies, timeout)) { - err =3D ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(TX_FSM_STATE, 0), - &tx_fsm_val_0); - err |=3D ufshcd_dme_get(hba, - UIC_ARG_MIB_SEL(TX_FSM_STATE, 1), &tx_fsm_val_1); - } - - if (err) { - dev_err(hba->dev, "%s: unable to get TX_FSM_STATE, err %d\n", - __func__, err); - } else if (tx_fsm_val_0 !=3D TX_STATE_HIBERN8 || - tx_fsm_val_1 !=3D TX_STATE_HIBERN8) { - err =3D -1; - dev_err(hba->dev, "%s: invalid TX_FSM_STATE, lane0 =3D %d, lane1 =3D %d\= n", - __func__, tx_fsm_val_0, tx_fsm_val_1); - } - - return err; -} - static void ufs_hisi_clk_init(struct ufs_hba *hba) { struct ufs_hisi_host *host =3D ufshcd_get_variant(hba); @@ -224,9 +180,9 @@ static int ufs_hisi_link_startup_pre_change(struct ufs_= hba *hba) =20 /* Unipro VS_mphy_disable */ ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xD0C1, 0x0), 0x0); - err =3D ufs_hisi_check_hibern8(hba); + err =3D ufshcd_check_hibern8(hba, 2, HBRN8_POLL_TOUT_MS); if (err) - dev_err(hba->dev, "ufs_hisi_check_hibern8 error\n"); + dev_err(hba->dev, "hibern8 TX FSM check failed\n"); =20 if (!(host->caps & UFS_HISI_CAP_PHY10nm)) ufshcd_writel(hba, UFS_HCLKDIV_NORMAL_VALUE, UFS_REG_HCLKDIV); diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index b2081ed6197a..c94488661bcf 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -382,46 +382,6 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_hos= t *host) return 0; } =20 -static int ufs_qcom_check_hibern8(struct ufs_hba *hba) -{ - int err; - u32 tx_fsm_val; - unsigned long timeout =3D jiffies + msecs_to_jiffies(HBRN8_POLL_TOUT_MS); - - do { - err =3D ufshcd_dme_get(hba, - UIC_ARG_MIB_SEL(TX_FSM_STATE, - UIC_ARG_MPHY_TX_GEN_SEL_INDEX(0)), - &tx_fsm_val); - if (err || tx_fsm_val =3D=3D TX_STATE_HIBERN8) - break; - - /* sleep for max. 200us */ - usleep_range(100, 200); - } while (time_before(jiffies, timeout)); - - /* - * we might have scheduled out for long during polling so - * check the state again. - */ - if (time_after(jiffies, timeout)) - err =3D ufshcd_dme_get(hba, - UIC_ARG_MIB_SEL(TX_FSM_STATE, - UIC_ARG_MPHY_TX_GEN_SEL_INDEX(0)), - &tx_fsm_val); - - if (err) { - dev_err(hba->dev, "%s: unable to get TX_FSM_STATE, err %d\n", - __func__, err); - } else if (tx_fsm_val !=3D TX_STATE_HIBERN8) { - err =3D tx_fsm_val; - dev_err(hba->dev, "%s: invalid TX_FSM_STATE =3D %d\n", - __func__, err); - } - - return err; -} - static void ufs_qcom_select_unipro_mode(struct ufs_qcom_host *host) { ufshcd_rmwl(host->hba, QUNIPRO_SEL, QUNIPRO_SEL, REG_UFS_CFG1); @@ -607,7 +567,7 @@ static int ufs_qcom_hce_enable_notify(struct ufs_hba *h= ba, break; case POST_CHANGE: /* check if UFS PHY moved from DISABLED to HIBERN8 */ - err =3D ufs_qcom_check_hibern8(hba); + err =3D ufshcd_check_hibern8(hba, 1, HBRN8_POLL_TOUT_MS); ufs_qcom_enable_hw_clk_gating(hba); ufs_qcom_ice_enable(host); ufs_qcom_config_ice_allocator(host); diff --git a/drivers/ufs/host/ufshcd-pltfrm.c b/drivers/ufs/host/ufshcd-plt= frm.c index c2dafb583cf5..034ee988924a 100644 --- a/drivers/ufs/host/ufshcd-pltfrm.c +++ b/drivers/ufs/host/ufshcd-pltfrm.c @@ -9,6 +9,7 @@ */ =20 #include +#include #include #include #include @@ -563,6 +564,84 @@ void ufshcd_pltfrm_remove(struct platform_device *pdev) } EXPORT_SYMBOL_GPL(ufshcd_pltfrm_remove); =20 +/** + * ufshcd_check_hibern8 - Check if all TX lanes entered Hibern8 state + * @hba: host controller instance + * @num_lanes: number of TX lanes to check + * @timeout_ms: timeout in milliseconds for all lanes + * + * Return: 0 on success, negative errno on failure. + */ +int ufshcd_check_hibern8(struct ufs_hba *hba, unsigned int num_lanes, + unsigned int timeout_ms) +{ + unsigned long timeout; + u32 tx_fsm_val =3D 0; + unsigned int i; + bool success; + int err; + + if (!num_lanes) + return -EINVAL; + + timeout =3D jiffies + msecs_to_jiffies(timeout_ms); + + do { + success =3D true; + + for (i =3D 0; i < num_lanes; i++) { + err =3D ufshcd_dme_get(hba, + UIC_ARG_MIB_SEL(TX_FSM_STATE, + UIC_ARG_MPHY_TX_GEN_SEL_INDEX(i)), + &tx_fsm_val); + if (err) { + dev_err(hba->dev, + "%s: unable to get TX_FSM_STATE for lane %u, err %d\n", + __func__, i, err); + return err; + } + + if (tx_fsm_val !=3D TX_STATE_HIBERN8) { + success =3D false; + break; + } + } + + if (success) + return 0; + + /* sleep for max. 200us */ + usleep_range(100, 200); + } while (time_before(jiffies, timeout)); + + /* + * We might have been scheduled out for long during polling, so do + * one final check before reporting timeout. + */ + for (i =3D 0; i < num_lanes; i++) { + err =3D ufshcd_dme_get(hba, + UIC_ARG_MIB_SEL(TX_FSM_STATE, + UIC_ARG_MPHY_TX_GEN_SEL_INDEX(i)), + &tx_fsm_val); + if (err) { + dev_err(hba->dev, + "%s: unable to get TX_FSM_STATE for lane %u, err %d\n", + __func__, i, err); + return err; + } + + if (tx_fsm_val !=3D TX_STATE_HIBERN8) { + dev_err(hba->dev, + "%s: timeout waiting for lane %u to enter HIBERN8, TX_FSM_STATE=3D%u\= n", + __func__, i, tx_fsm_val); + return -ETIMEDOUT; + } + } + + return 0; +} +EXPORT_SYMBOL_GPL(ufshcd_check_hibern8); + MODULE_AUTHOR("Santosh Yaragnavi "); MODULE_AUTHOR("Vinayak Holikatti "); MODULE_DESCRIPTION("UFS host controller Platform bus based glue driver"); diff --git a/drivers/ufs/host/ufshcd-pltfrm.h b/drivers/ufs/host/ufshcd-plt= frm.h index 0a18a8aed94d..ec2a8013e975 100644 --- a/drivers/ufs/host/ufshcd-pltfrm.h +++ b/drivers/ufs/host/ufshcd-pltfrm.h @@ -35,5 +35,7 @@ int ufshcd_pltfrm_init(struct platform_device *pdev, void ufshcd_pltfrm_remove(struct platform_device *pdev); int ufshcd_populate_vreg(struct device *dev, const char *name, struct ufs_vreg **out_vreg, bool skip_current); +int ufshcd_check_hibern8(struct ufs_hba *hba, unsigned int num_lanes, + unsigned int timeout_ms); =20 #endif /* UFSHCD_PLTFRM_H_ */ --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBA6D429CCF; Wed, 26 Aug 2026 13:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751671; cv=fail; b=uK3RAENMmr7CEdhV3K6LqcFFElFjYxPN94dh5qe6Moh8gd8auG2VZ2ZEFKFbj0jHQNPY5NZIJulSf8NsTWAZKManzCicuWPCsf3hfJq8yOrrl78HrCBkvf5uQO82+oiu8Q+No5plYrJklaGq7RMV2RYgJTvFQ1azmNJcWlSJ9fo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751671; c=relaxed/simple; bh=gQWD81BQoeXMlL6Lx71QBg3lzsBIhbbdXGNpgLdK/Ko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=W496zQ2BtyPSVMreDaj+no+1vCcteAVe4f24V35pEBu0h1oAw8Q47C9sjGmen69/rnh4y/Lotr5Fak7IxMhZyXk0CCOo/isI3FoEXX1GX/zZZ50K5mvBNP3FSjCznJu1Uaz4KImAmTL15kTgT6Ki/wCPl+DKbope+ovD4KOs/Hg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=eTf04US5; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="eTf04US5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vC4jfE30o1McBqsFoPpkK76sPWywSP/O1WjwIcABxAGrW0iR9rDwNtXRMVDDIO/VtvBUIYrYjUtrQuQRGm9ogYNRrs+ijK3nZAeWEje3M5jAUoEWBxnv5A3JcR40sMxn6lSUdFqMMSG5W4JrlPC+n7GCCnZRSJLg+69+Ut6lEXG/WLT4QhMbLJ3sBb//ifvTwzJOViGhyYZCrDsybJLDzA+WlemJJRBAfArI0CTKYewE95J7YCw7Wr0ALP4oUUsKkO/oF3BLJ8dU4AXqD8BhK0JeyTZ+qwlyz2YDAl243AiXQPdu4xDTYHdjrn4yVqK4k56Qo8ImxbIh6MK0PbDZig== 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=Xuhyx1ZC9EBGBVIFUGXyxYYzQ0dPcVgYj+dh9qz5y+A=; b=ggrSu81NbZBqUm9QctmkGVZi27fs3BEl4MLYTZRUX3k/mqp3w5/dkbCNUdoqCDaonZW9FeD1IYJP0W7+mwFFkDFIIg8i/l71ZX42kGq+YizTTM3JssBTX+sRU3MuYDBBwQ3inljNSSZM1Ckxe+3BaZvvuY4eBnKg5hwRzvB2A7OWTbAhKjEmkGj6LQR2H88mmUqHYNrGxu9UD683i8W5CeCzp6URmiWZ9F079+ojcy2y1WIOFFfRivdFHxzpxfcMPWWL0o4QDLNCp5VBaKSXZ0qdv4ckssxeS/9GU2ZmgkUCH2eL+8j1LezX3PVrlbHbJpnCexZ8qVSubWY3wYNHiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Xuhyx1ZC9EBGBVIFUGXyxYYzQ0dPcVgYj+dh9qz5y+A=; b=eTf04US5/cYfKURfcfeUQGYlZZkU1VsX7Wp/2Uqi/7xFDl0XVPWUUtPGBrXA9wzUri+rhv+WbKg5inkKk0xE1ihA4fTd/c7K6pbVYgRbjFbu2kGX38LO+BjZtLAQQPAmUW7BDdO/ADj2OtItqOk3V7x60gv4cuXXRWMQuJ164UKRMZ/HWx566jqVoEaTSCU670KgUm/IUhN+aG9kyTRUyIbNo+rqJS3/IfbCYQQQMqBoDk9wTzGlHlhf5v3gg0c+YBWkudLf4sEeYImNoky6HysuZMZT7CcmJqQgQxEa0AWmmabvYVnIgx5byGn43HDLsDfBZW69lvzDWTvgwpG/IA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:41:01 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:41:00 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 04/10] scsi: ufs: Move Versal2 M-PHY CREG access helpers into ufshcd-dwc Date: Wed, 26 Aug 2026 15:40:42 +0200 Message-ID: <20260826134048.854748-5-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0379.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f7::11) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: 20d73036-9d48-4652-d65a-08df0377aa9a X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|10067099003|56012099006|3023799007|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: lD0X0O3L1d2FKIcCi0vFmB1w8uRBWcBStsPgWjG9xWjujRZ2Us0Jj7W7jImBCeDFJl9jzbvlmpw0roL+PKx1YOTxw1rDdMQx0lKyB6ZvX9f7+Z+L0XGVlPllCiAjKQARKuxwjyj2dwcbZS3N6Y20VXsxIkjPRLs6aXixF0hdgBJi4v8m0wb4vz8dkaZBn6e83FcSyqI+OBIhWVnGbvW2VoYd5T8WlvNA28wzEd4REStIgZWt2auf4pdQJuLInmixQuhQyG6HqugwvfH0WbIWa2u0m1DaiKd5bMvGnH3YlxIeOZGKH8iQtB8oiYcJ/a0zguzM4xMLnv3/JZ/jCOx7D20Xzf+KO0aO/kMO9e9NDEwOyxXu/YaVQgJKZ+ah05kHA7D51pl8O4DiY1ikBEjhmuFviIR6I3vishniPb+Rfh9tOnCc8aW2+LTVqI3C35nGduyREzXNZXnSKrqQ5W7XsMy6WpqLFarjO46GMHjKlGXnlvS+zXNd1SrBfbaUVofD+ZF1Wp8fIO+5TGDjN37QSilhAYfIcvBT3hHhtdG6w+I40EoMR/ORcHFZGf88dmvAWQTBq0LwYI4x58leScMu4Eakg++E1lihbgCarAIpXaWtGPPHq3wtfyvCLEhIw5DvdS7Ju6lt6Tb3stLgHQngDXPotXuE6AVmM7enuN86YD8QCsepOm7hC2qhEsea1GgoNTJhZOq8nQ5aESb7HrNk6Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(10067099003)(56012099006)(3023799007)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZmFKelZvUDAyM2tDTnQvcjVwTU1GcUdYbHRSWHYwQm1hSEFOdWtOWGp6U0lq?= =?utf-8?B?UjNHbW9HRE9RYjdiZFgzeS9PSm9VbXFlV1p1VHhRSkdwRWNaODY0b3lramd3?= =?utf-8?B?Vk8rQWpDVjE5MDJTUlh4QkhRY1ErSnAyNFV6SU90dkN1Ukx2dUtPS0s0QjRr?= =?utf-8?B?bHpPdVRycVdsUnNQVlJWWjd2S3lEY2ZKWjhZNHQ2L2Npc3J2U3kvbzB5YlFy?= =?utf-8?B?b1RrZjN4ZDVCVG94SmFRNndtR3cydjVEYWZUL3VrRC9oZkNRdGY0b2VFdXhC?= =?utf-8?B?TFlKVlFqTk1xTGtCQXBvOW1TQXhxeHFNZGdkdXRCc3Q5ZHcwbmRRTzZlTG50?= =?utf-8?B?elZkempuWjg0eWIvdG1BOGJaRkkrZ09aQVNyVmsxSm5sb0dQMzUyVkdVa3hL?= =?utf-8?B?emJTZ0tvU3g0OWVUanNxVE5kNjBtTzliZXMzWFBESjFWeTlUMHE4U3dNVkd1?= =?utf-8?B?QXJML1E4azhZbGdhTXNucW1zM29BdFpVQ1Q4Mk52L2YrUCswREphcVJySUFr?= =?utf-8?B?YVBhV2JSUUxwSDFWSlowUDVqTEdUcm5QcDVYdjlRVE9WdGd1ZTE4a1VRR0lN?= =?utf-8?B?UE9ITlNlN0VPUDc3N3RSNE1iN2ZER2hWdEZyVEtrQ2d4Zkl2SmMvdFdtaGor?= =?utf-8?B?QWRaQjExOHdzKzd5Ym9xVWE4ejdGUXVmd2pqaFNySW9uVWMzOFFzTTV2R29h?= =?utf-8?B?SU1YeXpPVktPeVJNa2NSakpSd1UyNzFwWnR0UEpTRnNqTllWUWRGM1REeUpJ?= =?utf-8?B?Mmd3NWhLYXV5Nk1hRU45NStiMVQ5ZXQ2S3Q1ajJ6M2NIOTg0S1RZK0x3SnJX?= =?utf-8?B?UWhSVUFOUmxpNEF5Ymx3bkJDYzkrL3ZWd2diWlg4S0lVTko2dlF1NkJHTzdq?= =?utf-8?B?SzBmYkV1Ly9lL1U2Z1RRUXFYMFkzSE1MMERZeVdtMjdkSWpWa2toeGw4TVgr?= =?utf-8?B?Ui9BTTA0dzNFVE1nVVdObUwyZXNFQkF0Y01qVU1leU5zRXdjQmh6ZXpQSURD?= =?utf-8?B?R1NmT2ZtS3BsLzdBQ3hBcnFzQmU2WGlZa1hTSHBXNzBkd2R0emlkSmpaWjAz?= =?utf-8?B?eENXWlpmVkNOUkZqSG9oUlpua3dSOFpGTEF4aVFjNk9OMFBWYTNqSVhMMHJ3?= =?utf-8?B?SmlJWVVaNGVTK1JVenRieEZRazU2T3d2RWJ3dEp6ZlIvQUozMlVJNzlHNXow?= =?utf-8?B?YXlBSHpuOUlTTlJUdGY3UGZKYjlXaEtHSjFVMzhNcTRwYm04T0xQV2RPOUU0?= =?utf-8?B?b2FZR0gvRkJYa2lnSkVyK0JvSXA0QnJlWjd0ZXRiZnpIZDZMU21zUXNhZDM0?= =?utf-8?B?SDR1N01JS203b1lsL2ExQitybzlJVTk0Vy9QNll1VnpjTlJtcmsrbmRsK0hN?= =?utf-8?B?QzlsOHlpRTMreXNHZGRhZll5Umo4SCtaekpIYUpqNzdzNk1OVmNyU2JvaklC?= =?utf-8?B?NUFNcXd1aFVneko3ZUJyQmVzcjJPSkZ0UjV1WjVHRVZldjhPTkhIaWx6T0tt?= =?utf-8?B?SENHd1FaTHhBL0pWQnB5bmR4Zkl1MzVSeFYvYUNRQWxlQXVuS2ZyNGUzWCsw?= =?utf-8?B?M3I3ZDRaYS93THZSUWh3NTlpbHd4dXhoNm1UVGF3cHRsckRaOW1xaTJheG1k?= =?utf-8?B?OXVPQllObXAwVUk4eWxpMGg2K1R5ZW9zeXdXWDJieGpSQjRFZzVNcUUydkYz?= =?utf-8?B?T09sUkMrVFlES1N3Si8vS1JhVXY2c2tXSjJnWHJLT2VMMndPQjFlMFJ3RVMr?= =?utf-8?B?eDZoNWRKMkN5UGVxN29DYVhWamdHeDArbGdJbFRKQ0k5Vi9xVUhBZGxIUElM?= =?utf-8?B?VCtnRjhIOStQanhOUDhmOGFGdW5SOGthVG5HeWltcGdWWStXZHBXRUd4REZW?= =?utf-8?B?K2I1eFZhZkJCa2tnZnhac0dDSEpNUUtDTWRJdVhXSitTbVErMDRTT1RpREQz?= =?utf-8?B?QXFwVXhZd0dyUUtyQ1MyZ1dLT2RUb2tsTzYwbUdoZUNjRmJPMVU3bDNYT0E4?= =?utf-8?B?ZGQ0OCtKWXVzTEIvVlM0QTNIazRsU0dndzh0Yy8ydTBpa3pjWlVmekF4S2VN?= =?utf-8?B?TkthWjV3bUFNUHRGWmFybkhLNjJoSThDNVBieGtuZGVWNk5vUXR6Uy9qV2V0?= =?utf-8?B?RW1KZllNM2MxcDRCdzhQV2R4QTVVWGF5R216QUl2UnhISDlNMWdNWjJLTlZO?= =?utf-8?B?bFdweXNWNmtWbmZOQlNKZWVtK3puYXdQdzUzUkpLUXRBVEcwVnhqWXBScmdH?= =?utf-8?B?WWc3dmZzaDF6TDZieW92Z0JRUlBOSTdTZkFJNkVibFJtOUVmd2xXTmUxQkVy?= =?utf-8?B?RWtWdEFiWDFleTdndGFPTElyT0p4dzY1bEk1MGJEVmxzckI0T05YcjhsalQ2?= =?utf-8?Q?VtUvg0JiUgzU20ko=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20d73036-9d48-4652-d65a-08df0377aa9a X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:41:00.9125 (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: XTczOed6LGZV17uAsNdyC2QkwGG0CodjJB3v8JH8ylPnoorJtuIx0biA/wvFyfvEJKJtcfJ6aiOyZ19Iuaqi7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" The AMD Versal Gen 2 UFS platform driver carries local helpers to access M-PHY control registers through the UniPro CREG interface. Move these helpers into the common Synopsys DWC layer as ufshcd_dwc_phy_reg_read() and ufshcd_dwc_phy_reg_write(). This avoids code duplication in DWC-based glue drivers and provides a single implementation for future reuse. Dropped `static` from `phy_write_attrs` and `phy_read_attrs` since there is no benefit in keeping them persistent. Update the AMD Versal2 glue driver to use the new ufshcd-dwc helpers. Signed-off-by: Larisa Grigore Reviewed-by: Frank Li --- drivers/ufs/host/ufs-amd-versal2.c | 85 ++++++------------------------ drivers/ufs/host/ufshcd-dwc.c | 77 +++++++++++++++++++++++++++ drivers/ufs/host/ufshcd-dwc.h | 2 + 3 files changed, 96 insertions(+), 68 deletions(-) diff --git a/drivers/ufs/host/ufs-amd-versal2.c b/drivers/ufs/host/ufs-amd-= versal2.c index 0d4d5e98ad65..c7da95999c85 100644 --- a/drivers/ufs/host/ufs-amd-versal2.c +++ b/drivers/ufs/host/ufs-amd-versal2.c @@ -43,57 +43,6 @@ struct ufs_versal2_host { u8 ctlecompval1; }; =20 -static int ufs_versal2_phy_reg_write(struct ufs_hba *hba, u32 addr, u32 va= l) -{ - static struct ufshcd_dme_attr_val phy_write_attrs[] =3D { - { UIC_ARG_MIB(CBCREGADDRLSB), 0, DME_LOCAL }, - { UIC_ARG_MIB(CBCREGADDRMSB), 0, DME_LOCAL }, - { UIC_ARG_MIB(CBCREGWRLSB), 0, DME_LOCAL }, - { UIC_ARG_MIB(CBCREGWRMSB), 0, DME_LOCAL }, - { UIC_ARG_MIB(CBCREGRDWRSEL), 1, DME_LOCAL }, - { UIC_ARG_MIB(VS_MPHYCFGUPDT), 1, DME_LOCAL } - }; - - phy_write_attrs[0].mib_val =3D (u8)addr; - phy_write_attrs[1].mib_val =3D (u8)(addr >> 8); - phy_write_attrs[2].mib_val =3D (u8)val; - phy_write_attrs[3].mib_val =3D (u8)(val >> 8); - - return ufshcd_dwc_dme_set_attrs(hba, phy_write_attrs, ARRAY_SIZE(phy_writ= e_attrs)); -} - -static int ufs_versal2_phy_reg_read(struct ufs_hba *hba, u32 addr, u32 *va= l) -{ - u32 mib_val; - int ret; - static struct ufshcd_dme_attr_val phy_read_attrs[] =3D { - { UIC_ARG_MIB(CBCREGADDRLSB), 0, DME_LOCAL }, - { UIC_ARG_MIB(CBCREGADDRMSB), 0, DME_LOCAL }, - { UIC_ARG_MIB(CBCREGRDWRSEL), 0, DME_LOCAL }, - { UIC_ARG_MIB(VS_MPHYCFGUPDT), 1, DME_LOCAL } - }; - - phy_read_attrs[0].mib_val =3D (u8)addr; - phy_read_attrs[1].mib_val =3D (u8)(addr >> 8); - - ret =3D ufshcd_dwc_dme_set_attrs(hba, phy_read_attrs, ARRAY_SIZE(phy_read= _attrs)); - if (ret) - return ret; - - ret =3D ufshcd_dme_get(hba, UIC_ARG_MIB(CBCREGRDLSB), &mib_val); - if (ret) - return ret; - - *val =3D mib_val; - ret =3D ufshcd_dme_get(hba, UIC_ARG_MIB(CBCREGRDMSB), &mib_val); - if (ret) - return ret; - - *val |=3D (mib_val << 8); - - return 0; -} - static int ufs_versal2_enable_phy(struct ufs_hba *hba) { u32 offset, reg; @@ -162,64 +111,64 @@ static int ufs_versal2_setup_phy(struct ufs_hba *hba) u32 reg; =20 /* Bypass RX-AFE offset calibrations (ATT/CTLE) */ - ret =3D ufs_versal2_phy_reg_read(hba, FAST_FLAGS(0), ®); + ret =3D ufshcd_dwc_phy_reg_read(hba, FAST_FLAGS(0), ®); if (ret) return ret; =20 reg |=3D MPHY_FAST_RX_AFE_CAL; - ret =3D ufs_versal2_phy_reg_write(hba, FAST_FLAGS(0), reg); + ret =3D ufshcd_dwc_phy_reg_write(hba, FAST_FLAGS(0), reg); if (ret) return ret; =20 - ret =3D ufs_versal2_phy_reg_read(hba, FAST_FLAGS(1), ®); + ret =3D ufshcd_dwc_phy_reg_read(hba, FAST_FLAGS(1), ®); if (ret) return ret; =20 reg |=3D MPHY_FAST_RX_AFE_CAL; - ret =3D ufs_versal2_phy_reg_write(hba, FAST_FLAGS(1), reg); + ret =3D ufshcd_dwc_phy_reg_write(hba, FAST_FLAGS(1), reg); if (ret) return ret; =20 /* Program ATT and CTLE compensation values */ if (host->attcompval0) { - ret =3D ufs_versal2_phy_reg_write(hba, RX_AFE_ATT_IDAC(0), host->attcomp= val0); + ret =3D ufshcd_dwc_phy_reg_write(hba, RX_AFE_ATT_IDAC(0), host->attcompv= al0); if (ret) return ret; } =20 if (host->attcompval1) { - ret =3D ufs_versal2_phy_reg_write(hba, RX_AFE_ATT_IDAC(1), host->attcomp= val1); + ret =3D ufshcd_dwc_phy_reg_write(hba, RX_AFE_ATT_IDAC(1), host->attcompv= al1); if (ret) return ret; } =20 if (host->ctlecompval0) { - ret =3D ufs_versal2_phy_reg_write(hba, RX_AFE_CTLE_IDAC(0), host->ctleco= mpval0); + ret =3D ufshcd_dwc_phy_reg_write(hba, RX_AFE_CTLE_IDAC(0), host->ctlecom= pval0); if (ret) return ret; } =20 if (host->ctlecompval1) { - ret =3D ufs_versal2_phy_reg_write(hba, RX_AFE_CTLE_IDAC(1), host->ctleco= mpval1); + ret =3D ufshcd_dwc_phy_reg_write(hba, RX_AFE_CTLE_IDAC(1), host->ctlecom= pval1); if (ret) return ret; } =20 - ret =3D ufs_versal2_phy_reg_read(hba, FW_CALIB_CCFG(0), ®); + ret =3D ufshcd_dwc_phy_reg_read(hba, FW_CALIB_CCFG(0), ®); if (ret) return ret; =20 reg |=3D MPHY_FW_CALIB_CFG_VAL; - ret =3D ufs_versal2_phy_reg_write(hba, FW_CALIB_CCFG(0), reg); + ret =3D ufshcd_dwc_phy_reg_write(hba, FW_CALIB_CCFG(0), reg); if (ret) return ret; =20 - ret =3D ufs_versal2_phy_reg_read(hba, FW_CALIB_CCFG(1), ®); + ret =3D ufshcd_dwc_phy_reg_read(hba, FW_CALIB_CCFG(1), ®); if (ret) return ret; =20 reg |=3D MPHY_FW_CALIB_CFG_VAL; - return ufs_versal2_phy_reg_write(hba, FW_CALIB_CCFG(1), reg); + return ufshcd_dwc_phy_reg_write(hba, FW_CALIB_CCFG(1), reg); } =20 static int ufs_versal2_phy_init(struct ufs_hba *hba) @@ -406,7 +355,7 @@ static int ufs_versal2_phy_ratesel(struct ufs_hba *hba,= u32 activelanes, u32 rx_ =20 for (lane =3D 0; lane < activelanes; lane++) { time_left =3D TIMEOUT_MICROSEC; - ret =3D ufs_versal2_phy_reg_read(hba, RX_OVRD_IN_1(lane), ®); + ret =3D ufshcd_dwc_phy_reg_read(hba, RX_OVRD_IN_1(lane), ®); if (ret) return ret; =20 @@ -416,12 +365,12 @@ static int ufs_versal2_phy_ratesel(struct ufs_hba *hb= a, u32 activelanes, u32 rx_ else reg &=3D ~MPHY_RX_OVRD_VAL; =20 - ret =3D ufs_versal2_phy_reg_write(hba, RX_OVRD_IN_1(lane), reg); + ret =3D ufshcd_dwc_phy_reg_write(hba, RX_OVRD_IN_1(lane), reg); if (ret) return ret; =20 do { - ret =3D ufs_versal2_phy_reg_read(hba, RX_PCS_OUT(lane), ®); + ret =3D ufshcd_dwc_phy_reg_read(hba, RX_PCS_OUT(lane), ®); if (ret) return ret; =20 @@ -483,12 +432,12 @@ static int ufs_versal2_pwr_change_notify(struct ufs_h= ba *hba, enum ufs_notify_ch =20 /* Remove rx_req override */ for (lane =3D 0; lane < dev_req_params->lane_tx; lane++) { - ret =3D ufs_versal2_phy_reg_read(hba, RX_OVRD_IN_1(lane), ®); + ret =3D ufshcd_dwc_phy_reg_read(hba, RX_OVRD_IN_1(lane), ®); if (ret) return ret; =20 reg &=3D ~MPHY_RX_OVRD_EN; - ret =3D ufs_versal2_phy_reg_write(hba, RX_OVRD_IN_1(lane), reg); + ret =3D ufshcd_dwc_phy_reg_write(hba, RX_OVRD_IN_1(lane), reg); if (ret) return ret; } diff --git a/drivers/ufs/host/ufshcd-dwc.c b/drivers/ufs/host/ufshcd-dwc.c index 21b1cf912dcc..45920793d1a8 100644 --- a/drivers/ufs/host/ufshcd-dwc.c +++ b/drivers/ufs/host/ufshcd-dwc.c @@ -141,6 +141,83 @@ int ufshcd_dwc_link_startup_notify(struct ufs_hba *hba, } EXPORT_SYMBOL(ufshcd_dwc_link_startup_notify); =20 +/** + * ufshcd_dwc_phy_reg_write - Write a DWC M-PHY CREG register + * @hba: private structure pointer + * @addr: M-PHY CREG register address + * @val: value to write + * + * Write a 16-bit M-PHY CREG register through the Synopsys DesignWare + * UniPro indirect register access interface. + * + * Return: 0 on success, non-zero value on failure. + */ +int ufshcd_dwc_phy_reg_write(struct ufs_hba *hba, u32 addr, u32 val) +{ + struct ufshcd_dme_attr_val phy_write_attrs[] =3D { + { UIC_ARG_MIB(CBCREGADDRLSB), 0, DME_LOCAL }, + { UIC_ARG_MIB(CBCREGADDRMSB), 0, DME_LOCAL }, + { UIC_ARG_MIB(CBCREGWRLSB), 0, DME_LOCAL }, + { UIC_ARG_MIB(CBCREGWRMSB), 0, DME_LOCAL }, + { UIC_ARG_MIB(CBCREGRDWRSEL), 1, DME_LOCAL }, + { UIC_ARG_MIB(VS_MPHYCFGUPDT), 1, DME_LOCAL } + }; + + phy_write_attrs[0].mib_val =3D (u8)addr; + phy_write_attrs[1].mib_val =3D (u8)(addr >> 8); + phy_write_attrs[2].mib_val =3D (u8)val; + phy_write_attrs[3].mib_val =3D (u8)(val >> 8); + + return ufshcd_dwc_dme_set_attrs(hba, phy_write_attrs, + ARRAY_SIZE(phy_write_attrs)); +} +EXPORT_SYMBOL(ufshcd_dwc_phy_reg_write); + +/** + * ufshcd_dwc_phy_reg_read - Read a DWC M-PHY CREG register + * @hba: private structure pointer + * @addr: M-PHY CREG register address + * @val: pointer where the read value is stored + * + * Read a 16-bit M-PHY CREG register through the Synopsys DesignWare + * UniPro indirect register access interface. + * + * Return: 0 on success, non-zero value on failure. + */ +int ufshcd_dwc_phy_reg_read(struct ufs_hba *hba, u32 addr, u32 *val) +{ + struct ufshcd_dme_attr_val phy_read_attrs[] =3D { + { UIC_ARG_MIB(CBCREGADDRLSB), 0, DME_LOCAL }, + { UIC_ARG_MIB(CBCREGADDRMSB), 0, DME_LOCAL }, + { UIC_ARG_MIB(CBCREGRDWRSEL), 0, DME_LOCAL }, + { UIC_ARG_MIB(VS_MPHYCFGUPDT), 1, DME_LOCAL } + }; + u32 mib_val; + int ret; + + phy_read_attrs[0].mib_val =3D (u8)addr; + phy_read_attrs[1].mib_val =3D (u8)(addr >> 8); + + ret =3D ufshcd_dwc_dme_set_attrs(hba, phy_read_attrs, + ARRAY_SIZE(phy_read_attrs)); + if (ret) + return ret; + + ret =3D ufshcd_dme_get(hba, UIC_ARG_MIB(CBCREGRDLSB), &mib_val); + if (ret) + return ret; + + *val =3D mib_val; + ret =3D ufshcd_dme_get(hba, UIC_ARG_MIB(CBCREGRDMSB), &mib_val); + if (ret) + return ret; + + *val |=3D (mib_val << 8); + + return 0; +} +EXPORT_SYMBOL(ufshcd_dwc_phy_reg_read); + MODULE_AUTHOR("Joao Pinto "); MODULE_DESCRIPTION("UFS Host driver for Synopsys Designware Core"); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/ufs/host/ufshcd-dwc.h b/drivers/ufs/host/ufshcd-dwc.h index 0406f2bb576b..d8673cd54d4c 100644 --- a/drivers/ufs/host/ufshcd-dwc.h +++ b/drivers/ufs/host/ufshcd-dwc.h @@ -45,4 +45,6 @@ int ufshcd_dwc_link_startup_notify(struct ufs_hba *hba, enum ufs_notify_change_status status); int ufshcd_dwc_dme_set_attrs(struct ufs_hba *hba, const struct ufshcd_dme_attr_val *v, int n); +int ufshcd_dwc_phy_reg_write(struct ufs_hba *hba, u32 addr, u32 val); +int ufshcd_dwc_phy_reg_read(struct ufs_hba *hba, u32 addr, u32 *val); #endif /* End of Header */ --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6631429035; Wed, 26 Aug 2026 13:41:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751674; cv=fail; b=FYF1DBdft8RVDCXwNYBw0R0JkCzjAFISXsL7U7lK9VIUFLmTYuzlmQcyPmGJt0ig2I6kJARQ8ipvgiIV9dHe8JumORHw8eaMtP62OnAt3fTwVKJxqEQg3aYXf59ujfcNZrmGvPhCLBwete5TMR7EAcoLJKJzgHgVm3EUz/5WKBo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751674; c=relaxed/simple; bh=IKR6tPzCusO1x2STI9zP+1swPcQBEdOG7/4X0RadfeA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=s1yeNcBr1spYMfSEb0PN2vWcUix1vKebD2ZDv7NmZb9p1qRPPSZgSQGXkqmRw6PdzKg6oLaJzqYjj8BDb7rX7xauMfvq/6IjmQlledcNw3mjHorvlaHuG1uEBWSGrUSXKLdZfJnO/uf5dXg+1IMZrgPxFhFZ5VHraHs52hoX+vI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=keag9uzJ; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="keag9uzJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aV3jQxT9u4SC/V1pj562Lsvhk0v9sGN36vjaFUNa+OIZdaMpdWjMgv5gml0d+hD1wabUFVzR8S7mEJsQ9zUGHSl+norqtC7Nc9krsrfT4J0TOJTjXfKEy1Iv2mL39+S+jF/jVxbdCKXydM522ZtY2ElO/iAczLvYqp7Z/hrFSaEYY9OliG92xauw8WnH5uhKXapf1yydFQDPf8Bcwr4dADkTHrNhKTFNbkn2TGpSqV8audc4e7EKIIVJL9YeJ5XBtVNxvb1SKSoh0w4JRx7QgkUzz62S3wRxk+LcJ7FVJOGjhwRLTiAS2LXhit7rBSepHOc+8YnJjVMjkFLR9kpVmQ== 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=Z7Q6p45GrG60DJDvQAPYQHbAvXhG+Xh3LO3l71PjPjc=; b=R9oAfJOlgdEjbMHSL8KKeLM7wCF1tjY5EkBmsyVWeD98X0upOX1xd10ZEdMr6AwcechrHDs+KfndwbZ8GBjTDozJFuq8qQWxM22rEZWM+cSGreqBxq66QQ8uFfBe1KtulzbR4veMO8ONC8ITJ0ohwjD54ru0Lynzz4g1bUN0uVvR2pkpT/aNS5zivEAHfz45JQyvUhdzGVnJkCvputE62Eh2QfWObOfpQ5DeC7md//S/sJ85IoobR04hnXPnTWvHKPvYQHs5r6AS9aUxn0B61CJqleO7FGjiwTdiSfV6h8/tqO8y/0PrNQpwJGhPLswEr5dv4tNQb1DOYK8LxBVKaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z7Q6p45GrG60DJDvQAPYQHbAvXhG+Xh3LO3l71PjPjc=; b=keag9uzJXpc8tIwNE6vbs6A7zSIF55W3q+79El8RXlu8pEwss4qUZDmUZ6SRsxh2ksPCAdtaQ2kPzkQMEbyZY+vdSh82+XEM2yUEWR6hAnNhi7SGUGYEQ2WFlBhkh2UVKU0V6pvo2nsiYGZ3o5ja6KMbxvJumMMFW3TZ6DQpnNny/7Q0eKKfA0rT4xrPI78NOVNAkeDfAvkRAAN14/+gcaLxui8ukzrfjATqyU9qCmqK/vDhIUS+iPivFx5nozycprhvdVDsJ2cfNT8NnulaOvYpd/v3/2U7TwzrVjdez9LnYps55h9brrOnRrtbV+4WobhMHaXi5OvQT65W7L6dfw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:41:03 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:41:03 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 05/10] scsi: ufs: dwc: Export common clock divider and link status helpers Date: Wed, 26 Aug 2026 15:40:43 +0200 Message-ID: <20260826134048.854748-6-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0378.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f7::16) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: 04568087-a577-40e2-a0d5-08df0377abbf X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: pGJCA9R7Db1tU4gGZPh7m/lV2KxO3duBvASy2XOrwR3oPlb1tqSoq+ilsMhFfk42fPSd4I10xk/AC5z3V1KlUh6xi6a+xvOEehIjmHUt6KpOmTiKFeG2D9wFHpHnl2r5DG1GVmN9WlL2ctAE07FNfkKlM19K7ABn4MkuBCUheS4aMYwCoEeTtyLiJOrXW209A0Yx/HzlHJxmpiHIeJmTuD1ZNHTlLcfdqphPaySKfFWVKvkB+piaTfK21w05N06ORmOqBzMgS3hHfeC7l0aVBdAGe0DR4frVwoDH8V0GXSp2dMJuE+d7lVtR8KGOi+FBmJslMyOImoxkoFaUIejY6BUaJ6h708gH8iQxwkoBbyTT2sb7CORzSRTGgjvvlDNchOrlqls7EzqWciFOdKq9t9bDOFb2gGh/NklVCESibzWZ7/FVON5izV/eqUh6SuCk0Sk4Y5dEiB/wddc652UTb+U2V4unC88nZcDGP786aOep+b+whIdXh1zIbOvlj4QFq6KKdOy97gyjWDvHTSjTOojIQqqN4qgmMY7WsPK3gdLEdPf9RNCMMHaGSKSiSBb94tgPmLjxaMgXkc4C80c8KPgzm7df4d0iODwXe3S9Kfq1FDy8QP6ZQJJbokNDgKA9hwwg84BszfNpRZhx2I3c83HtFMhKgEtV/t8D9UPECCeYz41Z9ht8S2PRQUwbo5+eIYVs8OHwKF7+FQmsjDWVrw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SWdEb3UrNEMzbENiYzRTNFBnaWJzcEZQWi9sN0hBVnN2QjBmbitBdDUwZFFv?= =?utf-8?B?V1loWVJCdHZDRmI0b3hWeTM4MFVURXMyZ3VubERLS3hVR3JpOU04OHh4MkFI?= =?utf-8?B?U2pERDFOOWo2KzNhc0ZSS2prMVM2QzAzWGJWYU5lelpVdTkxMVhUMVZ4QVVR?= =?utf-8?B?MzlDTjdSV1RYY3MrSjNGa2JnVldqc3FkU01DUFRyVDNyTERFNjJlTDZKR1ox?= =?utf-8?B?Unp0U3pmUmk3Q3p2Z29CTGV3azhWYlRlZEp5TTNwVkNrTHFCS1d0YjRkaDFY?= =?utf-8?B?L2NsV3daTXNFU0l5alkrTjZEWmVmcjB6WUFNRkphakpLcFBiZmNqWTVYTjVC?= =?utf-8?B?VnlwTEFTZTBoeG9BODhyeE8zRGU3dXRNYjRSYktYNXpnL2tGMHNRdlNrT0Vs?= =?utf-8?B?U0pVd1JWaldFcHJTR3lvT2dQTzZBdUFMUktFUmZibllwd1Q1MGlLY25LMUhH?= =?utf-8?B?dExjdVN2dW1PaU9Bb29ZUGg3a1VvSzBRT1dJQTVqa3FQaExFaTZkMEFBRDJM?= =?utf-8?B?VWxmZWZTMVVwdEt3WXdOR0dqaWYzUEVDbXlmb3ErRUFlc3E1elhWQUkyZVNm?= =?utf-8?B?S2Q4MjR5RXB2UmNYRTFidjVwZ2Y2U093L09ydlV6d0ZJLzJtWkZ2aGJMVzY3?= =?utf-8?B?TldVZFhNaS9ocTJXbGRDNE1oRFUya2V6dDZGdlp3L2JwS09Ja1VXMlFLVDRi?= =?utf-8?B?SGNGbURpWVFYV2dGaUw4OTJ5NW9PbFYrNUVra2k5QzdZaE1nWUJsMkdoQjVn?= =?utf-8?B?a0RkdnZKVWVHMVRRVWppYjVwVUk0T2hOV0h4RUFTS3MvNGJWWmhSMjRyckRj?= =?utf-8?B?MHhuL29HWXQ3MXJzNVJFVkRkUnJ1a0xBNVlCbStQaHdRclIvYnFSb1pvV2VC?= =?utf-8?B?MU1MTTJtVEJGUzBVT0RodGVmdjEreFBnQXUxd2F0Q1gxK3p0aGZtKzJyL3Vh?= =?utf-8?B?cTNJUXlnRUw0R1pIbUNNM0lEWDJyUnA3Z1d3UmEwSTBCcjhPcDZwejR3Y1hC?= =?utf-8?B?Y2pleGszTjBJN0RNaGVyN1Y4VTduSXI5SE50QlR6elVWTkJ2SzZKbFUzWWhr?= =?utf-8?B?TDZ5RC9wdnlQOTVMamdDZFRTMk1JbWtPWjFJdnhtYTgvQkR1TFhYOXVZWjVR?= =?utf-8?B?cmxMR09mU21PNlh1UTAzTVZMSlBmcDJ3RUtvcmxBZzZWcFRIcjNDTzU5bDhh?= =?utf-8?B?TGZsSVF2N0VVUHVHUnMyU1JvUmV5SWlraHJLOGg0SVplbXFwRmQ0emRzYVpS?= =?utf-8?B?NVNNOXdqOWEwUDJXMnAxS2xKN3dRb2s1MGltdS9xc0ttQmdIODhjNDk2OWdN?= =?utf-8?B?OGQ4YTAvVkFtSVZ0MmZtTUZ1NjlWaDM4UzkvclFaWEI0cC9wQ1JPNmc3eThP?= =?utf-8?B?K0p1N0crV0JhMTlZSDRNaG53UElRNTd2RG5VU0oxOUZFRXdIYlBEQzRFQWkw?= =?utf-8?B?K2Vna29rY2FjNnZibkE3cWJ0Zm01YWpINnhlZVA2aHpjVGNlUDNkQ0RoeVBD?= =?utf-8?B?SEROQzBMYityREwvM2U3blc2MTRBS3Q2bmJaYUFhUm1OSGhVRVdRUnNHUjFQ?= =?utf-8?B?RzRnWm5zTVdLeU9Vb1BOdGk4OE5mdjAvN0NXQVJpeGdKZVYxNk5wMGNFSldN?= =?utf-8?B?YnU2cWNiWU1NVDIzd0lrTnBjLzdDQjFvK3N3M280ZTBYRVhLRkJTZk5mL2Nk?= =?utf-8?B?VFByYWE4Zy9xc3FJRUl1R0hQRXliMUVIVnhFWmFzV3lxWWNweDhMdFZvSkFG?= =?utf-8?B?RUFyS29ZSVRFZTJMNCtTWEVBNDY4RzloQk51bnR0eDVud1h5OGNxeEtoQnRn?= =?utf-8?B?ODFBZ0ZaMFhIenN1b0dNV0xGM2x0eGpEWEx3VDk3eFdtQ1Z3UEI2M0dTWnJJ?= =?utf-8?B?TjdIMlBsSEdHQjg0ejArSnpPNWhCdk44b1JZaElwNGFnTjN4ZWJiY0ZhZEg2?= =?utf-8?B?U2J3MHZQOGNhcVNxanQzbS9JUldrRFBPc3FQY2lSZTdhaFVmOVgydWVvVkNX?= =?utf-8?B?aFVBV0JRTW9vYmpDSTM5SStnR1BPM3l6WENFcVltczBJMXMvWk5WNlREWkk2?= =?utf-8?B?bm5sMzhnR255Y3BLUlF0RkpwNFQ2QUZReFVaK25oL3VDT0VuMTFYZlhFRGhH?= =?utf-8?B?ZU1PMVd6aWJXNWNxUlFMeW1jemg2S2FEbFphQVpFcFFsd0dPU1o0dTRvdnhN?= =?utf-8?B?WmgwUEZyWWhPUHZNb0Q4ZGY3RENWR3lLMmZ2KzlTL0NaREwvVUhQUjR2dDl3?= =?utf-8?B?MWxxOVpOMzFsTTNqMXd4MXhmcmZkYzZyenZ4dW9wcVJpOG9IMm9VMnR0OUhr?= =?utf-8?B?N0U2Q3lOayticGo4TWJUQnA1WHBVbEtHOEtCSWsyYVc0YWJYb2lqQ094ZnJS?= =?utf-8?Q?tV3W4KaA1cTu1x7o=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04568087-a577-40e2-a0d5-08df0377abbf X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:41:02.8156 (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: 7NK50t9mAnGsAqhsh5mMrObjrWvkeaYcyZTXVrBkb8HVh99QuEnnThR5AFDrS4o6ftP3G4f458ck3NRndShz5g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" Make ufshcd_dwc_program_clk_div() and ufshcd_dwc_link_is_up() available to DWC-based platform glue drivers. These helpers are needed by platform drivers that must program the controller HCLK divider and verify link state during their vendor-specific initialization flows. Signed-off-by: Larisa Grigore Reviewed-by: Frank Li --- drivers/ufs/host/ufshcd-dwc.c | 6 ++++-- drivers/ufs/host/ufshcd-dwc.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/ufs/host/ufshcd-dwc.c b/drivers/ufs/host/ufshcd-dwc.c index 45920793d1a8..4a689d211e81 100644 --- a/drivers/ufs/host/ufshcd-dwc.c +++ b/drivers/ufs/host/ufshcd-dwc.c @@ -39,10 +39,11 @@ EXPORT_SYMBOL(ufshcd_dwc_dme_set_attrs); * @divider_val: clock divider value to be programmed * */ -static void ufshcd_dwc_program_clk_div(struct ufs_hba *hba, u32 divider_va= l) +void ufshcd_dwc_program_clk_div(struct ufs_hba *hba, u32 divider_val) { ufshcd_writel(hba, divider_val, DWC_UFS_REG_HCLKDIV); } +EXPORT_SYMBOL(ufshcd_dwc_program_clk_div); =20 /** * ufshcd_dwc_link_is_up() - check if link is up. @@ -50,7 +51,7 @@ static void ufshcd_dwc_program_clk_div(struct ufs_hba *hb= a, u32 divider_val) * * Return: 0 on success, non-zero value on failure. */ -static int ufshcd_dwc_link_is_up(struct ufs_hba *hba) +int ufshcd_dwc_link_is_up(struct ufs_hba *hba) { int dme_result =3D 0; =20 @@ -63,6 +64,7 @@ static int ufshcd_dwc_link_is_up(struct ufs_hba *hba) =20 return 1; } +EXPORT_SYMBOL(ufshcd_dwc_link_is_up); =20 /** * ufshcd_dwc_connection_setup() - configure unipro attributes. diff --git a/drivers/ufs/host/ufshcd-dwc.h b/drivers/ufs/host/ufshcd-dwc.h index d8673cd54d4c..53b523ef59df 100644 --- a/drivers/ufs/host/ufshcd-dwc.h +++ b/drivers/ufs/host/ufshcd-dwc.h @@ -47,4 +47,6 @@ int ufshcd_dwc_dme_set_attrs(struct ufs_hba *hba, const struct ufshcd_dme_attr_val *v, int n); int ufshcd_dwc_phy_reg_write(struct ufs_hba *hba, u32 addr, u32 val); int ufshcd_dwc_phy_reg_read(struct ufs_hba *hba, u32 addr, u32 *val); +int ufshcd_dwc_link_is_up(struct ufs_hba *hba); +void ufshcd_dwc_program_clk_div(struct ufs_hba *hba, u32 divider_val); #endif /* End of Header */ --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 940FC42CB00; Wed, 26 Aug 2026 13:41:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751677; cv=fail; b=jxX4osBn0Vse4HABRHCvo43cX7TfJoesHtfx9VdTivtUdpmziJOGTnJdtLACKJFtW4MTaUuxsHftZ8Z6Fowyu3CDzPefuiOu/tvj3uxUOH9sWonkNMEoO4XFLRJq+qZRJuUryR4FwBOLWC+ePZWperbkB9B7WAKX203ko47RKu4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751677; c=relaxed/simple; bh=tiNz2aI36ELcUI0uTiD60S68tRH9Ub6RwzeohRppRI8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=bitrt3i9iMMhgqIqp5iRz80dVKGg4K1ZoXzNAe4pI9eoBj4zZGhi4qfaHbPG134JrHYEE8VD64CRN7epWonGDJ0aV/E7EJqwMQ65myiuIkJAlRGEH+afpd9Q8K1d1YC5ddVFoFHnUiEt/mlyuQvaKUuZ/YWopmu7nvUwriEOL3I= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=xN5iHdKL; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="xN5iHdKL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=njbTAa2CzzsbIA5hTWRdQMLYWr2ik6Ko7ZH8xbJ1tm5KXyOfc/BAs5KfGY2e5Z9GQ1OiEdz0ON4Y0eoHL0QPvaxrAHFyKqVJJfHj3uHh3qkf/0UjiYab5Oyew3XU+0dmEKftpJPrqj36XR61r/tguK6PuZI/UO8tpOLMLVhOhfNnS7+WrE6+6N5biiaQaNxDi+mf0kQrQFkioUuXyZAWtWywuakw8PZJpVIP/NsOwPk79kBiZ7mTtE1wqdBwTTb4GpwLmR6x1eJJHM4wuuCxqFyVWq/taKyyB8BhQNDr/3qSjtDQSN6/xbOV3KY5UXzEOsy7uzma+PPA79tgNjrcxA== 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=KikhIJ71LRulU+X7zUMP+uZ4gpDSLuQefUfh66heziM=; b=CnBYxJPiKCBDvEFlMGCYGnp2mhTX8nWs5udwDTrpRxaFpalJx+8UoAmEYWGflKXciU3XVvXRLP/DUaPDxM77YI4L18h9kxE5vV3HP+G8XfNPgJAjx0duKeKEHg7w3xLilYLWNAC3zJUoO/dlWI966HI+K8HlMng+An/iN0m5NwGbiiNhAy9pH9X0GxN/XoNaiXtoUwb/nRuEQUOuYeqkHtoMOZLnI46Ytn/s7nF36w523kjvFkTXlV3HZCd7mdIfUdeStL/0WV43BjnJ0NwLSYCeps+eZ/ycMG0RspWNPUkIksUxkWZVODwvxkHlyc1ObqvX2LYNkhF/kPp7PA9k+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KikhIJ71LRulU+X7zUMP+uZ4gpDSLuQefUfh66heziM=; b=xN5iHdKL4P5BA1GTZZuOC1AQHZBOqmQ7QPb0Hh9iyGIgg4NW50eiLflFaPevsUp/cOfExOkLqXfsyGSaKQ8lp2sHaaQjIY19n+ThgaPHCTp2y5k2+uSn/sK5poNRsAqnsEMU/zH76dbaxm39yGzJXgYZEkgyKHPz/9rXhP7FjRDde197lh1Y47TvaisdrKvAvVV8mmmQqLnm0/MQTBHnlxFS5HJ9lhuZREw8A6C/M1xeOAqARN/kVSgX7GxK7ZoDmopuP8cmqbBZj4H+aweQe4Zeut0mlOqSbOwJvVKUO7fYHVcdkfS3vNhUn6/jCJfqQVaWpZUNgH8p38EafK3PCw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:41:04 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:41:04 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 06/10] dt-bindings: ufs: Add compatibles for S32N79 Host Controller platform driver Date: Wed, 26 Aug 2026 15:40:44 +0200 Message-ID: <20260826134048.854748-7-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0424.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d1::17) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a6fd16f-361a-47e6-2d75-08df0377ace0 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|6133799003|10067099003|56012099006|3023799007|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: Oo4s9hYZMKgh3LOwxl/7YtfvJMj9pazlWkNmw9hsFGHARt8DBNOdmST71BenF2lUssPJWuNvREX9//t2V47/q5YLPb5DP44gbhfJ9rOrAFS2PgEaSY2t6f568k2THmHqCAR/OOtuEG5AkYta0DRd0XRJ4t3Q7P8GcmFXFF+MVzELsG994ksXii1atFP73zz9Ge3SxaWF3dXuZPwepNOyB5Bp5ApuNPOtHhGPsbyPQJ8zgoKjr+yArDi9M01TDpSSXgU5S+26JIJVjiAKJ3GTMz0P7WbIlxNsSwzVkrrvogX7A81wfa6poyOhQxj3eEW4ZtHXxN9dJQt0Jas7CZZ14q/4CCNkZHV6snh6gBPloERIFARiLQ60n0gvYfuyrdvPJWLhtVvYsGuT0XIhu0sQnSgJAVLtn2MQ+Bx0+DgmuTMcRxKGVtayLI4xyY1Dm7qPd+1Foe6P9IIjHWcg29dvRudVgAvRczoK/pPzGDzEJvD2GG8qjKYYcCXm20vtUiHMMBhE3RA1gSkng1KS/XaPu9v1Q3uELfBGTZfcLcvn2nGKY6l3A42JD/CoX4+zKH50Hst36fFhH2G3Ue+wPM/FaiZDxwBmK7sQsWbXFBhV9ZO7wXHFNCsikE0CA5FunfCTH7liFzbMyeDh3mKx5zmOkdQ/eFD+5hk1HwzBWdn6b+w= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(6133799003)(10067099003)(56012099006)(3023799007)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U0ZtUjMrUkkvUHY1SmNHNnRFbm83bUU0Zk9ycGtsWkRQMDZyWUdpek5jd3lp?= =?utf-8?B?TExaVGZBRmFlT3hBTXdpL0VXTTdlK0dGbXB1aVdBUEV2dWMyN0Qva3YySkxn?= =?utf-8?B?MEpYOWVxdmJCN1ZDRUNaOUFjKy9Vb0xudHlXL3RGK3VVQ05VSlo2MkJHam9y?= =?utf-8?B?UDh1QkRFSlNzbTVZekNCSkFody9EVnNXQkxpNVRkK3FPN2ozandpS3BUdDNq?= =?utf-8?B?Y0diYTMwMXRhSlZibmJQZUxscFh4UE5kRUE2RktFNmZJMWhaWEhjTUNleS9q?= =?utf-8?B?Y25lWnZLYUNndkQ2dnpzNXp1K1h5RzJ6aGZlb2pqQldJWkNoMy9tQmxLcmdn?= =?utf-8?B?bkxNaURmTUptUzNZOXNobG03aG9PUWEyN21pZ2FWSXdHVDlxQjRWZlh2VWVF?= =?utf-8?B?dzk5ZTBvRGp5U0tmK3Z2UkhmTEUrZ2xFOEJuUnRmbDNvSERSblN5MG90UUxW?= =?utf-8?B?bkJwM0k3NUgyaTcxNXJaNTQxUFhOM3JvUlBDNjFSTkhqUGxNQWM4UVZjWHIv?= =?utf-8?B?cGwzRFYzNUw5V3pueGxlcHVTM01keVBYTlNOWEJNNGdpdkNrZ2c2RGYxYXNY?= =?utf-8?B?Z1d5S0ovUnFPeUcyRWZPRXdXNHAydTVPNlRIbkU5Q1JoK0tXSnpGK25iaEVG?= =?utf-8?B?MThpR2ZaSVdVTjJyazhZakwwVHErT2FlVDMzK0QxQWtqSHUxQ2xIWGhqMFhy?= =?utf-8?B?cWFBQmptMnRZMTYzVnZLeEI3eFVwbWJrVUVuMktXOWVlOTVGRXZnaDh4bk15?= =?utf-8?B?c3d3Y21XZkdiR2lmQXkvZERqdkpzSHlIdk93ZGhuMElXcnl4MnJ5OExpMUFo?= =?utf-8?B?d1RtLzM4b3g2cUt5dFUycnhDeWF4MGlJQk8zWEhLcVlWcjVMNFhBQlh0K1lR?= =?utf-8?B?OVJYYXY4S3FpV0hxOE94eWFZRk9kQldwc2EwT05Rek1tUVVhYTRiSVdPeTM3?= =?utf-8?B?T1J5Yk9HdjljMHhSK082MU1SeTYrK3BYaU5yRGEwRGtwL0p5bnJ0bllvMHdG?= =?utf-8?B?OEN4R0xzVE1VN3VOZVFZb1JhT2hCSURwM1ByMmt6MkFsSWMwa0QveVJqZkh2?= =?utf-8?B?dGduN1dmcjZRMkU2dDBMT2p6OTlUNDg2Y2kyNmIrUmp5ekQ5a0o5TjU4ejU5?= =?utf-8?B?azhvUG9lTThJKzZGMGRtcG5WQ0NNSmJXcWJnZjJtNWMxUHRFelBkV0ZUc1BH?= =?utf-8?B?NzJ0TTVBci9wYWVhZEowWG91THV3dFBXWGlFdkZtaFJ0QVNDVzdwS3NZcWtQ?= =?utf-8?B?U0Vxc3FBS3JIRnk3RWZ3b1BJNG04cDk5U3dNSndMd2ZhVkt4QndCQzhkNjVl?= =?utf-8?B?ajIrdDd6MzBOMHJPOHZHdk1sQTNNKzFoVXgzcEN2SFE4bjFNNGFwVW5VOUNT?= =?utf-8?B?T2pFcEJ5dE4rMGdwSlBZTUViWFdNMFpyRUFXODlOdHl0R0w2YllWcThiTGxQ?= =?utf-8?B?czYyT1BseWNmY3NZZldLTDA4T1ZOTHpxR0E0aU1JbE5pVi9pL21zMzJxbjVI?= =?utf-8?B?eGZWVVUvZlJ2aTdBSDF0djFhemM3ZUw2MG9NelIrWWNZNTBSNmhlTURPb3Fs?= =?utf-8?B?bGVheTJvVjBMU0NJNGxCTXh0L05BbFdhVU5HVTBZMk9qcHRQbXl6dW9SeExa?= =?utf-8?B?bC9nbkY2TysrNDlSWDhhZ0dLYWZyVkhQRk8ydEVudU9PbG45ZWZTSHdCWjVD?= =?utf-8?B?R3pyV1ZLbFQ3OTBidzJTNmdCSXcxd25xa0ozZW1kc3N6QldRNE41R1FuTlMw?= =?utf-8?B?UFFvR3U4SStuUkxuek15eVc0WEVXSzZvUVQ4ZUNYV25uWm5kVU91VGZVNWRF?= =?utf-8?B?dU1jaXkxSHhzb2Z5cTIrMUc1blVRWFBoa0FqR25yMXhjZ01sZllRL3JLL3pl?= =?utf-8?B?TStSVHowMkNMcmVUZFYwaXlCZmQ5T3I4M3N2WmtZY1J1YjF0RG5aY2VOV3Y5?= =?utf-8?B?N040alVVVndpQ29JeVNROCtxV1hEZmlWZTBZWlpCQkM1ZGJqK0hBMFpTM041?= =?utf-8?B?eEFIbm9zeWFnM1NXekE0UFU1RjZheGdTSG1od2tvYS9YRUNkL0dhbndiZEMy?= =?utf-8?B?TCttRFVUQlFyMVM1Rklidkk2eDJyQmlyOGQyRUdYM1Y4TmxtYjZhaWlxZmFE?= =?utf-8?B?UXhrN1Bwc1VlcFFqeW05WWxzQ1Z3bER1SC83UWVhRjc2SkNmdDJTeFVmU1NY?= =?utf-8?B?ekRJaVJjcHhETHk4akx2bFlsMDhGblVmZ3Z4NlVmUWVQZ2JFU3pTanlmd1I0?= =?utf-8?B?clRhUlZaQ09raEkvb0gwVlEvUzNUWlVUZFhSUHcrd1VlUXZVV0xXZDhKcVBj?= =?utf-8?B?ZUVaTURSVGsydVhWV0RPRHZtZk1WWTRPMFhDUEFmaG12Q0Q0MWVIYURjVkM2?= =?utf-8?Q?m8XXzjtBI83sq8Nk=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a6fd16f-361a-47e6-2d75-08df0377ace0 X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:41:04.6980 (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: uWbGj9sD1613qJa6XxcwE66TE+JR2gFEnqZJuM5cavWzn55NMWLLCiCpfSd8KtG+IxSaVT6U7S2Fwr7kOKhp4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" Document the device tree binding for the NXP S32N79 DWC-based UFS host controller which is compliant with JESD-223D "Universal Flash Storage Host Controller Interface" v3.0. The controller requires access to the SCM register block and the core clock rate when M-PHY initialization is performed. Add the optional nxp,mphy-boot-mode property to select the M-PHY firmware execution environment. Currently, the M-PHY firmware can only run from ROM. If the property is omitted, M-PHY initialization is assumed to be handled externally. Signed-off-by: Larisa Grigore --- .../bindings/ufs/nxp,s32n7-ufshc.yaml | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 Documentation/devicetree/bindings/ufs/nxp,s32n7-ufshc.y= aml diff --git a/Documentation/devicetree/bindings/ufs/nxp,s32n7-ufshc.yaml b/D= ocumentation/devicetree/bindings/ufs/nxp,s32n7-ufshc.yaml new file mode 100644 index 000000000000..d9d5669be313 --- /dev/null +++ b/Documentation/devicetree/bindings/ufs/nxp,s32n7-ufshc.yaml @@ -0,0 +1,99 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/ufs/nxp,s32n7-ufshc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP S32N79 Universal Flash Storage (UFS) Controller + +maintainers: + - Larisa Grigore + +# Select only our matches, not all jedec,ufs +select: + properties: + compatible: + contains: + const: nxp,s32n79-ufshc + required: + - compatible + +properties: + compatible: + items: + - const: nxp,s32n79-ufshc + - const: jedec,ufs-3.0 + + reg: + minItems: 1 + items: + - description: UFS Host Controller registers + - description: System Control Module registers + + reg-names: + description: | + Names for the register regions. The first entry must be "ufshc". + The second entry "scm" is mandatory only when nxp,mphy-boot-mode + property is present. + minItems: 1 + items: + - const: ufshc + - const: scm + + clocks: + maxItems: 1 + description: UFS core clock + + clock-names: + items: + - const: core_clk + + nxp,mphy-boot-mode: + description: | + MPHY initialization mode. Defines how the MPHY firmware should be + initialized and executed during UFS controller startup. + If this property is not specified, MPHY initialization will be skipp= ed. + $ref: /schemas/types.yaml#/definitions/string + enum: + - rom + +required: + - compatible + - reg + +allOf: + - $ref: ufs-common.yaml + - if: + required: + - nxp,mphy-boot-mode + then: + properties: + reg: + minItems: 2 + reg-names: + minItems: 2 + required: + - reg-names + - clocks + - clock-names + else: + properties: + reg: + maxItems: 1 + reg-names: + maxItems: 1 + +unevaluatedProperties: false + +examples: + - | + ufshc@4ac80000 { + compatible =3D "nxp,s32n79-ufshc", "jedec,ufs-3.0"; + reg =3D <0x4ac80000 0x1000>, <0x4ac40000 0x1000>; + reg-names =3D "ufshc", "scm"; + interrupt-parent =3D <&irqsteer_coss>; + interrupts =3D <211>; + clocks =3D <&sys_clk>; + clock-names =3D "core_clk"; + nxp,mphy-boot-mode =3D "rom"; + }; --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 085F9435537; Wed, 26 Aug 2026 13:41:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751682; cv=fail; b=MntcRyUkAWVQYCFhb9P+VaTPVc24gqEwiM26cLMDTI32yIBY9Hz4jBawpOMnTFLZT3CHUsBaR22v8+lkcIgovCFTLTSqCFgwGsKMORw2zUiQqEjSB/Hal5IS5Of2t/OWkubwQn/Rfo1l2hlyyNchjYPtkyai+zC0Oaj9kM6HBFw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751682; c=relaxed/simple; bh=SnH0QB5H8TiKNUVEwEWVGb5fKfv2fgAfLJR4nGbh6yA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Es6O9xv5l7bKN+4HKomVpL4rB2GCKH1ycKFMgeSt5N8P/wR8uc+C6DY5sbrCATyDW+gV66KpgsqY4cqghRDGVZOWm409qkkOWmOhCu+OQu24rUmRi+ZTDooS099vI8rssWv44FIxL7rbwAkGu0I7dmcQGJlxeY77EiF2F858ZQk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=beDh16TU; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="beDh16TU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xg1Th6rkvSKlLziuVfPnfdwNFY9XWovQBlhujk8R4T73AhS2fCBufwbsK8+AddTxC+aCdC1wN/7r1uUddpd8+yq/m6BBXusIogwh0Hy6+/Gpn0ec27Uoyamu+8zlLUugNxhW1EKXUrj5tns0w1aSMVRXtbxUtBGIG35mJYm9Nvw5m76Kcz3YkvQiG3SNY/zF93oP2/HlaHDa9HjEzlcB5gSiXVR6KcFWb55LcsBOqiOwErXsrV1yk4BTHeNJvqRZ6P+nh3aSzhMdd2Kun9Y4kW2gb7NmGJGt8iJncLOSwE/0yt5oC5ed3PqYYRu/JMM5KW2VpKeHdBc2gh6lZ2qFZw== 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=UAvOtGO6ZIr5gVmKyEZHuuBkbeiVFbXIs5EqZR4RwFc=; b=nGSN7azlwofbnXO24/qOqKYsgsuBDhITcXjnepran2owDKrXaTUAUqTesZtMqOY4HA63kUBPJu7RlO/UWhFqsdPPGaVibz1JoAq3RItFDJeq4eQIY5ncMxAjcoVjoD7YKWITuzOD72LgtKr5QB1CI65UKXB8CCmBLUK5dexLqHvTCou97d4CVTt5Qk7HzmuZykiHcDl1fIkim1Vfkx50ptOixCXrQ1AY/pw0xV2/mplUk3vASZCLGFDoVt7tRbizonzYusOEhiLuMoel2iNdcfbdwIVsN/y+ZLRtxZzFNmP98KUgizvEHId53MOVh//Xj+NfFYxXutHvodeW4Dvq1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UAvOtGO6ZIr5gVmKyEZHuuBkbeiVFbXIs5EqZR4RwFc=; b=beDh16TUx1hKkosc74Qi9NT+A1GD4x7NwfFc6U8dDcSTM+KCV3ZbA0DCPG1/YoUXfZJueqH5CnMjfor4wl6VP7RL8rERWPKu9scSbnsEae5E8NefmTXQW7mCekMcWwVoRJXBaiOK10dPUpNRvtAHSlELmm2r2XPzMrQ2dWqXWtBlDroT+qr7aAqf0Y3Qb0RE5bO89x49Qqw8z/ZOiFJU9iU7BDMcbNsJwMX6nofipj9tEonZdn59/qxyttnW08uzkV/EXe6oKCWcxjrS+cWzcXL+WmIa6+RCeE2vRMc/T/gXEy1wBxpOSGWtAsUhAO2UVeTIBo1YDcNjAla2fDsbGg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:41:06 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:41:06 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 07/10] scsi: ufs: Add NXP S32N79 UFS host controller driver Date: Wed, 26 Aug 2026 15:40:45 +0200 Message-ID: <20260826134048.854748-8-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0429.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d1::10) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: 785e1f6a-239d-4a14-ff1e-08df0377ae03 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: Y0Ua4iCWyU8J5aqlgaP+RVGHqHSZR+tmFJAg2XdUpd4G3EU4cQ+XgmyipHIQ9IYZ2kyB6eTXpz4OWrKnYoocNYxW8+PBN4RMQySsh0+xwGIMNfjoZ1u3bGYBj82wKFDK+Bvzg8V5r1HuGDJyQ+g2UpIKUiiUQ0eFY0QxpHoSSwQKft2G+7D4cFp0mqCoI4rxkUQCKmXWvexW8WxGHsRkv6RiQC3b/ORjGjzW7EIqffA+mCmLWZCwO0D0OEm8KYN4hoYnQzP8cUoVMcWEw4ilAsl2PaR9daJs3TqFG3nqxj/bAeVPkiG5eeR98dI40Scy16vUHQ7xHtRPhEcg6fbfY6X/Yv8fAio29XCoqQPmmuPvbsEeCy+VHdKYcpny6xAKHQOpe1aSPEk/u3xsNBqVDQre3/hT0n3ldEkJ2Opy7QQv29amrNLzbw2g4cz3a8OgfNTPeFvBgCyzNVV+LLC76CPRbYu1bkWcz6F+TpQ+byp/Y7Z05zYIf2CmR2mqOLbfoh7EFDMrmTMSm8/JUEwzpQBiFoHuk1SI3dh8EyGHkuJTf49RWHbO8I2QjFRsGnshE09pyfSOvtIMNEdvfla5rDw58J2dOhEf2sVfI1YTaos7hx/vHzPfymBpm2jvWnGL5dT6H2wJJKzughKYZO0+YCs8bolPYbx3ql/FuxnXPJqeOs+B3j3japV6mi63fsyHqIwPkmYInI5a/G0WWXG/Vw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Wk5KellaTDVqd0lnYjh2YmVxQTJoNWdobmc4T0E1WDdSQmJjQVJrNnRDeWNh?= =?utf-8?B?ZlRFeXZpWlpKczlWVVY0VFRuRTJiandEaFVuRkFDNXRpdjNRVnhRZmtBQ2RH?= =?utf-8?B?UG93blFYZmtMTzFBRGdqN0E2UFB6SS9HZ3NvN1YxTlBEWFpPOFBCRGx6Ynph?= =?utf-8?B?d1pVbCtVTnp3dmFJUG51aE80UktyQkZpNERWcm8zbUNvNk5JUTg3eDhwQ1Rv?= =?utf-8?B?eEhuaURnYXVyM2RhNExpMFFHZlE2NThSYysvdUZ1eHV4T2YxK1Z3aUF4MTYv?= =?utf-8?B?RnQwdVcwczl0NkpwbUlmMFZNdGdVL3YxUEZ3S0lmZUxvQ3YvZERUQWxsN1ow?= =?utf-8?B?TTJOZmNUN2tEZUIxb1lMaXRuZmgrNmV5c3JmRmsyUVIxRDRHZmZtMGhzZUJj?= =?utf-8?B?VTN0aUdYT0E2YUNEZWFPcWxoSmdjSS9wWUEvVmJHYmJ2M0RUQmRhbFpqRWdl?= =?utf-8?B?djNUSy9MSWlFL1JwRFRxV0ZOS09oWS91bGVoRGs3Unkyek5KTDRMZlN5THVV?= =?utf-8?B?RmxDWkVoR3U1ZkMyV3JKYU9XVlZHUmh6YXp6aVlOdnpjZVN3RUtraSsrSUFX?= =?utf-8?B?OEg2UzBuNGhqMDhncEV2SFFSNXFSclU3U1J6TWJ2Yzg1b1A0N0hPZzd3VzV2?= =?utf-8?B?NWJyclZwZ2JrZHFWYkdLaUtYSlZEVVVZRlhwN2RvSzJzM2wwblFPNXEzVHZz?= =?utf-8?B?MkN2Sk9vZG01ZFE2aDVmSVd3ZG5qWHg0cDd2d3hSaVNtWDJhZXB3NGtqVkVY?= =?utf-8?B?cnlFNGQyT0ViVmpEb0h0V1ZiLzBiWHdjVit3aFllR2pGY0RrRUxuOUJTQVV3?= =?utf-8?B?cEw2djVCdHRDZ3ZMUDRlbm5vclR2T0JObzFFaGxlK1V6dElaUnNHa1VqbkI1?= =?utf-8?B?T09JVFhUeW1nQm1mTUJQTGpRL3FLOG1RajFSdmVJaWZyNmVqMDBNNktlUTc2?= =?utf-8?B?dnJJTEY5TUh2ZDU5Nml1NGNLbk1kTm4yaGFEaHJhZm1aUm1YOU9LVnE0bC9T?= =?utf-8?B?dFdydU5vRjNjeHV6RXJyZXBpMDNPaTNraHZaRy94TjA1TXN0NzZCNkRmZTJw?= =?utf-8?B?VHZuZmhWL1U2MUhPbjRvTzBPc0pJRW9QczQwSUpaYk4rdlBBMlM2SmtZZ2NZ?= =?utf-8?B?T1YxWUZyY05kWTdwQlJYalNrNXpCdDlrQ2VoZlYwMzdDdkNmSlhKaG5aVXJX?= =?utf-8?B?d3JrZmFpdkVtQUg0RTVrWG9qa1J0ZHVVUUlST21IMENMNzFEVjF3MDVDWmpo?= =?utf-8?B?Q0hkMStJNmEvQjU1MUprdlpKQWVLZFRKQU5UcVJWKzVCa3h2VVpJUXU1OW9y?= =?utf-8?B?RzVYc20ycW9QM1U3M2l4V2tBQ0xqMGhwaWZOSVZnd0oyM21MMXdqZzB5aG9P?= =?utf-8?B?NzB0enJsRGlNVUdQRzBya1RuTXFucmtWUkRuMldsdzcrMjVhT1BRaHZUcjJP?= =?utf-8?B?ZDR0WmZYZUhhR05HN3NiaGphT1YyRU5EbVlzTmxDeXRaVGQvQTYyRko1d1Nk?= =?utf-8?B?VjdpNmpTV3JlK3BaR2ttMXlKSmpwNG0rV2xrai9tRE9qUm8yTU1ENXBIdGE5?= =?utf-8?B?Nzl1cHVYUTkrTUdsYU1YNUdDZ0tQT0paUmhaOHQrbXN0ak41WnY0RGhFTklC?= =?utf-8?B?Q29lWUpzNmttMzhrbnJrZ2t3amh4Tm5LU3NrYlcwNUhqRENiSWZuMTFXQk5r?= =?utf-8?B?UUtsalF1NTVqUUk5Si9TV0ZZdlp4QkR1VFI4S3dXN1JXZ1kzUDVXWitZZXU0?= =?utf-8?B?dlJuVnFxR2hYdWVYK0FWVmJEU25ZUUFqZDduTThsVkszcCswcjdPM0RmeFh0?= =?utf-8?B?dG9XSkJ4NDVFNGtvMGltdGxvbGw2dzhMa0dSdG5mNkdrWDlQR1FRbytlT0pj?= =?utf-8?B?WEc4ZE82ekN1UWZDWWU3bGFZVUtEc3ViZHUyZ1JEdW5aTHM3Qmd5RFlVNlpr?= =?utf-8?B?R01oRVkyRTRyMEJsNER5dCtNdDdNaVNxa2M3MTk3NHJqQ0dFQi9FWWdEdlNx?= =?utf-8?B?ZVVmUTFzZGQrdUw4WDNNeUVmTENHTlh3WTM1U1c4YU81Z1VZREJhRnhTZHdl?= =?utf-8?B?NVZjZFo4VktTSXVqRGYxNjRmNW9ZTUZVbEphbnFjenhYZWpuQ0U5UlFiVkcy?= =?utf-8?B?N2ZxL2NNMUdBQVllUng3Nzdwdm5tY1pMOHdpN3FqT1I0V2hzSi9aZTR4a3ly?= =?utf-8?B?MVpqaGVsMEZJVktWUGIxNnA2eXhhdG9seVBZT2dMaDdrNWc1Q25pSURiRGVy?= =?utf-8?B?YXhzRDQxWDVBUWZMaDEvRGVJYVF3aHprdVVnNGVnOGxPR3FGb1QxRXBUbWh0?= =?utf-8?B?R2NPWEVXbmxIUi9MVFZlV1hrdXFnK0lNWHh2UFcyLzBjaWNhdjJkck5ndGxU?= =?utf-8?Q?ZZPehEpaHfyI2cuo=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 785e1f6a-239d-4a14-ff1e-08df0377ae03 X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:41:06.6435 (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: oop8A67q51bFbwrfq0dums1QOAUfN8RoeSVWmAYcEp0l7ZxWzOoHdZUbkrd4X9aOI1LNIHqXSeCYFve+mSufug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" Add support for the UFS host controller on the NXP S32N79 SoC, built on the Synopsys DesignWare (DWC) UFS architecture, using the UFSHCD DWC and UFSHCD platform glue. This controller requires S32N79-specific initialization prior to UIC_LINKSTARTUP, including: - programming SCM.ONE_US_TICK and HC.HCLKDIV based on the core clock, - applying the vendor-defined M-PHY calibration sequence, and - performing post-link calibration steps needed for HS operation. The M-PHY boot mode is selected via the 'nxp,mphy-boot-mode' device tree property. If the property is omitted, M-PHY initialization is assumed to be handled by external firmware or by a simulation environment. Signed-off-by: Larisa Grigore --- drivers/ufs/host/Kconfig | 12 + drivers/ufs/host/Makefile | 1 + drivers/ufs/host/ufs-nxp-s32n7.c | 464 +++++++++++++++++++++++++++++++ drivers/ufs/host/ufshcd-dwc.h | 9 +- 4 files changed, 484 insertions(+), 2 deletions(-) create mode 100644 drivers/ufs/host/ufs-nxp-s32n7.c diff --git a/drivers/ufs/host/Kconfig b/drivers/ufs/host/Kconfig index ff170c0b6da0..e8ee7dd05f1a 100644 --- a/drivers/ufs/host/Kconfig +++ b/drivers/ufs/host/Kconfig @@ -168,3 +168,15 @@ config SCSI_UFS_AMD_VERSAL2 =20 Select this if you have UFS controller on AMD Versal Gen 2 SoC. If unsure, say N. + +config SCSI_UFS_S32N7 + tristate "NXP S32N7 platform driver" + depends on SCSI_UFSHCD_PLATFORM && (ARCH_S32 || COMPILE_TEST) + help + This selects the S32N7 specific additions on top of the UFSHCD DWC + and UFSHCD platform driver. UFS host on S32N79 needs some vendor + specific configurations like PHY and vendor specific register accesses + before accessing the hardware. + + Select this if you have UFS controller on an S32N7 based board. + If unsure, say N. diff --git a/drivers/ufs/host/Makefile b/drivers/ufs/host/Makefile index 65d8bb23ab7b..0381750a35d3 100644 --- a/drivers/ufs/host/Makefile +++ b/drivers/ufs/host/Makefile @@ -2,6 +2,7 @@ =20 obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) +=3D tc-dwc-g210-pci.o ufshcd-dwc.o tc-d= wc-g210.o obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) +=3D tc-dwc-g210-pltfrm.o ufshcd-dw= c.o tc-dwc-g210.o +obj-$(CONFIG_SCSI_UFS_S32N7) +=3D ufs-nxp-s32n7.o ufshcd-dwc.o obj-$(CONFIG_SCSI_UFS_CDNS_PLATFORM) +=3D cdns-pltfrm.o obj-$(CONFIG_SCSI_UFS_QCOM) +=3D ufs-qcom.o obj-$(CONFIG_SCSI_UFS_EXYNOS) +=3D ufs-exynos.o diff --git a/drivers/ufs/host/ufs-nxp-s32n7.c b/drivers/ufs/host/ufs-nxp-s3= 2n7.c new file mode 100644 index 000000000000..8a125105536b --- /dev/null +++ b/drivers/ufs/host/ufs-nxp-s32n7.c @@ -0,0 +1,464 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) +/* + * Copyright 2026 NXP + * + */ + +#include +#include +#include +#include +#include +#include + +#include "ufshcd-pltfrm.h" +#include "ufshcd-dwc.h" +#include "ufshci-dwc.h" + +/* SCM Register Offsets. */ +#define SCM_ONE_US_TICK 0x2CU +#define SCM_STATUS 0x30 + +/* SCM_ONE_US_TICK Register. */ +#define SCM_ONE_US_TICK_MASK GENMASK(8, 0) + +/* SCM_MPHY_RAM_CONFIG_STATUS Register Fields. */ +#define SCM_STATUS_PHY_RESET_MASK BIT(0) +#define SCM_STATUS_SRAM_BYPASS_MASK BIT(1) +#define SCM_STATUS_SRAM_INIT_DONE_MASK BIT(16) + +#define SCM_STATUS_PHY_RESET(val) \ + FIELD_PREP(SCM_STATUS_PHY_RESET_MASK, val) + +#define SCM_STATUS_SRAM_BYPASS(val) \ + FIELD_PREP(SCM_STATUS_SRAM_BYPASS_MASK, val) + +/* Timeout values. */ +#define CFG_MPHY_INIT_TIMEOUT_VALUE_US 3000000 + +/* Clock validation limits. */ +#define MAX_VALID_ONE_US_TICK SCM_ONE_US_TICK_MASK + +/* CPort definitions */ +#define CPORT_0 0 + +/* Hibern8 state poll timeout. */ +#define HBRN8_POLL_TOUT_MS 1000 + +/** + * enum mphy_boot_mode - MPHY boot mode options + * @MPHY_BOOT_NONE: Skip MPHY initialization + * @MPHY_BOOT_ROM: Running MPHY from internal FW ROM + */ +enum mphy_boot_mode { + MPHY_BOOT_NONE =3D 0, + MPHY_BOOT_ROM =3D 1, +}; + +/** + * struct s32n_ufs - S32N7 UFS host controller data + * @hba: UFS host controller instance + * @reg_scm: SCM register base address + * @core_clk: core reference clock used to derive ONE_US_TICK/HCLKDIV + * @mphy_boot_mode: MPHY boot mode configuration + */ +struct s32n_ufs { + struct ufs_hba *hba; + void __iomem *reg_scm; + struct clk *core_clk; + enum mphy_boot_mode mphy_boot_mode; +}; + +/** + * struct phy_reg_cfg - PHY register configuration entry + * @reg: Register offset/address + * @val: Value to write + */ +struct phy_reg_cfg { + u32 reg; + u32 val; +}; + +/** + * ufs_s32n_phy_write_sequence - Write a sequence of PHY registers + * @hba: UFS host controller instance + * @cfg: Array of register configurations + * @count: Number of entries in the array + * + * Return: 0 on success, error code on failure + */ +static int ufs_s32n_phy_write_sequence(struct ufs_hba *hba, + const struct phy_reg_cfg *cfg, + size_t count) +{ + int ret; + size_t i; + + for (i =3D 0; i < count; i++) { + ret =3D ufshcd_dwc_phy_reg_write(hba, cfg[i].reg, cfg[i].val); + if (ret) { + dev_err(hba->dev, + "Failed to write PHY reg 0x%x =3D 0x%x (step %zu)\n", + cfg[i].reg, cfg[i].val, i); + return ret; + } + } + + return 0; +} + +static unsigned long ufs_s32n_calculate_us_tick(unsigned long clk_rate) +{ + return clk_rate / USEC_PER_SEC; +} + +static int ufs_s32n_configure_clocks(struct ufs_hba *hba) +{ + struct s32n_ufs *ufs =3D ufshcd_get_variant(hba); + struct device *dev =3D hba->dev; + unsigned long clk_rate =3D 0; + unsigned long one_us_tick; + + if (!ufs->core_clk) { + dev_err(dev, "Invalid core_clk.\n"); + return -EINVAL; + } + + clk_rate =3D clk_get_rate(ufs->core_clk); + if (!clk_rate) { + dev_err(dev, "Failed to get valid clock rate.\n"); + return -EINVAL; + } + + one_us_tick =3D ufs_s32n_calculate_us_tick(clk_rate); + if (one_us_tick =3D=3D 0 || one_us_tick > MAX_VALID_ONE_US_TICK) { + dev_err(dev, "Invalid one_us_tick value: %lu (clk_rate: %lu Hz).\n", + one_us_tick, clk_rate); + return -EINVAL; + } + + dev_dbg(dev, "Core clock rate: %lu Hz, one_us_tick =3D %lu.\n", + clk_rate, one_us_tick); + + /* + * Configure the micro-second tick rate generator based on core + * clock rate. + */ + writel(one_us_tick, ufs->reg_scm + SCM_ONE_US_TICK); + ufshcd_dwc_program_clk_div(hba, one_us_tick); + + return 0; +} + +static int ufs_s32n_phy_initial_calib(struct ufs_hba *hba) +{ + static const struct phy_reg_cfg initial_calib[] =3D { + { FAST_FLAGS(0), 0x6 }, + { FAST_FLAGS(1), 0x6 }, + { RX_DAC_CTRL_OVRD(0), 0x1 }, + { RX_DAC_CTRL_OVRD(1), 0x1 }, + { RX_DAC_CTRL(0), 0x8E }, + { RX_DAC_CTRL(1), 0x91 }, + { RX_DAC_CTRL_SEL(0), 0x1 }, + { RX_DAC_CTRL_SEL(1), 0x1 }, + { RX_DAC_CTRL_EN(0), 0x1 }, + { RX_DAC_CTRL_EN(1), 0x1 }, + { RX_DAC_CTRL_OVRD(0), 0x0 }, + { RX_DAC_CTRL_OVRD(1), 0x0 }, + { RX_DAC_CTRL_OVRD(0), 0x1 }, + { RX_DAC_CTRL_OVRD(1), 0x1 }, + { RX_DAC_CTRL(0), 0x71 }, + { RX_DAC_CTRL(1), 0x7F }, + { RX_DAC_CTRL_SEL(0), 0x2 }, + { RX_DAC_CTRL_SEL(1), 0x2 }, + { RX_DAC_CTRL_EN(0), 0x1 }, + { RX_DAC_CTRL_EN(1), 0x1 }, + { RX_DAC_CTRL_OVRD(0), 0x0 }, + { RX_DAC_CTRL_OVRD(1), 0x0 }, + { FW_CALIB_CCFG(0), 0x100 }, + { FW_CALIB_CCFG(1), 0x100 }, + }; + int ret; + + /* Clock Control */ + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(CBREFCLKCTRL2, 0), 0x80); + if (ret) + return ret; + + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYCFGUPDT, 0), 0x1); + if (ret) + return ret; + + /* Initial calibration sequence */ + return ufs_s32n_phy_write_sequence(hba, initial_calib, + ARRAY_SIZE(initial_calib)); +} + +static int ufs_s32n_link_startup_pre_change(struct ufs_hba *hba) +{ + struct s32n_ufs *ufs =3D ufshcd_get_variant(hba); + struct device *dev =3D hba->dev; + int ret; + u32 reg; + + /* + * There are two supported MPHY boot options implemented: + * - Running MPHY from internal FW ROM: + * MPHY_RAM_CONFIG_STATUS.SRAM_BYPASS =3D 1 + * MPHY_RAM_CONFIG_STATUS.SRAM_EXT_LD_DONE =3D 0 + * - Skip M-PHY initialization when it is handled externally. + */ + if (ufs->mphy_boot_mode =3D=3D MPHY_BOOT_NONE) { + dev_dbg(dev, "Skipping UFS MPHY init.\n"); + return 0; + } + + ret =3D ufs_s32n_configure_clocks(hba); + if (ret) + return ret; + + /* Reset SCM.MPHY_RAM_CONFIG_STATUS to default value; keep MPHY in reset.= */ + writel(SCM_STATUS_PHY_RESET(1), ufs->reg_scm + SCM_STATUS); + if (ufs->mphy_boot_mode =3D=3D MPHY_BOOT_ROM) { + /* ROM Mode. */ + writel(SCM_STATUS_PHY_RESET(1) | SCM_STATUS_SRAM_BYPASS(1), + ufs->reg_scm + SCM_STATUS); + } + + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(CBCRCTRL, 0), 0x1); + if (ret) + return ret; + + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYCFGUPDT, 0), 0x1); + if (ret) + return ret; + + /* Release PHY_RESET. */ + writel(readl(ufs->reg_scm + SCM_STATUS) & ~SCM_STATUS_PHY_RESET_MASK, + ufs->reg_scm + SCM_STATUS); + + /* Wait until SRAM_INIT_DONE =3D 1. */ + ret =3D readl_poll_timeout(ufs->reg_scm + SCM_STATUS, reg, + reg & SCM_STATUS_SRAM_INIT_DONE_MASK, + 1000, CFG_MPHY_INIT_TIMEOUT_VALUE_US); + if (ret) { + dev_err(dev, "UFS MPHY init not done!\n"); + return ret; + } + + /* Start of initial calibration */ + ret =3D ufs_s32n_phy_initial_calib(hba); + if (ret) { + dev_err(dev, "UFS MPHY initial calibration failed!\n"); + return ret; + } + + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYDISABLE, 0), 0x0); + if (ret) + return ret; + + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYCFGUPDT, 0), 0x1); + if (ret) + return ret; + + /* Set Local DeviceID. */ + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(N_DEVICEID, 0), 0x0); + if (ret) + return ret; + + /* End of Gear1 settings */ + + return ufshcd_check_hibern8(hba, hba->lanes_per_direction, + HBRN8_POLL_TOUT_MS); +} + +static int ufs_s32n_link_startup_post_change(struct ufs_hba *hba) +{ + static const struct ufshcd_dme_attr_val cport_setup[] =3D { + { UIC_ARG_MIB_SEL(T_CONNECTIONSTATE, CPORT_0), + CPORT_IDLE, DME_LOCAL }, + { UIC_ARG_MIB_SEL(T_CPORTFLAGS, CPORT_0), + CPORT_DEF_FLAGS, DME_LOCAL }, + { UIC_ARG_MIB_SEL(T_CONNECTIONSTATE, CPORT_0), + CPORT_CONNECTED, DME_LOCAL }, + }; + static const struct phy_reg_cfg post_calib[] =3D { + { RX_OVRD_IN_1(0), 0xc }, + { RX_OVRD_IN_1(1), 0xc }, + { RX_OVRD_IN_1(0), 0x8 }, + { RX_OVRD_IN_1(1), 0x8 }, + { RX_OVRD_IN_1(0), 0x0 }, + { RX_OVRD_IN_1(1), 0x0 }, + }; + struct s32n_ufs *ufs =3D ufshcd_get_variant(hba); + unsigned int data =3D 0; + int ret; + + if (ufs->mphy_boot_mode =3D=3D MPHY_BOOT_NONE) + return 0; + + /* Set Connection State to IDLE (it allows CPort Attributes to be set). */ + ret =3D ufshcd_dwc_dme_set_attrs(hba, cport_setup, ARRAY_SIZE(cport_setup= )); + if (ret) + return ret; + + ret =3D ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(T_CONNECTIONSTATE, CPORT_0), = &data); + if (ret) + return ret; + + if (data !=3D CPORT_CONNECTED) + return -EIO; + + /* Post Link Startup Calibration sequence */ + ret =3D ufs_s32n_phy_write_sequence(hba, post_calib, + ARRAY_SIZE(post_calib)); + if (ret) + return ret; + + /* + * Performing MPHY configuration for rate change: + * CB rate selection: 0 - rate A, 1 - rate B; + */ + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(CBRATESEL, 0), 0x1); + if (ret) + return ret; + + ret =3D ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYCFGUPDT, 0), 0x1); + if (ret) + return ret; + + /* End of Gear4 calibration */ + return 0; +} + +static int ufs_s32n_link_startup_notify(struct ufs_hba *hba, + enum ufs_notify_change_status status) +{ + int err; + + if (status =3D=3D PRE_CHANGE) { + err =3D ufs_s32n_link_startup_pre_change(hba); + if (err) { + dev_err(hba->dev, "MPHY setup failed (%d).\n", err); + return err; + } + return 0; + } + + /* POST_CHANGE */ + err =3D ufshcd_dwc_link_is_up(hba); + if (err) { + dev_err(hba->dev, "Link is not up.\n"); + return err; + } + + err =3D ufs_s32n_link_startup_post_change(hba); + if (err) + dev_err(hba->dev, "Connection setup failed (%d).\n", err); + + return err; +} + +static int ufs_s32n_init(struct ufs_hba *hba) +{ + struct device *dev =3D hba->dev; + struct platform_device *pdev =3D to_platform_device(dev); + struct device_node *np =3D dev->of_node; + const char *mphy_boot_mode; + struct s32n_ufs *ufs; + int ret; + + ufs =3D devm_kzalloc(dev, sizeof(*ufs), GFP_KERNEL); + if (!ufs) + return -ENOMEM; + + ufs->hba =3D hba; + ufs->mphy_boot_mode =3D MPHY_BOOT_NONE; + + hba->quirks |=3D UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8; + hba->quirks |=3D UFSHCD_QUIRK_PERFORM_LINK_STARTUP_ONCE; + hba->spm_lvl =3D UFS_PM_LVL_5; + + ret =3D of_property_read_string(np, "nxp,mphy-boot-mode", &mphy_boot_mode= ); + if (ret || !mphy_boot_mode) { + dev_dbg(dev, + "nxp,mphy-boot-mode property not found. UFS MPHY init will be skipped.\= n"); + goto init_out; + } + + if (!strcmp(mphy_boot_mode, "rom")) { + ufs->mphy_boot_mode =3D MPHY_BOOT_ROM; + } else { + return dev_err_probe(dev, -EINVAL, + "Unrecognized nxp,mphy-boot-mode property. UFS MPHY init will be = skipped.\n"); + } + + ufs->reg_scm =3D devm_platform_ioremap_resource_byname(pdev, "scm"); + if (IS_ERR(ufs->reg_scm)) + return dev_err_probe(dev, PTR_ERR(ufs->reg_scm), + "ioremap failed for SCM registers.\n"); + + ufs->core_clk =3D devm_clk_get(dev, "core_clk"); + if (IS_ERR(ufs->core_clk)) + return dev_err_probe(dev, PTR_ERR(ufs->core_clk), + "Failed to get core clock.\n"); + +init_out: + ufshcd_set_variant(hba, ufs); + + return 0; +} + +static const struct ufs_hba_variant_ops ufs_hba_s32n79_vops =3D { + .name =3D "s32n79", + .init =3D ufs_s32n_init, + .link_startup_notify =3D ufs_s32n_link_startup_notify, +}; + +static const struct of_device_id ufs_s32n7_match[] =3D { + { + .compatible =3D "nxp,s32n79-ufshc", + .data =3D &ufs_hba_s32n79_vops, + }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ufs_s32n7_match); + +static int ufs_s32n7_probe(struct platform_device *pdev) +{ + const struct ufs_hba_variant_ops *vops; + + vops =3D device_get_match_data(&pdev->dev); + if (!vops) + return -ENODEV; + + return ufshcd_pltfrm_init(pdev, vops); +} + +static void ufs_s32n7_remove(struct platform_device *pdev) +{ + ufshcd_pltfrm_remove(pdev); +} + +static const struct dev_pm_ops ufs_s32n7_pm_ops =3D { + SET_SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume) + SET_RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL) + .prepare =3D ufshcd_suspend_prepare, + .complete =3D ufshcd_resume_complete, +}; + +static struct platform_driver ufs_s32n7_driver =3D { + .probe =3D ufs_s32n7_probe, + .remove =3D ufs_s32n7_remove, + .driver =3D { + .name =3D "ufs-s32n7", + .pm =3D &ufs_s32n7_pm_ops, + .of_match_table =3D ufs_s32n7_match, + }, +}; + +module_platform_driver(ufs_s32n7_driver); + +MODULE_AUTHOR("Larisa Grigore "); +MODULE_DESCRIPTION("NXP S32N7 UFS Host Controller platform driver"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/ufs/host/ufshcd-dwc.h b/drivers/ufs/host/ufshcd-dwc.h index 53b523ef59df..747383cfb839 100644 --- a/drivers/ufs/host/ufshcd-dwc.h +++ b/drivers/ufs/host/ufshcd-dwc.h @@ -13,8 +13,7 @@ #include =20 /* RMMI Attributes */ -#define CBREFCLKCTRL2 0x8132 -#define CBCRCTRL 0x811F +#define RXSQCONTROL 0x8009 #define CBC10DIRECTCONF2 0x810E #define CBRATESEL 0x8114 #define CBCREGADDRLSB 0x8116 @@ -24,10 +23,16 @@ #define CBCREGRDLSB 0x811A #define CBCREGRDMSB 0x811B #define CBCREGRDWRSEL 0x811C +#define CBCRCTRL 0x811F +#define CBREFCLKCTRL2 0x8132 =20 #define CBREFREFCLK_GATE_OVR_EN BIT(7) =20 /* M-PHY registers */ +#define RX_DAC_CTRL(n) (0x10AF + ((n) * 0x100)) +#define RX_DAC_CTRL_OVRD(n) (0x10B0 + ((n) * 0x100)) +#define RX_DAC_CTRL_SEL(n) (0x10B1 + ((n) * 0x100)) +#define RX_DAC_CTRL_EN(n) (0x10B8 + ((n) * 0x100)) #define RX_OVRD_IN_1(n) (0x3006 + ((n) * 0x100)) #define RX_PCS_OUT(n) (0x300F + ((n) * 0x100)) #define FAST_FLAGS(n) (0x401C + ((n) * 0x100)) --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5EF037A85B; Wed, 26 Aug 2026 13:41:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751688; cv=fail; b=UzdWZ7jiphHge+H5IuAPmUDOkXMErbtefTaRMINg06WNCr5t21J1leywgEx2bIEKwh8gWAcOv2H2aUTCbvabfNiHF14T/MpnqhGQzjp2Xuq4hIwOTyjF/wa3xwvHTpEvVDNSVHtKd56/6pzB0hmDs/11RW266W+HL9hQrWJsR3I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751688; c=relaxed/simple; bh=p46tcHLmcWTBfScBhcw9haEOSBR6RqUjnTixpZfNo+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=AsFLAsVWEiNeDTkkYsZRLBFSODpT95NrUuZSWhknsw3S6Yx7p55q7jvwpCr0jUn0bzocSR5Kan5+gr8x87PM6/2g1CNvJQETOlsz5aEWmZIQjILUKc4xBPL2CqioRt0y5A4S8akJTApUvVuJJgHBfV6H7X4vIFVE54dGu6eFpd8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=J0fvaY2q; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="J0fvaY2q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=v5GP1lFT9Pk7oRWn4bBe8o2WD6JwX3WSpcuTcZbKdLwScovrIK+GcpedU1WkXxmVsxr49TI/F4nu2cqefHuiUpvccxp3tS5VT4614G6DvHBe8BSkGEa9L5PDwuSFP/P8ArsDy8+ayU9cAV0vKr9nCwjYqLAlwTOjnlt0nF+g/dPAJ5oqbzh86ulFhmrInJszqwA4Bie4Ef9H1PDvlb3hKTYQA969bWpMcRHabsy1iUJEwx+f4x6UJSJS0yO8VoRWXHiPnB3AzkwQ43hmBkg5gmHQnsSN02R8zBoYHu6P0cLgz66c+SMKIjWAba1da0ZgzH+2egwFitn2/+0itCUC2A== 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=Xm6quMlKZhNGIMDj/m/dU9nLjLDC8U3D/hkm2fySHO8=; b=QrEIqruEzBUV+136JQz50gIzxx2I1FUw0SwIl/nbnr+BzVswWmJx3uhR/u6Z50zh9eyrlOBTkVRs5f/beW6h7+M+HUZCe84m1jK0gVlUrKnmFoAh7jvd9W32IMADhRmI9yw856HY1Pzy7SY1u6LFDxF/v4VarNdiifbFtM6JNUeDXpx2t6BqTp2amUtg/J4/SHcwVYK+czlWIN0C8dDwarbcJwERFLVxw7UkAgaJx72b5IpTWYJS4tTBNTMm7be5eBvrMzyd6kbGMSRfbiYmhKYs2JlygHLluOtYvHG0DNeWaLyB3Ajse2n+qZCBKjj3S7W+bBseMWQM7ALZHbVz7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Xm6quMlKZhNGIMDj/m/dU9nLjLDC8U3D/hkm2fySHO8=; b=J0fvaY2qyHL2eMMbKYJ2TtMBWGtT/NrewmewEC0GB4M04i4r/Bm4zwMzyuUlLIRdQttiXJ7JUCCBnWw4P1BeqyCunhi3a2Jl4IdrZ3Su5aY5s1DZRpAhkdDcUDgTkYRVH+c5i4N9N3Zd7DlFq4WJ7EQi13UpmQXQ+iVtSOKQ76q15wR31rjLCm81SG/Cfrk3ogfeYf10JRqDVynYr9pfowzQa95QJN1b9FzwuUEov41cRUOQS92oKBuoec63ejgapXrkgpTGBpXNN8Wqh+Zf+KoIlrKflytnU+axrhUvF/G/NqP/dALRIXhELMq//M0/vMk+LcpGSJAoTM77QqGtbQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:41:08 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:41:08 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 08/10] arm64: dts: freescale: s32n79: Add UFS host controller Date: Wed, 26 Aug 2026 15:40:46 +0200 Message-ID: <20260826134048.854748-9-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0430.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d1::20) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: e9b7fd06-ba19-4826-617d-08df0377af15 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: ggt6oJRLyvuzizzEOGok6AnL4YSs6hOaIxhPPfJodTsjYJIxrbJZrxN3TZjOfOMWxlCHHbtEPLFCVhdeW4l+zdWTmQGvMyyAxKNUJw+D6EVBCOyFz2vZ1JH6qcaJmYVBb20gQI5H1rmUOr+4E8HLKhlEA8lI4CKLiKVirNNZZQaZLKM7oKIna2aDdVLT8Oq4a6naTPCFmFD3QPKBJMrQ/RWiiPkseJErV/g1Y/7uVy5V1nvDyTvyF3JEZBbapFplk/JUWuUTE+0e1FpwzQkFzYfgGIhnFKwtAcPVNGzlw2Rvi2rAYO8Xxsz8ZwMTJiKth62PG9vIFn1EzDwUimTzVxwQAOTC5aTE7DodjfPH4FYXKiB0CdRjf8wD9ozfXE+q1NBWlNaAwB8SwjRbP9EPSuKnQN0uIS6J+fvhPQhJwysWRLSP9j86ULpLFMoGuMzF18/Itc9EXnH5ldJcx7U0odIRbbiTGR9dnU/rwk5d+Ere/lKLlQXEfymSFRrfFL8chOEy73R0H691VP4NDQ8d7+KLP493jgfytGZGZkUkJt9gTbYMP22dF5uFUVTRLIeybTMy1tNvUbsQX/1gSEW7lVKKvocXI0fksErvF40vI8pv3675CLVOBWPgZ22vPo2Z88Se+SZUEQJZEqstGF8kEpIgCbkh3143Et1iWgl90B2ynxEBiiYnWuSzmwwleWqSw5lrQ2IbxspSetqEx8xXyA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SnF3eFQrOWJaLzlCYzZvQnA2c0s3Z3VkUXhwU1ptNTIyelNldDZRT3AyRkw4?= =?utf-8?B?TzBHR2ludHlYbFZNKzcrbGtwN1BIeTNrcExEN203aFNGdkFPVUgzMjZTWVhl?= =?utf-8?B?eXBvOTFLTFc3K1RwV0ZORU1FZDdzUGFNd0hlaldUcGJZc3l4ZVM4TWNvNGhT?= =?utf-8?B?dnR2dGEybDYrMWoyVHdQaFRFLzBiRXdjTE5hdlNWSU5sMlc4YjN5SlJnTWNz?= =?utf-8?B?Ykk5cjQ4bzQwbkJaSDQ2SGFacS82cVdaNTNrNHE1cUdvUjlaTWt1OU1Ca2cz?= =?utf-8?B?Y0ZCZzFPb28wYjdRa3NIQzZWVnZVcWFicGRaa282ZExIc1JIWG1IcXVPS1BR?= =?utf-8?B?bkYwTi8wVG9wQjBZMVBicERSdG8zK01kbmxzakpHZzJxWUhzUXA0bjFaUTRT?= =?utf-8?B?Zk9lK3prMjBBMDNLK3hLbVRPWUhlcU5nWWd2dGNYcHZpbjhPdHNlb05LVGQr?= =?utf-8?B?dlYrMXZid2tMSTJCTm8xeGoyS1doUkNqQmJOVEp0eTIrR2ZvWGN5UklaZXdL?= =?utf-8?B?ZUR2WnVwd1lQekFTbHBjWVpaRU5VNEtxS3FyQlRmc0dJekNtTzNLUVBVcG41?= =?utf-8?B?S0dvQkJNZlF1ZjArVGI4UjBlOUwxRFRvUlJoRHZNZmFqY3VreUdwcVFEQTBO?= =?utf-8?B?ZkdMMmIwNzBEd2t5NkJKMWs1T1R5dTdzZysyRWtmd2V6YUJaaHZ2MExxYWtU?= =?utf-8?B?YUcrTFVzZjJNd1c2WHlUZU9UQU5rZ3haYnBnL0VmVFdwOVp1SkFkYmdzR1Jv?= =?utf-8?B?Ky9qTitnS2g5ODEwUm1Eb1VBNGJ1MmpiTEhwOUlYa3NRS0MxZjlFeTBrb1Nt?= =?utf-8?B?V1Y4OHY0clNrTFNCZ2h5ZTczcVh2eTRDTlFFR05relE4bVREeC9LdWZyaVVO?= =?utf-8?B?R3g0SjVMcmxpS1p0WCtxaWZYVS81SlQwaVdlaDcwTWJ2dFFjRGZCVEF0OTA2?= =?utf-8?B?QWpXNi92dE5SbVcxNFJLcUpIdG8rT1QwdkMzMHhIdStqZmxDZWMzUi9GMVhj?= =?utf-8?B?Z3lYMGZjV3Y3WWYwTWx5V0FNb2pKZVV4VzA1aFU2SXliYmNIZW5oTDRXNEV5?= =?utf-8?B?ay9kMTNKUFZjWXdjSTJ1cDduaGczQWFsVlZuYzk5SHpEdDlDallLSkx3OXk2?= =?utf-8?B?TEpVM0dhRTZaQ3B2RHErdWNpelVYTnAvdUE1UkR1YW1nbVZtN2JoZzBXcFFs?= =?utf-8?B?ZUFEaERzMEFvOGVLQ0pQYW1WZGI3SGJtZHBlZVlzcWxiNC9CYnh5Vys1WEht?= =?utf-8?B?VnYwdlRCbWp1TEpvd1R4Q2MzZW15M1UwdTlWRXhHRHFLS3VnMnIvRGtpY2kw?= =?utf-8?B?Z2l3cmZmTURtek1nalZlZkhCekFibHBEMzluMWNXRXV2RGdjWjV2SzEwY1R6?= =?utf-8?B?ZWhuY09iM2lRTTROQ1l3ZkxMVVlKNGQ2NzZDZlBvajdkTEJXQ1loYTBLNGhl?= =?utf-8?B?UndHQzhOU2o1by8vTlNaYit3MTAxcmJGL2ZIWW9rVFUvbDg4WFZvQmtBRTZJ?= =?utf-8?B?SjBBU01qbUl2QnpYZHg1MUZsbEMvZmhQNHJXZUsxNmVHb21acTIrNFFPaEV1?= =?utf-8?B?eFpaa1JQVkM3Y1I4Qk95cVZVMXRaY2ZLZDdEMWNzdTFwZjkxNDQvdkNRajJI?= =?utf-8?B?U0RFNndNaS9zWmVuc21LaUw3Q29IZENRa1ptZ3lwUFJ1ckFVOStLMGhLb2N3?= =?utf-8?B?MGhEOHV4S2hSK0pDalBPeEcxdmF2dHBEU2dlRmJpV290dmdBVnJCd1V3NlR0?= =?utf-8?B?OVJJS3dzWUNkcUJ6VldlVXZZODFJYXNWQ1dyQTlCeVpmRFRtMHgySnQzYklx?= =?utf-8?B?S2ZqMm4xR3NUb05RSzNWRExNNU1CR2FEL0FPT3VYREhXSWJKN20xNG5NSzJU?= =?utf-8?B?UzZ4eCtYUXZDUzZ0N0ZORzR3cHlPNHVka2dzUU41Z2p5MUZYVzJtVVVOWjg2?= =?utf-8?B?d2ljR3Z4ZVdyMEZBRjVGZUwrVFUwRnQ2SzJxaTNLcS9YcUlBR2c0ak8rQW9S?= =?utf-8?B?anF4LzViN2RDQjZaU3ZHdVhJK1c0MkV1VEpPTzJyU1hReE1rcFE5NjBTUEVR?= =?utf-8?B?dC9xa09zUDJUQ3ZRTWlxMERTRGhiQUZRRjdjK2FMYXZ0WmlUTHBsQ1FJUzN6?= =?utf-8?B?ZkVEdWQ1U2FOeERIdlN0cHpvOEpLL1JsT2NtWldaT2U0YjJIMDByMzdkUW1t?= =?utf-8?B?Z210cHdxSkJOVGNicG9UeU93T2d4bEZsSEIzamwxRlZVYTNTalV5YnVINEhU?= =?utf-8?B?d2JMKzdleC9zS1YrYTRxUGU3cStqOHBvZ0JzcHlJckliellhYWZWMGRkbVZv?= =?utf-8?B?UDBMYmF0cytxT1hvdkJ6N1lYRWlqNUVqYWdjbGtud05VUXdiUXNIZjZUTlpk?= =?utf-8?Q?hM5yr3QVpPrdhTww=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9b7fd06-ba19-4826-617d-08df0377af15 X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:41:08.4082 (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: 8HF2fX/+cXu3UNEic6ZxWvlfIFySebWlnfAOcg3zIOSnoDBmbyEp2W3OjBkKzDKGnx08ydcZozDt+IoeCprO6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" Add the S32N79 UFS host controller node to the SoC dtsi, including the UFSHC register region and the SCM region required for M-PHY initialization. The controller remains disabled by default and is enabled by board dts files as needed. Signed-off-by: Larisa Grigore --- arch/arm64/boot/dts/freescale/s32n79.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/s32n79.dtsi b/arch/arm64/boot/dt= s/freescale/s32n79.dtsi index 94ab58783fdc..5b92eaea05fb 100644 --- a/arch/arm64/boot/dts/freescale/s32n79.dtsi +++ b/arch/arm64/boot/dts/freescale/s32n79.dtsi @@ -100,6 +100,17 @@ uart7: serial@4aa40000 { status =3D "disabled"; }; =20 + ufshc: ufs@4ac80000 { + compatible =3D "nxp,s32n79-ufshc", "jedec,ufs-3.0"; + reg =3D <0x4ac80000 0x1000>, <0x4ac40000 0x1000>; + reg-names =3D "ufshc", "scm"; + interrupt-parent =3D <&irqsteer_coss>; + interrupts =3D <211>; + clocks =3D <&clks 0x92>; + clock-names =3D "core_clk"; + status =3D "disabled"; + }; + irqsteer_coss: interrupt-controller@4ed00000 { compatible =3D "nxp,s32n79-irqsteer"; reg =3D <0x4ed00000 0x10000>; --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011050.outbound.protection.outlook.com [52.101.70.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7582D439F80; Wed, 26 Aug 2026 13:41:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751694; cv=fail; b=J0zjuzIYOMfpjLj5Y8ASWnNuvIs0PBzNbqOZXmuZTH2TfbLoFWiJYH9tgt1+I4hbA+PZq4LOKa9i1/ZNKcw+kWLdJOZLr7uV+z+SJq0Wm+qJeAvfLS/Fx3q6EZwB604QzH4xiLffJik6ja8WyFzZT5DhGcb/ZedJ2Zr/CSNawgQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751694; c=relaxed/simple; bh=8du+yZi5AZdJaX5pFpA2+37se4g5AAlqd61T1eO+BsY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=M0oQz30EuwXhTPfVt25nnNr48NvXvNH8ujI53rV+XMl+bSdJxRhBag7KvZRSBYcOOzzSSzC4SR/faCCcifU+qKZazY05c7KOcSWeRit8qXne2zJFhjcp/Tb+RU82aVMkrCniBJJepxqQ0cgI7+G/EhmVX+gwrspIRjUD8ycbe0s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=I6psuXVw; arc=fail smtp.client-ip=52.101.70.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="I6psuXVw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SntUvktY8FrUy8lu4uGdXdsc/WRRZ84EH/Go4MLLBAebXUeOlFDcqCKDw7F6/SOzFxP4IcgGL7GvpuxzraQD4WXc/jZd4oIooWlUcWLch1gdznBncR3BrHB5KWnThwPWkNg8Dn8UDAr3gtNAJvyfK/z/mX70RIlla4BlP2I6p/DHIxyLM1J7ZBqy7WmgUHeu2rif1LftrMt2uko2/ORPEjZGD7KXU++eIY6mw3fny0xqy0NJPOKj60APXWnFKXABetfKaPVow+ss52LrD+E/AhFwRDuhYYS8cd+OPRIEXoSx21a/O7jayP3zLpgtsIHrHsQwPOtulNOOe38KHuFAVQ== 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=S7eOlcE/MrbQgmawDnbaXovUJ0y1hnFx7/DZQXlzyNY=; b=K3O/6eELEX+TQ677AO/SXSRpg8WdXKmCq3w90RYEB43XF23geTlDeN/kep2oWjRHpIDS8fSgLfhHD9Lky3++DFAfxQJgxPYNEPpp/TTQXyuIhb5tmNjgR3So2GNe+PYUpsXzFVpwAiwGtxwcAugsFHwwF1B619IEQ6NCp8X/6XQA4VODmJx5MkHcZsnS702kyTSmzcbTHjrdfETEXtHjEdKOEC7VhbnxWCI+N1g2AoLq/qeRh1D1O4rZwIa1/fUPJLM0rM/s2TANELtbI41D2cX/k6OAPJKqnY3TZvb0jP8RFoCveP3QDXSnJfzZhtEY/cZWL1tqkNgAUU8WqkdFWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S7eOlcE/MrbQgmawDnbaXovUJ0y1hnFx7/DZQXlzyNY=; b=I6psuXVwm58UzGzHywr5lSFIJ0+u8CBLI4Sx54D5VWIq7s4n4aHF43uiXm2JT+bsVrqR3oEy69S0imRNapOAhb1F9JM4R/QGPCZhebhRNEuyiPa48N2sCpfMvASNf3rgNhbXkxrTVLbk19fKM2GdYk+oI2GvzC0JS47ZHmDpXLYM55PjnOofQbmJoTluveO52cjuG30C5XRCFkM9JLz2Qw+mxgZKPzxpzerGasDdc4qW31yXI6uOuL4t2SspHtZI4pKS+zLNte2kwCyBzUGfT2AGJo1cY5hSevano+GbrPrcBUMKbu2FIxZGQirEL5Qwh23DyKxtCZNP3j0Ld14TPA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by GV2PR04MB11862.eurprd04.prod.outlook.com (2603:10a6:150:2f8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Wed, 26 Aug 2026 13:41:10 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:41:10 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 09/10] arm64: dts: freescale: s32n79-rdb: Enable UFS Date: Wed, 26 Aug 2026 15:40:47 +0200 Message-ID: <20260826134048.854748-10-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0426.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d1::9) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|GV2PR04MB11862:EE_ X-MS-Office365-Filtering-Correlation-Id: b3b3aced-ff4b-42bb-237d-08df0377b02d X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|7416014|19092799006|376014|366016|921020|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: fhAOjpEpR3ve8xwI0zX20eFCYNzI6TDpc1F7aM9o0MQX2Qj0Owp9S+Ye4LeF9YnD7112DeIXh3R5KZa3l+8jk8O3a5xYznp68xZ8jzB4f8T/jidousiYU1iS8pqZ8Z81dy+CYDKeMtJ/7C409TpXYZPZlgHsorTqKQf5oc4eb9sBrlC7we9zYgcyZ49JmhfELWbEvbFWVsjRQC8l8TeV+caz77l+q9Aw0HmQCh45iKMdnYXISfX/e/GjSm/k3ZvLZ4HJ7w+UbuGWfWlaN83hcMEteD+oEGAYBS0c/5/r+NkBC/4QPmRvWGfQjhCwrpmKZlLKKhCaxENAtMEhQ1QfFlzFO7tE63SlRSr9I7g0UQwuoIBGve72O8KY3RSMuOG4dwk9FmXYrc9JiSqm85xbxxgquwofncCSD+0DwjWidVi1CybHT/lNnvryrcYM7EW/Q2ph50BSq1lyvaLBWjOPY5ArbRE0Zd+9f+7JiHcVSI7pa/wUCz6aDF3h8pBisZRTHjSsFtMJxm6V6s/gHSRJG84lVaNAKUSCuggDRQlEmTb1yPnmthsiOjeBBrNvoiqWBNC9+Qc+XRLfTcHMLDVaS/NBnC9eTj+qVrpKZvMa6vE5cakP46g2eji6QkjBSQPvLlzhDXilSqDVX/2PjPyGxluPjn2r/91Xuo4zpJGuaGDvakSRcZrMCUm9kUFzK1wZ2mgXLPYKUPsFABKt40AHww== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(7416014)(19092799006)(376014)(366016)(921020)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UjdWYnp6cG5xaGNYNXFqTTM5YkxRUkE4QlZtcVNPckE5UkZuUWI2MDR0bUov?= =?utf-8?B?NGxZM0FTckFJVlNJYzJXd2dRSk9tT09IOFdkMXBhTm4xSTd0dVZmeHZYM2hY?= =?utf-8?B?Nkpod2RYVnFMR044VjV1aE8wQW9kcWk5WDl4RWNMQ05sbThXa3hBZk9kZXJW?= =?utf-8?B?bG1yWFJ5NTlLSkFMd2NVQUtmSjB2VUpRbGFDWmFTbDVxeU45NFQrQ3UyNVpV?= =?utf-8?B?OU5jQmNwMXFqU3QrU3loUkFnck5TVUc5MWJMaFFiY1IrSHJUMkhDUVBSVVQy?= =?utf-8?B?V3oyQ1BMb1VzSDRGMHFRNVpGUHljdTN3YklCRko3Q3VwVVE2WlJwSnBNM2ta?= =?utf-8?B?UkFkV0RCb0hRZXJBSlRWMjdUelRSNHB0WkhzQ0N5ZWUvTnp4R29NSkRsTkp5?= =?utf-8?B?NnhiRUZjM0lIUHF1RFJiSTlXUzd5QXZCdDJCL1ZJWTljbWRYeE9yMHBXbWR5?= =?utf-8?B?RVl1Yk81bU9zVncxMVJhd1l5ZS9vbHdzQ1cxZnJkSCtUN1I3ZGhVR3N1cnlq?= =?utf-8?B?UTVwRUwvdVJzTnF6SFdpOXFhbjRqSFJBTGt6VklDQmp6UkREd2NmeGUzU1VM?= =?utf-8?B?VVUyRHliYlVaK0F2cTdnVUlVdlZxRC8rVWw5WDBPZytuVEJBV3hrS2RuMko5?= =?utf-8?B?eWRlN2ZhUlVMaUZ1MWs4VHM2VFo1MjlGaFRFWUpuSFAzbVNLVDQraERIUU5w?= =?utf-8?B?cVZxRHVmMHphREtqeXYzZGxEWHJMOTJtU3VrZXhITmhpbzBOZzZnRlpzeFg1?= =?utf-8?B?ekVySEF2cS9vcXBYcHhYWXE4bXo5NndNWGZ2ZWtsZlpRVlIyZWNtTnppcE9Y?= =?utf-8?B?UmJBeXdtUGEvL2pEeXhydG5lMmE3dVZwR21xM29valN5eXVQOTQvTHIzNWgr?= =?utf-8?B?NmhRLzBRUGxSM0hFMzhpMHFxdDJmR0ZvS3E4Z0x0Q3ZKSU04dGFQVHlCZ2tm?= =?utf-8?B?TXJmTWNOOEJ1TExML0ZRQUo0VVRGZjZROFRZVEJkcHdkZnJEbEtNSVkxdjVj?= =?utf-8?B?dzlka3NsdUlZSWhNSnJVQ0dwTk15eXBIWlh5STdUbGdWaVUxMnNsVzcyOTNm?= =?utf-8?B?Uno0T1J5Umd3R1d0M0FacDNWUDdnL1NhdUQrTjFGUDd3OGxLMG8wQ3NBTm5W?= =?utf-8?B?d3FpL1o3d29yUWNPN3d0U0tvaCt2bzZCTjZpcUphenBvQ056azAxTUgybWlO?= =?utf-8?B?QzAyRStRdFJnZUlqejJMVHF1WnhBc0U5SnBtaWgwQWFndURCOTd4OWVtV3l6?= =?utf-8?B?RXZXRDg0VmM2a2lpMnRFOVl6R3Y3eVowSWF3Skt6cm1uWEpzNTZHUW5XdVRy?= =?utf-8?B?bG53dFhOQmdKWndEeG0zb2ZaNTVHTnIyeGZuaHg4MXpIcGZiOVkvUzg1V1BP?= =?utf-8?B?MHRwYmt0d2xrbkc0YVo5d3RZUzRLcFlRNzlUZEhqWlZjeWdHTm9jQU1zUitx?= =?utf-8?B?ZHlZeHVweFVHaXpWS01NZjFWaXBTSTd2dVM1enVmakZUMitzMisxdm5KRS9p?= =?utf-8?B?SHZnRjhtTGFVdmdvUVBKL096Wk1LQis0d1JDa3hYeVNKVjdZRDdYYWlLcjVZ?= =?utf-8?B?UlFXRk93YWVSTE1aQTlNMmJCY0VPcDA1UVhlN3NtNHhVcThMOTM0eWdHRjBT?= =?utf-8?B?UjhlcjBVZE5XWU5xREQwV3FXZyt0UytubnVmL1NIaWppNmZlVjVmbXJwVzcx?= =?utf-8?B?S1NxRzdmTDdHOGRzTXZXTEJsNHZkcE5xM2ZNdW1UdDh6TkEyMTNQUWYrZmd1?= =?utf-8?B?eVBNSktrVFZhdkR3RWFIM3JLdjFTeTdjeGt0TGxpOVRHdEZ1Y1c4T1JyMnZF?= =?utf-8?B?eHpQV0NqcGE4ekU0MWh0Ykh6ZUl1MGd4UngvZ2R1bklHZ2cxbStoc3YvVXU5?= =?utf-8?B?QTV5bFVqa2hnUnFkWDZnTlo1SHNwMW9yd01LWmIxZlhaVFJiVGJXWFFMQkJW?= =?utf-8?B?bFNlWWZ4MFkyLzNWNUJQUk9jZURBR0s0TmZiYUJ3Q0c1MDhNdTNUSDlPMkIv?= =?utf-8?B?QW9YOWl5Qk42Vkk1NVhqVE9LUmdoN3dCeVU1R3dmNmlDM3FOckJRVzdieTcw?= =?utf-8?B?a1FJZ2RQSFE5djZLeThUaFpLdHVvRStoVkd4M2g3cnBTdk9PSEU1eXFpdmlz?= =?utf-8?B?VFYvU0g4WGlVcWtJV0hnb1ZmVzM3NStnS0VhUUg5QlpTL0l0K29zVUNxcFhv?= =?utf-8?B?MEZHbTk4elhsQ1lPcGVYU2o4U2doZjIxdTQrWGFCUTZQK0JQMnQ4cDU5MGcz?= =?utf-8?B?WHlyb1ZZSTA2cVlaRnlETm9pUFRIV2RxbWkrbjBwY0RmM0xrQXE5U0VJZ2RG?= =?utf-8?B?VDdWeXBIMHRZYVM5TXI5Nk01dS8xdG1BTFE5U2d0NkNMVEFaOXBvNitsUEVy?= =?utf-8?Q?HDZiL4WvDbdYH8B0=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3b3aced-ff4b-42bb-237d-08df0377b02d X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:41:10.2363 (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: aLODwXwTBVcphgvuDh5kmsKJHqaGJ0AZ+p6xPP5/uSTdHiHX37b2Nn/HmhFC1KyAxLQmTyLdi4ohZIxxGjsYvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB11862 Content-Type: text/plain; charset="utf-8" Enable the UFS host controller on the S32N79 RDB and select the M-PHY boot mode. Configure the controller for two lanes per direction. Signed-off-by: Larisa Grigore --- arch/arm64/boot/dts/freescale/s32n79-rdb.dts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/s32n79-rdb.dts b/arch/arm64/boot= /dts/freescale/s32n79-rdb.dts index 1feccd61258e..ff0c2b638037 100644 --- a/arch/arm64/boot/dts/freescale/s32n79-rdb.dts +++ b/arch/arm64/boot/dts/freescale/s32n79-rdb.dts @@ -63,6 +63,12 @@ &uart7 { status =3D "okay"; }; =20 +&ufshc { + nxp,mphy-boot-mode =3D "rom"; + lanes-per-direction =3D <2>; + status =3D "okay"; +}; + &usdhc0 { disable-wp; no-sdio; --=20 2.43.0 From nobody Mon Sep 28 04:51:24 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011022.outbound.protection.outlook.com [52.101.70.22]) (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 B3CA74334C4; Wed, 26 Aug 2026 13:41:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.22 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751680; cv=fail; b=jDbwS1R0xpKegEJ5cU3fbLgcojH3jYlPslfP1kJuvvqPpc6/ZD+B5++hsMJRGBQhPHmteVUbxSy94uWT8GyL/cnpuAhaoby14JGb7aLsEAPvNFXenQwtJGbFVj912xU7p08qViF3e1dXDFIeh0dOnE6RAO2nuYSXpZ+DVVp5RuM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787751680; c=relaxed/simple; bh=QFJpOo19MOGJfPSwkH3FPNr5ZA+OubZrTxt9DuuW6FE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=QhCe1bIDlsdRqo5VqOQBIll9Wn7Bz2iLZyjFnwcf/qpE6YFXefnkbLIBZIA2BrkD/nESE19dU/0aVgKHGnXUkGFnoGrIaXULJQXqucz7RJGq+npN3uSFjpeqCJJbIY4ZRIljJQmWtObw8qsAiM2C/gawIm0jEyCk6z7gSjBYcuI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=xjUQ2ozu; arc=fail smtp.client-ip=52.101.70.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="xjUQ2ozu" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xPBMlZ5Ttlf6/ADQffWwyYf1HtW8rSnvlIAAItEiF1l53A67sq2VPwNYX9I50mNqaD20gSl1HX2eBArzcBVlHTbILXXIrEcJzxTE7KXCEwZH3yPOCGBRcizyi/5YhLU19iNUxijHUXun6xaZmhMxwnKRf9MRzmNyJiZboCbexPRSRSVvFWZm+aWkGciO3Ine+GOnahO8KhbD8FnmLSuI1k88LYQvqkK1eWz81z4wELv4QHlQ3tSz1QG5ojcQzMOpLV8kqdX7vBZGsVJdD6BthycZHkzrr5kzVCT5+6LQCmf5BYcJGDm5oChKYyD4J8GGZOjqWuqzf4bz60Ar7lkq/Q== 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=kf7NDMgOMrqJHg1nXXc3/un8xarW8Cmu7OckwWb0Xws=; b=qkYR6KnTDKtPV+659pr4F4CIw1tQv87uznzPWQflUZ/l68fusYkfxBvxpx6XWVulldDYCcaPnrqxBHfrGHQQNQ9LfUlkieG7TLA9eBxi3Zzb7BXoxFU3+Fjnx1cf2aJbEZCRBKtOaKegpuhIrpqUWfQf0OpI9xJdRojM/XCLmYT8keIc6wUOsnznn3+J9lKHUKdL8kaFWXqd1lYibb2WoK/my/32n+pkKP4j5+RnzDXeorLNPgP/lUp146InK0AZjkXPIbPAqBhb1oGaBAcI0sEUDfA1CpZvbHCbVIwSNZw99+w+2zJWcMMN75kA/ZHXUCFni/CI+YdeQTalG4QgBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kf7NDMgOMrqJHg1nXXc3/un8xarW8Cmu7OckwWb0Xws=; b=xjUQ2ozu0BG9a+oF1K0wTq6ioliFBBarmhB/Az4Zvyp8P/jHAnoTKV9NQgBo5jDXwIwINlx+YSfVHhas/1B42HVWUynZck01pr5MuIXn/QqeAe3mMxF2WW5RqkK4hMx0tlCCRjVKuZ8S1lnGtLJAWsHgou3VaLCp22H2BBZgxAUclEOV48JT7H0GFUzbcxR0YTdbAAWWWHU1NgqUdYJDuDlidL+S/UIIiU24qTpmYM6njW+lvtr3qLRpWcf2yApt0c36RngVw2vhoD9p6wBIehFT3pCDVhsUF44KE35dqG+ciVLeS7h8WdihxJSsaHPxQH20CMs7XzIYO4BIWuVlFQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) by AM9PR04MB7556.eurprd04.prod.outlook.com (2603:10a6:20b:2df::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.8; Wed, 26 Aug 2026 13:41:12 +0000 Received: from GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49]) by GV2PR04MB12558.eurprd04.prod.outlook.com ([fe80::cd9f:102:ea58:4c49%6]) with mapi id 15.21.0360.006; Wed, 26 Aug 2026 13:41:12 +0000 From: Larisa Grigore To: Larisa Grigore , NXP S32 Linux Team , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , "James E . J . Bottomley" , "Martin K . Petersen" , Sai Krishna Potthuri , Ajay Neeli , Manivannan Sadhasivam , Pedro Sousa , clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com, echanude@redhat.com Cc: linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 10/10] MAINTAINERS: Add NXP S32N7 UFS host controller entry Date: Wed, 26 Aug 2026 15:40:48 +0200 Message-ID: <20260826134048.854748-11-larisa.grigore@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> References: <20260826134048.854748-1-larisa.grigore@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0428.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d1::11) To GV2PR04MB12558.eurprd04.prod.outlook.com (2603:10a6:150:368::10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR04MB12558:EE_|AM9PR04MB7556:EE_ X-MS-Office365-Filtering-Correlation-Id: 22ec0579-579c-4cfa-b2af-08df0377b143 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|7416014|376014|366016|23010399003|1800799024|10067099003|56012099006|11063799006|22082099003|18002099003|921020; X-Microsoft-Antispam-Message-Info: YtVrYT4gQgYhTzpAc3n3YI/LGnLWlMUxwFPQeRhB9d+3ju6Qb0PIc9eCmwlt0qdEFnDmvZox2pjFa2C8JmmSxSvor72gS7y76wlYs5B1LPHZZOVF32zAiPIvG8y2CwOJBJ+xnaFqZ7ldyY902Pg1U5QkB2IXkNR9AoWx2AHZtt7UnukYCFmwfP+DZYuZkBKkzD5bK19wOrJa2iJawZRsYYRVKvA8FAl5bg3RjENloQ8UdZ+W6dE3eHjWwBQf67vyDeCc6ovZ4iDZ38I47YQf8Z+iEhbKrBA4zlxGXjFPlybYZqidu3pTLUSTFvJ51t5vr5TFFbt5NQ/l0PcY8xpH8+uzddkNK4CXjNesDOAnLzaWlzSTIUAVojLPOxs5dT4Bxlp52WohfqVpw0wu38AGY06b7aXdoZStHwjKtm9PvBSjp7J6Qrc3Y8/daecMmWEWQPTsiNQrTQSc5btdJQ2MxArVVzYNUXXnEnpQJB+epEED9XKIVY2gy/FFfyoguZ39RQDhjJr//qRdk1zNjZhRFeqVIbTLvjxYX7oTMdpEeWtXKlsClDpbrohGJgcJ7FhIWW0EwijLksjjDzQlD1GPPg8FRCTZTlXJEYSJ2aNQV/NV/felXqkvHgzy+82iByZVaVFTraU+maT+jBNnLtn6p895IDQI5fspfEjKE+C6QvPRFged55Fw9+IHUzhXazl3B02vpiKTJN7YUdjjCJdrgw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR04MB12558.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(19092799006)(7416014)(376014)(366016)(23010399003)(1800799024)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c1lldWRxeVlGVWhzWk40SW4vbXlkNi9qaWtuK1FuUmRVOURGaGFBbTRSSTRO?= =?utf-8?B?c0NNTGVMWkk0QjR2VEUvajhOV2RmMlo3aFJYWmFxSnNoR2wxK3J3d1NIM0VO?= =?utf-8?B?NFZHOEtJSzdJOXN5bkwrTHNyaFFJNE1Ub1huMjVlckpPZS9Da3l5UHdCMXl5?= =?utf-8?B?UWhwOENJcW03SVBzbjhVWGUzSzVqOUh3dVplRDBSTS8wZjdzN2w4RmpJdUJu?= =?utf-8?B?QWtXclJIemdCK0M3Ky92MlFGb1NTakhoRE9WS3E0SzhhejBOd25TOU9XRXha?= =?utf-8?B?ZFJZTUlEelNaTy9kZXhOU0ZZVjhxUFB4REt4THNyanVYTXRBMno4L3ZLTkw3?= =?utf-8?B?YnJ4MVQ5elNhdExMdVVtaDhzODYzZDVOWFFkMTBOUHlOUWMrTi9wYml4a2lq?= =?utf-8?B?dUVvZFJzeEw1dGR4MUVvczRuYTlMZWJzbGU4NlR1Wm9jck9EYWpkM3hab3ll?= =?utf-8?B?ODhtUUJkNGtOdU9sRUNRQUUrSFI1V0lFa0Z2QXNEQ1M2bUJhV3kvTFh0VUhv?= =?utf-8?B?bExWR05IaktsdjR6SkxkNjNHcTA4NjhzTGd1eVl6WGlvSjIrVGxzbTVNUyth?= =?utf-8?B?MUdLc0Rqd2RNNkJvaHZVVUNzQm80WW4wQmgxN3FZVE84THdFNHZteGtJM3cy?= =?utf-8?B?TmtxRklRcjl5c3lqU0hVRjZwc0VORjdPa2VkSVkwZmt6UE1Mcm1UUGExUHV1?= =?utf-8?B?VTZ4UDgzUTI5UVZTNWdsVlJ2TlRVOFZGb3pzUStsNFdCRHliN1d1TXhHakNq?= =?utf-8?B?bmNWS3F3d0gzU3hBZXNWNFY2RFA3cHhycGhKQmNYUCtSS0p0WG82aHVqVWNV?= =?utf-8?B?Tk1OUklSTWR2a3YvWW9HNjVoRnd1ZkUrTEM1S2FlM1ZpT1lCdmVyNjcxaEFB?= =?utf-8?B?VTJqWkhkUGZPSnIzS3ZUZXJGb1Z3M1ZIRHBnSFlINklwbmxOR1BjWGIvSFhK?= =?utf-8?B?WmdZQ2IvY2RmNE5XOGNzTEt6RnJnd3l2MkZEeHdvdUpUSS84TEtIb1o1ZTZT?= =?utf-8?B?LzRINWVZVUlqdzRyZVd6eGNKSXl5ZExZQjBxR2FHU0NJNXZiTEpyTEw2SVNK?= =?utf-8?B?aHpNZ1BrTk5YYitRMngxeTRMbXQzOUZNcGlZRy8zelNxZUdiaGIwS2lXaTl1?= =?utf-8?B?Y2tHNm1yd3p6cUs0RGI5TmZVdjhFSGlYQk9kY2JwdDFVWk9zUlo0MGxPUHRn?= =?utf-8?B?RmFRR0JtaXlHck1BdXJGZUNqb1FBclVQQzhzY0wwcWJ3Yk8yb2FIL09CWHhi?= =?utf-8?B?OGd0aFlaTmQ0OWQ2SHp6UlU1V0lLYisvWW1LUklZdzQzTUhEWHFmRk1jRC8r?= =?utf-8?B?aEhPS09UOXRNcmhmUzBXWUV4NzJ4Z3lCRGFoWElrNkNVUEFRdWhFZjFFc1hV?= =?utf-8?B?ODNxdUp5ZFU2dFhpNjJRSUhoR1VxTXliZGZoaUZHSG1XR29SS2k1UTFOdkpH?= =?utf-8?B?bjhkeEp0bDZEZnB0MFR5RTJINVBoQ1JSWXZ3SU4xaDE1YTFiNm0xczZwcE5k?= =?utf-8?B?ZFRoSmtYelZCeC8rZWZRNHIxUGV3ZU5CT0hHRGZEQ1MraHo4OExJS3BFclRw?= =?utf-8?B?ZCtVZk9ydVk5dytOSW9NV3FCYUlnNGxQSDNLbW9XSGJtSy84ZHVsUTVaVzFO?= =?utf-8?B?MFl4dUN5Tnkwa0ZhZ0QxSHNwOEVRTk1zdkZiQlNUR29GUmZnWVYrNFlqZDg2?= =?utf-8?B?WEJKR21sTWprYWQ0TGtETFJBdUdNalluZEx1MkZrcmJ4Nk9RaVhjNmhLbUpo?= =?utf-8?B?Vnk0REl2UktFWDZxdGFtUTlONStMRWxCMDlqc1l0NTFLSFV6cGhpWEh4UmZw?= =?utf-8?B?S2UzTHN3OTZFOTgyN0E1eWRmREk5aXdDTlRTNDJrNTBxWC9hOVVWak4rNHAx?= =?utf-8?B?ZHhWM3JkTGVQMmh5UXZ6cXFtT2VJMERvbnBBTHIzMS8zN092eG1CVTdPNEhL?= =?utf-8?B?K0w3SXg3ZStFcXpIYVFXYkJLZEhzVzJYaXF4Y0dxUmZIRThsbWEwcnJNSFZI?= =?utf-8?B?TDg0aUM4VmdZb3hnZ1lGU3NLbXV1TE9aTllER1A1dkdldkZPNzl0Vi9yZFhE?= =?utf-8?B?dzRXK1lKSSs0RmNZaWJXa2JwbXREMzZzRUJlbVZncEh2L2VvZ1ZuM2txUEpS?= =?utf-8?B?Q2NuOVpiNXF5OUpKczJoM1RxMmt1L0FIRTQrQjRUMWZJU2txMVN5TUQ2UTFG?= =?utf-8?B?Y242cWN6TnFsVjJzV0pJbnIrS0RNdnloa2Z6c1FLT2krTHlTNGZWWS9vTkVX?= =?utf-8?B?MGZLNWc1SC8wMlJ0dXZjL0pvVzZZanFOT0M0QzJCR3dKdTRXTU80a0k3UXNE?= =?utf-8?B?Q3V3M1JnQ2xNZ1RZQmhlOWRWVHlzTldCV3IxWjJEZE9wWi9EeE9NYUxrQWV3?= =?utf-8?Q?0Al4xAtsohlchzWA=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22ec0579-579c-4cfa-b2af-08df0377b143 X-MS-Exchange-CrossTenant-AuthSource: GV2PR04MB12558.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 13:41:12.0735 (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: iL+yK27fOqU/pHvQbHXsReD44FGiajm9/NYo2VBbrm9KY6VwyVdA6sn0c4eSZ6geci/C8UBX0WOkXm0BgTgWhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7556 Content-Type: text/plain; charset="utf-8" Add maintainer for S32N7 UFS host controller driver. Signed-off-by: Larisa Grigore --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index cfee5d47b214..cd9f1d0c5406 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -27768,6 +27768,14 @@ L: linux-scsi@vger.kernel.org S: Maintained F: drivers/ufs/host/ufs-renesas.c =20 +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER S32N7 HOOKS +M: Larisa Grigore +R: NXP S32 Linux Team +L: linux-scsi@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/ufs/nxp,s32n7-ufshc.yaml +F: drivers/ufs/host/ufs-nxp-s32n7.c + UNIWILL LAPTOP DRIVER M: Armin Wolf L: platform-driver-x86@vger.kernel.org --=20 2.43.0