From patchwork Sun Oct 27 12:00:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 13852500 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060.outbound.protection.outlook.com [40.107.21.60]) (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 1EAA216631C; Sun, 27 Oct 2024 11:50:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730029819; cv=fail; b=WFLUDWjZijyyM1rg9pb0sh14yohsd43y+IijghWmYnWScyncFO2YLg4i3bHScDTVDnn1Z72SELZzvZfApZ40gdDJGAC5n8E94KQ+yggcrAbud+nkP+acJig+d4lgDce78B5z3rcHZpQqzMh2KnLFByd5cGYyhk+GmnN7+D+HVhk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730029819; c=relaxed/simple; bh=DWEYRqS78+d9hSFm1aNEF7U68gsD7S4JOQqzK3hgEtI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=mcmYNh2nTYwFLNzO6GwY/ppvBf0setTmGUaC7dhsu8bSKtzyPpDYgXFZrkNN9qmbjBaBvJpcyhlGpWcOqCwIMTeTBVvZUaAVZIqf0ZMlGqVka+x3nkQ+WaGdD6LxNIcP+bNvmQZConYJnhNVRv/HTZNAYKD7PzzCsQiLbPNqpeA= 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=pbxjIn9m; arc=fail smtp.client-ip=40.107.21.60 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="pbxjIn9m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=emxw4LreFEk71+21SaSWo7nbumo8bCGauwMgFVhFZD5bTFGzqGrLDM4+IxxwDRsvx+bxZt8S4HSPeiyLI859zbYziLlEeVN9CevcO41xNluBWNsTUtNgaBgEzUBAEjdDfgndhJuAKw6viJ+HYcbS1x396O0ira2cUmoqZixn4YeCdMWvVC0Lvl2pKwKWIHXVUgzFsPlqPCZqJ537r7aKWyunYw5eYFFW/aFS9ZwnlsgyEi7ZKIUpq8dyst8h1tITqBsIvlhDvd3kNYcxR+mVAdm+KsMj6KKh/pIY7b+H/VmD8+2jKBNKanenQz+z3ne8F0QnPlavPJ8K5NdNXjJm4Q== 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=dKK38nCOci4ZCIoXe5gEa3U4nuztclm+S/58tn7qlss=; b=brYH210vPkX7uoXvCGrqlSOL/qmhAS8IXpIil4bUFHSojPQjcWyf7kg4paOGk5SBrgqpx6VzkNz3lxW1mRWKPGlTAWSctyCLvJjSGf+Ovo3aV3WzOpCd4PRF3L7yGW2AfrIadb6FwKC8QGgcjBpVJJBYQRyObyrNlnlrC5WZ8W030M6xd0kDAIyglkcfD1241wYLZY7EZOkk8/FYyiIq+LyUK6VRWFAW43t6COqM7TNU9MH6mPEmTdiMAMfdF1RyzbUuh+vzm9cLJHQE0ELdwVnLZyzQBkbzJe3yPxqEE/pBIJnBMYQv9/OLxJKv/mSVx7dKLCgHffrflf+3T+wu5g== 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=dKK38nCOci4ZCIoXe5gEa3U4nuztclm+S/58tn7qlss=; b=pbxjIn9m7Zgcj0kCZKmvjiWN23KdZDJ+IrZn7WA7Bvu0kE9iqG8HMnjzj+cdzgyJDW2IeloxeoL3T3tr3WaOqSA8wFC5jgT7LUjwEBI0aumgeweP56M/gRS16FWJ4/YRYlLyTU48sc2ecRm9oXAwnO3yNFCe4E+GFXkZamZ0Nbz+OlGkZfrNeTrdopVDXV7+svKh0/X1aZXUXvwveRwIvauaTg4KcXlBxYbWuOICESrh8t8jZBYejYHgFM7AUKAANR8JH3L8p2XaDLlrB6m6veHG7hDHD808l+iObsjevqdYKgYRBw/cR4dyQXI/6x8fkYD0/bnqIRthXTfQbK77WQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DB9PR04MB8461.eurprd04.prod.outlook.com (2603:10a6:10:2cf::20) by AS8PR04MB8689.eurprd04.prod.outlook.com (2603:10a6:20b:428::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.24; Sun, 27 Oct 2024 11:50:15 +0000 Received: from DB9PR04MB8461.eurprd04.prod.outlook.com ([fe80::b1b9:faa9:901b:c197]) by DB9PR04MB8461.eurprd04.prod.outlook.com ([fe80::b1b9:faa9:901b:c197%5]) with mapi id 15.20.8069.016; Sun, 27 Oct 2024 11:50:15 +0000 From: "Peng Fan (OSS)" Date: Sun, 27 Oct 2024 20:00:10 +0800 Subject: [PATCH v3 4/5] clk: imx: clk-scu: fix clk enable state save and restore Message-Id: <20241027-imx-clk-v1-v3-4-89152574d1d7@nxp.com> References: <20241027-imx-clk-v1-v3-0-89152574d1d7@nxp.com> In-Reply-To: <20241027-imx-clk-v1-v3-0-89152574d1d7@nxp.com> To: Abel Vesa , Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Aisheng Dong Cc: linux-clk@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Abel Vesa , Peng Fan , Carlos Song X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1730030419; l=1313; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=3X/Qf8yxkbiUb4z7PIwDr4+tntiXC7Iu2g5/3wMx1uE=; b=VI+Lsj5R2/35/vQhujc0PD5alNCf7KHi/4s8314O1YMtpUo1hUYjxxKz0Ns0behxdgRhNha9w 0Z+P3rpe3XLAM6ih9NS+2CfqqyuyxXDq95o3gx7knYeAYB2ghDPG4OE X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2P153CA0011.APCP153.PROD.OUTLOOK.COM (2603:1096::21) To DB9PR04MB8461.eurprd04.prod.outlook.com (2603:10a6:10:2cf::20) Precedence: bulk X-Mailing-List: linux-clk@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: DB9PR04MB8461:EE_|AS8PR04MB8689:EE_ X-MS-Office365-Filtering-Correlation-Id: ba2e4a91-853e-4efa-cdac-08dcf67d85c1 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|1800799024|366016|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?0MsaxTi+3jND+nCtgphkZlULNo7EoCb?= =?utf-8?q?8a7sWDpvG/C3HDTjLQcbpvL3hKwnfCZLxxNC9/pa0fMjFHXAuktW9fIScbkcgs2Br?= =?utf-8?q?ponnrGqxIaVoQ4OwFfFWzQDKHcTJsMa6ZnVyu1hKGqCtXydfL18GH7lNX/kpFz90q?= =?utf-8?q?VaQOvpQJMWtMSHE3vC3cJG/q0PvTTlg/FhJiCmhFa2/7Qu9JgbI3ZvfTNLRM2HiIJ?= =?utf-8?q?c7mE1IvVSYCESX/64UruN9QA4cOoQnosL2iiQ/VG03TIJIyOmoK2oVKJQgnNh5NtH?= =?utf-8?q?ZYGvYpLiznETthu+8hNpEKQadHmGVnycF0Bck8qVCEW3wwpkfVSusppZE5E+lrZWe?= =?utf-8?q?KTh4AcPJh5h4AkGj9dD8RjIY9iEyxqUBDV2E+bjHG2yr++czXdbKMv6wsq0kYgFMG?= =?utf-8?q?Y2rCEKDUqQ6pEPuiZCrHBAs/mxfNmLT5UuSpOayUU0Pc5KJpb76PLWPw/al+dypfs?= =?utf-8?q?1GhF+QIQ8SOfIaxq4yxA87S0XdrURaIklT2aOu1Zvwg3MSVkB4knZAkq5MHM5Q5SA?= =?utf-8?q?E8/Le5VMRJAIjWcE4X8PCAIP8CsqCxLwNEQl6mch8NNthy3KPgLE6DBSWTzOnMKOf?= =?utf-8?q?QwulJmICuKGRB+h3MPy2GfIxCtm0lPHo2+Bt6TVfO9xSPfXoK1TIL3vduiri/hNrd?= =?utf-8?q?UvbV/CKOmNgvXVHuswh5tRvlIZyBP4VlK/aJZXQqZRs29oeFJrH9+vRCk0Gcm3b6S?= =?utf-8?q?+3ZGf2LvfW6HH0gaExOj1lz3PLkFrpfYayDIgHtyj02PB0pbT7oCQJZ3f5rx0cZhK?= =?utf-8?q?YbENripaZXYxwEVVwpBc2EvR7cqqS9O1wpCgXqR2MiHE/PhXrRA1G9lwuZm6wnM0C?= =?utf-8?q?WYe1L7ndonNIgBjw1+Xjb/aKlDPoEq8H/3M5FV+i8Wp3awQLL+muHV26wtrO4d2wg?= =?utf-8?q?Er4uHENse7f5oVBlJ2b4vSopdftG6hsaBOjZCms2mEt3sTdqrr9iVLie5ke3FTayB?= =?utf-8?q?m35CEpSTY+lblFnV/TuH/RqIzNrxTsh14U8Blp62BT9yIlJQ5SAvYbZcLpVxLlUu6?= =?utf-8?q?ZCIDfOp5ZopZbPlXifzAP3Jq6IPBgZNstRtt4D79Yl+dhGp4rjhbOfxdbzXp/gRP1?= =?utf-8?q?jJEOR4i/egXGK3NxLGOEM0LIlPE8DiORGUEfQHwAgunlsXH26T2m06dA8L9yjGMl3?= =?utf-8?q?OKzMJv8LRyI6/8HhX+BvEg90bXVnHTcEooEWKpUzYDx3ObBRW4SwPRxRh4qul15og?= =?utf-8?q?6AKsP9C8eZS4yZ9t+SzVnQkN3lJ6Er589RKEf+1F3w6BTEtF3WnC3dKU7kqLLxszm?= =?utf-8?q?v9oxm0RM58rAimCWsMQ8KGBiR3pLLYb5/unnLNmht6poN4891HqpXZyM=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB8461.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(1800799024)(366016)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?n6Lsu/4gu7POt0sEY8yNsZpauCQh?= =?utf-8?q?YXrkgMo0Pzm13Dz00HyEHfVL+ruMJzKqSW0MqG5nhn/pzS3ce20697ZKGhUjqnsSI?= =?utf-8?q?mrRzRunf26OkzNYuREsoKroO7N2+PMrtPEw+atdrCqKP0k2KcmNi4VotVu/ATrmqK?= =?utf-8?q?Qilh65++KRgMbgQUsX7u6ROOK4aCMjjUfbGPWg6BJzGWU7Hz3oL/vD8Ot6DsHVjmZ?= =?utf-8?q?1Vs/7T6CvtozaSHQqBy5IQFzJBYVVuRR4gSffp7wt0qBSP94ztzMhnVFUfUF/tLHh?= =?utf-8?q?jm+c5gXQ4aDhZfp341gA9L4no7f9bdsQMtRHxsG4FsqEbtFiybFTBj4XXS2bZR2Ao?= =?utf-8?q?hGeQ0N8ZijO7kFYvhGORvnKxi/7MdEtg1rUB792NkRwM/BsVGWIdVT9nL/Rmjami2?= =?utf-8?q?qLdSPkqDbMa7bcCgXRHayEkvT4QpZuwDFow7HFektCs8fjhDUmN1qJEclPYBOwq14?= =?utf-8?q?uhRutESnu35EGzN3n30EXVnohKWuk9lxDOvv3A0Ug2DreuBd1+41QMOWRJe2Wbtyd?= =?utf-8?q?AxiBC/eaMYOGOjTqartdhEs+9VoFp2VXlhLw1BC/2virzmpTBRzWTHO6r17alDG56?= =?utf-8?q?8eyM4NTARLOAoVwaz9IlvZtb7ittvIj6PePMWT6hHnTzTwEyEukQtu1Peej76Vgwp?= =?utf-8?q?yoVg83eUMK/uQE0ufKloOBiWBu4fl2vUzC4zbRp2/a5+AD2GZWILVCIM5hT7HUdUq?= =?utf-8?q?6krvatM4+4bgm9j2EyHW3wfcJmId+YgV/Sc+5nSU4gPRV2ork9gFTv3UMlezmAWuh?= =?utf-8?q?DUw59LrYGMzB8RNOKhPcsJ1qkXLmKEbf8xKkROQZ9tuQIUtVQ5DKX2+huyWRUDZ2L?= =?utf-8?q?fjdi79l7ZkQaclmQmZ7vnKcci//4qr8n9vtPRLH4NcQ7gKOlQ2FBS9JLWv0KgVdDe?= =?utf-8?q?OCsnxzMhTEe0VPoVhOloXnkXol0w1HmyBy+lOrPPx20exy9qbvfzW1wCPEl02GbT/?= =?utf-8?q?mhSi5umcUKzmitkFJuC35M/iIRHEmPFOW8qp5NAGaD2Y06TBkZwUqSGaE9veqNo8q?= =?utf-8?q?Ocl20m8cloptpBj5bA+iqqap3CqW8z7ZqHdfEc767A5Su5ByWQ65V4f6qY0PXzq1i?= =?utf-8?q?GFOwDr9rxVxee5oYOc/np8Fxd2F/qOOA4kUz5V4ehx231b3VUYlcw5oVLbKAIpHDy?= =?utf-8?q?sMQ9vhjbvQZ14XWMsnOKtCjxZPrGxF3YFNUHNDD31KGrTFJObnSMWLpLYNBk1b3Bv?= =?utf-8?q?LJtY2wKMzNondB55Op0lm/tXY9RKbnBlbQiWy+MXOLsLVkmIHF6PrgE4y8Mun6k87?= =?utf-8?q?OqDqS5jow28n4GPgQbhOX1n9Z/TweuHhyymXZ/CTFMrPH7vrD4JK0Aq2X3g4BZOve?= =?utf-8?q?xQPpvtMGYCVk5loF1dQVis6QvuQTuhELLPwoVySl2epOb/naXPmkL99TYIp6z5BE7?= =?utf-8?q?+dvx+7DeBlr+mRWNd5pyt4vbY62jAIwtWNacDm4Moy53RQhcnuVLAEsk5gs3+x7Pm?= =?utf-8?q?ep5f4LxM4FUMiD97AgIycCq4omAUAgomIHjsyernhtvF8u12/klWboLHMIO3/yPOR?= =?utf-8?q?nE6WUwjbG43O?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba2e4a91-853e-4efa-cdac-08dcf67d85c1 X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB8461.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2024 11:50:15.6191 (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: tUs9iwsibw6nou/HZ6q7KRcPtFO6optK/8m5oCo6awU2ZlnDwXQaGEM/xiGLSRWA24ROMNCCTQOHQc+ABIYhaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8689 From: Dong Aisheng The scu clk_ops only inplements prepare() and unprepare() callback. Saving the clock state during suspend by checking clk_hw_is_enabled() is not safe as it's possible that some device drivers may only disable the clocks without unprepare. Then the state retention will not work for such clocks. Fixing it by checking clk_hw_is_prepared() which is more reasonable and safe. Fixes: d0409631f466 ("clk: imx: scu: add suspend/resume support") Reviewed-by: Peng Fan Tested-by: Carlos Song Signed-off-by: Dong Aisheng --- drivers/clk/imx/clk-scu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c index b1dd0c08e091b6b61f6972eb630adacaa4f288c2..b27186aaf2a15628910ea6a3d4aaa5320ec4295a 100644 --- a/drivers/clk/imx/clk-scu.c +++ b/drivers/clk/imx/clk-scu.c @@ -596,7 +596,7 @@ static int __maybe_unused imx_clk_scu_suspend(struct device *dev) clk->rate = clk_scu_recalc_rate(&clk->hw, 0); else clk->rate = clk_hw_get_rate(&clk->hw); - clk->is_enabled = clk_hw_is_enabled(&clk->hw); + clk->is_enabled = clk_hw_is_prepared(&clk->hw); if (clk->parent) dev_dbg(dev, "save parent %s idx %u\n", clk_hw_get_name(clk->parent),