Received-SPF: pass (google.com: domain of linux-kernel+bounces-168461-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Sat, 04 May 2024 08:48:55 +0800
Subject: [PATCH 02/18] clk: imx: composite-93: keep root clock on when
 mcore enabled
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240504-imx-clk-v1-2-f7915489d58d@nxp.com>
References: <20240504-imx-clk-v1-0-f7915489d58d@nxp.com>
In-Reply-To: <20240504-imx-clk-v1-0-f7915489d58d@nxp.com>
To: Abel Vesa <abelvesa@kernel.org>, 
 Michael Turquette <mturquette@baylibre.com>, 
 Stephen Boyd <sboyd@kernel.org>, Shawn Guo <shawnguo@kernel.org>, 
 Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, Jacky Bai <ping.bai@nxp.com>, 
 Ye Li <ye.li@nxp.com>, Dong Aisheng <aisheng.dong@nxp.com>
Cc: linux-clk@vger.kernel.org, imx@lists.linux.dev, 
 linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, 
 Abel Vesa <abel.vesa@linaro.org>, Peng Fan <peng.fan@nxp.com>, 
 Chancel Liu <chancel.liu@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PA4PR04MB7726:EE_
X-MS-Office365-Filtering-Correlation-Id: f7580939-a12b-43fc-4ad0-08dc6bd2e663
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam:
	BCL:0;ARA:13230031|7416005|52116005|366007|1800799015|376005|921011|38350700005;
X-Microsoft-Antispam-Message-Info:
	=?utf-8?B?ekxueEoyZHoyK0tQdnN5V1Nvb2R6MUVFaExqcE1NMWw1RTlWNXYvcWs4b3k2?=
 =?utf-8?B?OVVOYkNzOEw3OFhtM0xmTHB1OFBtS1RjYm1wV2xiTllDMnVyRHd4SFhCOEJZ?=
 =?utf-8?B?dEdDWEd6YnNHZ1UxUnJxTkN1QStUcW9CQlJvVWpiWHRHbnN2bFhaQndFWEVl?=
 =?utf-8?B?Mk1xODlwNUNBQVA2VDVjMThTaGpOeGF2Q1Z0MWFuQ3pkWnlGNVVYejZiUEV1?=
 =?utf-8?B?Y3ZHMWMvcnpONHZkdmdTNWMvM0dHT2RqLzJRUG9IT2xhUS9ZN0x3dXIvZGtV?=
 =?utf-8?B?TER4TTRKMVh6Q3JCQzBwL055SmdLYys1SnpOOTMwUkpZcGU5MEhHV2tvSStr?=
 =?utf-8?B?amlEM3dGd0paK2FSQmZ6KzRsKzh3N3JEN1VMd1lwOS9uZkRCQ1lBN1Yra3Rt?=
 =?utf-8?B?NHhvU1JqUjJ0YkUxT1Z1b25HSEg3djRiRWNZdS9Sc0k1Umoxb29iSjRoeHJG?=
 =?utf-8?B?aUIrMWpBZFNIZDFEN0FxeGJ5OElhdEwxd2V2ZG41U1hNaCt2dzZKOGlXYmZ1?=
 =?utf-8?B?b1Ira29vZ2RoQzc0ck8xWjl3YkdXSmRHSUZKZ2pXdHZjNXVqSEIzSzMwVGNZ?=
 =?utf-8?B?anp0REFCeDlZZ1pUYnJXMUZ1eS9MdVhDbG4zdTBWbGRkZ1lkSHBvUlBSRWFn?=
 =?utf-8?B?MzlNOFBtZFZUc2hTYU1vcXNOMmxteHRuOERCWGNVUjdGZzdZemtQOUd1RXBU?=
 =?utf-8?B?VnllZHhLbS9zRDNXekt1QXM2NDRnL3JRMytVdEJZc24wdlhNN3hBelMrTEw0?=
 =?utf-8?B?M3hXQUlTUnhzelAybEZsa0NUY1M2NkxxNVZQcHdXOWJiWS82c01TREFmRVpO?=
 =?utf-8?B?WmtVYU1DaFYwLzJ2THUxVXh1ZkFMMmMza3pVbzFHU25GbFNMSSs2blhMZWFs?=
 =?utf-8?B?K3dMY09LQlo4WXlPMXFJUTRudXlCbkd3amx0S2hMdVZUb3FJZ2VuWFdOOGZp?=
 =?utf-8?B?QWlXYlJyWkNETlpnZHdzNGtNMmh3eWJRNUl4QXoyTTZ2QStlUFhIWkRxcy9z?=
 =?utf-8?B?TWlsY3Nob2RkTGxpZW1EcTZlYWlHbXRQdk15dzNYRDhWdG15U3l2WXE0TGZk?=
 =?utf-8?B?QmpHNWNQZ2U4YzBrZ1Z0bHN5OWUyMWdxNGRpUTVOWjAydURXK2M1MjNtLzdl?=
 =?utf-8?B?a1ZHQ1RCZ1JNSVptZGtSU0NKZmtTMHVHajBySGdobEpPWXZTQjg4akFnMXhw?=
 =?utf-8?B?NVFXUmZ0ZElTZ0p5TjBaREd6NVBXNjZtVis2TWJyVjg3NnI3Wm9QZEhZNEh6?=
 =?utf-8?B?UTkxRDgwSDBLRU44VzVNVkVoQmRrc3REZ0pPOFI5M0FaZ0c1K0JLc1RKbmtl?=
 =?utf-8?B?QW5KUG1QeURUM1VGQVJ1QStQcGFmaURwSzYxS09tMmU3UWNJNkVSY3NQWkZh?=
 =?utf-8?B?M3h3WXhNN3krZmZKV0xZc0JNTlFudVNkNkN3QUkvVWI2MnhxQWd2YmR1QTY5?=
 =?utf-8?B?VTNjZkNrb09NemZxb2kxWUxDTEVpYkNlRGFTc3dUNHAwN2JxalBud1BYV3h1?=
 =?utf-8?B?WnZ6RDBiYkpjQ3VIbEo2VHFjQlB5U1BTYTczTzlYS3V0WHpqM2Z1TytvVXJ4?=
 =?utf-8?B?U3NZQ3B5M3pvS3Jub1JvSlE1aTZpRUZISE83UGRjOXBYNWFYcEZOREFsOFIw?=
 =?utf-8?B?ZnByOWlaTVo1ZzRWSkRLNTFUR0pyWUliTmNrMng3N20yRXh3b245Y29vNU9W?=
 =?utf-8?B?RExOTGJaa200cVJ4K3pHdWFHdXQ2K2ZtNERIM1BMVHJLN0JBWW82Rzc2Y0ZH?=
 =?utf-8?B?VXRET0RjdTQ4R0g5eUdFZ2o1Uk9aL3pNWkhMT1c5VTFybkJIdWdHNEM4OU1X?=
 =?utf-8?Q?0SxE8gZTaLMYrZxy3DZg/3ayoCcbOFeBpubz4=3D?=
X-Forefront-Antispam-Report:
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(7416005)(52116005)(366007)(1800799015)(376005)(921011)(38350700005);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?T2xXb3BSd1U1MlVPTE1sVzBSOEw3dG9yYXZHdU5qWHNKRFpONWgzelMzaGdR?=
 =?utf-8?B?QjdLSGhNbzROSlR0NUFHQ0VkZmRMQjY1QTBKbFV2bmRVcHcwb3hwdS82Qzht?=
 =?utf-8?B?S0t1K3B4bmFPUHY1RmVyZkNxcDRnejg3L2VqZlZzOENyS1N6K0pIZlFxcjNj?=
 =?utf-8?B?blpGZ1NMNnNlUnVWeWFWUm5LS0c0WXI2V05jZHo0Nk9uWU5UTEJiR3IrQXVt?=
 =?utf-8?B?N3JSUXkzTzR4aW12TTgweGZOUTQ4VjVuMTlGV3Uzd0M5R0tBajJRWHo4aG9C?=
 =?utf-8?B?VDlPcXpuUnpnZTJpOFN5SGw5bDRtL005OWkzVkN5TmVQMUhqdUd0VXpFUm9Z?=
 =?utf-8?B?TDFWT0VjTkZOVGtVOENHalM4Q2hIUUx6SmN4Z1hBeW5xZWZnbkZiOFB2czJ3?=
 =?utf-8?B?aGVzTmZzSTJ3L2NGb0NNTXd5K1V3OGt0N2d0MGVaS3lFY2ZsQzJRZ3IyQUEx?=
 =?utf-8?B?R296Mm9TMGNJZXRFSi9xVTBSUjV3Z2s3VnA3TXBNVzBxR3NJMHRTQ0xjTUlP?=
 =?utf-8?B?YjFjSXBXZ0xzZXJEUUQ4WXgxQW5TUGhsQ3dZTnE4aGNxb05HOUhqTVpUSzZL?=
 =?utf-8?B?MTRhRnFPK1gzcDYzM2VRZkxQSi82TUYraUx3SEJOcFRicjA1SXpKQ3EwbHd2?=
 =?utf-8?B?cElIOWxEalpVMzhxTEMyMTI1aDJURHhqeTVyLzBOZmQ2SkVXd09sWDJtMXpJ?=
 =?utf-8?B?NFIzQ09jQW5tUGRQUXFqaDk0TExYZHo2SnNBYWNmV3VQa001cDBoazM1VUpJ?=
 =?utf-8?B?eVRaVUJOaHFVVTh2TjFmck56aGUxR0FISWl4MDRpdE1WN3BjYk9oQ2wyb2Y3?=
 =?utf-8?B?ZDVIYTZaNkoxd251elVXWmtGVzd2SWF4VnVkK280MnJROTBka0pmRUNUMnZh?=
 =?utf-8?B?ZUxzbEZza1dlTzM1dmI4LzZYSU1HVWMzQnZjbTF2R2g0UThIYUJzbGZUR3Jp?=
 =?utf-8?B?YjZmVmRvVXdDVFloRzRQT3MzWmRjOTV2b0YwTHVUZjNBL3Jub3FoZi9ZT0lV?=
 =?utf-8?B?SUFIZlVTSUNFNzZoRnZTS0lwNGxhcS8zbmUrVS9RaTl3M0dEaDU1T0FPT09X?=
 =?utf-8?B?WDBtMDJ6TGJubVlRVVdMSmQrTWlrNmJMWDRSWDlodXpSck0zU1NqR04yVTlt?=
 =?utf-8?B?Qi9zeXVXdC9rNXlMWkN4WVRJSlhBVk1tSVloTTVOOThFdDJQYVdubjVmWktw?=
 =?utf-8?B?cml4dzVac1RodGNPTUdyRXdISmt1b002aXVGL2FOcDRyZ3RYbGlXd2F4UUpD?=
 =?utf-8?B?VHZhMVRRdHFOLzFBbWNKWE8zTkVJbkZQU0ZtVkhOc0hZRzFCeGJ5TE4rd2dn?=
 =?utf-8?B?bm8yemtZMjdLTDJWeFpOMXdBaWVSVnU5akJYVHpvVnRTN2ZsaTNaeW5MZFgv?=
 =?utf-8?B?RHJNdEt3SnZPVzVqYi95WlJ1dEl3NHFGRlBJUkFkQVFrSXZaWnNrVEZTWUsw?=
 =?utf-8?B?cGRVMjNpK2I5L3J0WEI5WEplWjVEQlo0K2tteG4xd3VoelpKUDRtSXhrM3Y0?=
 =?utf-8?B?Skd0V0ZwVFZ2L3ZDWFZaR1BlY3R5dzB1QlNyNEt2VWhRMmhRVE1hYlFEcjVB?=
 =?utf-8?B?Wm5WVk5QS1hjSE1kdHRCWDlFU2ZDeU9aRk14NUFQdjhXTkNWL2JlcGlpamJz?=
 =?utf-8?B?K28rZS9nTG5Xb1pMQlowcUlDcjRrSGtMcEtFQWVWQnVMYndpTXA1R0tlck9V?=
 =?utf-8?B?OFdFdnJIMVkxMGYwbHlJKzJLajArNGEveWFxZ093NVZJd0tMb2ZLdnNjRlJk?=
 =?utf-8?B?NkJwN2VkUEVXYkpsajQvYXdwREVnUDlvOVd3aU0ydlpIQmlpRlJXZDVvczQ2?=
 =?utf-8?B?ZlhDdm42TXlqejF0Z0xBeFdOdFpjcHQyaTZTdjVPaEtLSnFLZDN2STVMdllZ?=
 =?utf-8?B?bHJ3Ky95S1YvcmhtTytYVWM1QlRsWTFkNTdMY1VEVDlLWjNtSVlGS1pOKzk1?=
 =?utf-8?B?dno3Kzc5eWxDclZrdlZmZUMzOE4rS2I1UVJwbHNJY1gwSU5KOGdOaGcvRnUw?=
 =?utf-8?B?Q0JZUDAzQ1BHZnl2bWR1UU9NUDUxMDNrS2RSZm5NeGJwcEI1bXR0Q0xtUTRi?=
 =?utf-8?B?WVFrbWtXdmpwL0VhQmVrTnAyd05rdFYxajZjWjBndmwyVTRNU2VxdGU0Q29T?=
 =?utf-8?Q?rBJcFBjf7fsYOlE2IfO+z6AUx?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f7580939-a12b-43fc-4ad0-08dc6bd2e663
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2024 00:41:13.3222
 (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: K97XeFzAbgl18NZ6cn6eE1ibx4dlaLn3rfIKMM9//ajxpzvjYsyFoNXdhLvlkfdExgO1kXZAllDVAWuNd4M9WA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7726

From: Jacky Bai <ping.bai@nxp.com>

Previously we assumed that the root clock slice is enabled
by default when kernel boot up. But the bootloader may disable
the clocks before jump into kernel. The gate ops should be registered
rather than NULL to make sure the disabled clock can be enabled
when kernel boot up.  Refine the code to skip disable the clock
if mcore booted.

Fixes: a740d7350ff7 ("clk: imx: imx93: add mcore_booted module paratemter")
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Chancel Liu <chancel.liu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/clk/imx/clk-composite-93.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/clk/imx/clk-composite-93.c b/drivers/clk/imx/clk-composite-93.c
index 81164bdcd6cc..6c6c5a30f328 100644
--- a/drivers/clk/imx/clk-composite-93.c
+++ b/drivers/clk/imx/clk-composite-93.c
@@ -76,6 +76,13 @@ static int imx93_clk_composite_gate_enable(struct clk_hw *hw)
 
 static void imx93_clk_composite_gate_disable(struct clk_hw *hw)
 {
+	/*
+	 * Skip disable the root clock gate if mcore enabled.
+	 * The root clock may be used by the mcore.
+	 */
+	if (mcore_booted)
+		return;
+
 	imx93_clk_composite_gate_endisable(hw, 0);
 }
 
@@ -222,7 +229,7 @@ struct clk_hw *imx93_clk_composite_flags(const char *name, const char * const *p
 		hw = clk_hw_register_composite(NULL, name, parent_names, num_parents,
 					       mux_hw, &clk_mux_ro_ops, div_hw,
 					       &clk_divider_ro_ops, NULL, NULL, flags);
-	} else if (!mcore_booted) {
+	} else {
 		gate = kzalloc(sizeof(*gate), GFP_KERNEL);
 		if (!gate)
 			goto fail;
@@ -238,12 +245,6 @@ struct clk_hw *imx93_clk_composite_flags(const char *name, const char * const *p
 					       &imx93_clk_composite_divider_ops, gate_hw,
 					       &imx93_clk_composite_gate_ops,
 					       flags | CLK_SET_RATE_NO_REPARENT);
-	} else {
-		hw = clk_hw_register_composite(NULL, name, parent_names, num_parents,
-					       mux_hw, &imx93_clk_composite_mux_ops, div_hw,
-					       &imx93_clk_composite_divider_ops, NULL,
-					       &imx93_clk_composite_gate_ops,
-					       flags | CLK_SET_RATE_NO_REPARENT);
 	}
 
 	if (IS_ERR(hw))

-- 
2.37.1