From patchwork Fri May 10 09:18:57 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: 13661103 Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2050.outbound.protection.outlook.com [40.107.241.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 60D6D16087B for ; Fri, 10 May 2024 09:11:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.241.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715332280; cv=fail; b=VqLJxd1CnJ/er8TR5yKF/07bacL1eFE9uZumrXJXHOI858d0dIGb4ivGgX4GwqzmoHBQ/I6RsbFTiAuFcEGzAEHPC5+XQjtZMn7SuHbCAOeii7eBzmEqN2nWZ+IT+NLaTQwVBRTcTWkSWY3IafNti7UUczYXoi1iGrbRI63ORds= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715332280; c=relaxed/simple; bh=6bfV1dS4W03vysGWKUi5DvTJJb/JmkVcqlEWc5z/JWg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=IE/MzlRc64VQFDwUSfTSCXBxaiEHuyX1ApBq1ZKa7nEHNbQB0ZaUkVlQRGQJ5OU8bzhcttZhYfeGbJ8f2+r11tNRPLU/ghZGZwGTiqfStgLuzx97q5eoC8Ydznv5SfJD5EQDUBvTPnbw4cqNrvMvBW8KCPT/MQOF7Kxe9PjK8P4= 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 (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=IdM/4N08; arc=fail smtp.client-ip=40.107.241.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 (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="IdM/4N08" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ege1F1GMqjj2FYkGn8U8H7uegsYTOKmbHJmZdRyc3SfgLPAsYiWyOez5s35GCmVuy+IDyTvZEHOLhx8ai9Y2U/nXB8r6h8d7yZlVCo/zMXrZo4WGKUFvU77TKnQYUZWo08o1B4orrcAjl4TxulD7yJSzi/dhKDCgTepyKYxq8dfqHXFyJVBuoPPC146cPB+8mA1/VRyW7bT0I5HNpqe7WT/nutU7hKJ6vGwniKZsNNvw6Q/9rOiWL9h0pAGq/eNMlCJTkPoK2p9YBWJ8bw+6p1NPMulr6dqjThEac3k4pZDe2sg5lU4eAYDsfOxFIIAqdMx5T96e8oICCSIPQxY9Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=VGMI2AiGxzw3PtYdGfhqBPcJZuR1jYmB5HiZD5n8n9U=; b=XgJnX1vk2y0sP8J6WwtVxi2F6j6Uhi5RksvCUS9IyH+uyeo7e4axYAzFUv0Ld/qjZaK9zG1OS52AngGx6I2J8FD6U54Ofo+VcN8WIiPVggLImJNCIoqqbAbbauFUwv/IEYBCnGIkj6CNMzgQuwT9ufDgYpI4Uk4NTBKXT1BmJ28J4dgv28/xvtvhOAlKGJXZ5o2vpQlfQ9aB/CzAs/7UiY7KTJNpvwYp58j2VTvEwmuAUEcrYn/6eCfaNoQbr0AsA6vKjp7gORKcnumkXJAPpB1sc1WB0TqeL8umTTVmvmucWl8AO4WRV6p4MP4a4h3XCOQOZd2CgA02EPYLeBuy5A== 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=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VGMI2AiGxzw3PtYdGfhqBPcJZuR1jYmB5HiZD5n8n9U=; b=IdM/4N085Pc1u5GldSZyXZSTKQ74u1SJVZHPNiW1UGHPnTbXbTooYjfXQUbVOB48S3vuEg50m2M2tWN6i+dgWDgVkI+EyznNp+3g+EbnkwC1+dOKvS5Y2Bgkfd3AMhYJYs37p3C6GXYy3QA2cmzGnDUljkFmvScX8hxK/fFntrM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM9PR04MB8065.eurprd04.prod.outlook.com (2603:10a6:20b:3ee::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 09:11:15 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7544.046; Fri, 10 May 2024 09:11:15 +0000 From: "Peng Fan (OSS)" Date: Fri, 10 May 2024 17:18:57 +0800 Subject: [PATCH v2 02/17] clk: imx: composite-93: keep root clock on when mcore enabled Message-Id: <20240510-imx-clk-v2-2-c998f315d29c@nxp.com> References: <20240510-imx-clk-v2-0-c998f315d29c@nxp.com> In-Reply-To: <20240510-imx-clk-v2-0-c998f315d29c@nxp.com> To: Abel Vesa , Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Jacky Bai , Ye Li , Dong Aisheng 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 , Chancel Liu X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715332748; l=2275; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=nzd37ej6sCrJO2CX0AUOVMMELufbZrxk0WgiSw0tXHw=; b=X2S7w85e3ziWo+xQ8t4S/Q7vrJDhr/Ghj23yRzEWL0yEiQRsWlnDljoG2Z3HQ8j64Od8EMBZN ivx/JZ+AvoEA2BEI0RMuugdZG9E2oDry+hjM9aabLQ2l1b3JufxuzRI X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI2PR02CA0008.apcprd02.prod.outlook.com (2603:1096:4:194::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|AM9PR04MB8065:EE_ X-MS-Office365-Filtering-Correlation-Id: eb0bffad-73dc-497b-7306-08dc70d1250e 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|52116005|366007|1800799015|376005|7416005|921011|38350700005; X-Microsoft-Antispam-Message-Info: =?utf-8?q?50GiPXsWXvFTfWNdrtIeV/2073fmbGh?= =?utf-8?q?T1C46kEIgXVZO7it2qS4rVtQmAGglZdTAWMHI32iKX5J6O9+ataxh/ULOOAb2kkj7?= =?utf-8?q?IQbBdPybi9stD+eVt+mnuX+kpFRNGXMGjIXHJVrBF4nTyzTKl0aMqvpzZI0WhAWaN?= =?utf-8?q?CzBKg5Z/NtHSGIonzFy/5Z7QIBU7BdSwHanVEtLHR4JHdVP/AB8x1KLVA7VlDrdnu?= =?utf-8?q?NkIBKolQgka/JOtL71G9mGcSBb36tHq/lcp1OG3h7UlCN/KHAKjkRuikfOGFSdubD?= =?utf-8?q?8c/KfQdCAqCfr1Zkt7oAEhvuASER0HiYTAF1wPhVkyvDyxuCHcVRAop3HubWtxs3u?= =?utf-8?q?lYSkz8Z61wb2DuMBfFsjFoPC0zkRT175f445tqYJHP7IV8JkUAw3I7D/nU5KziO8D?= =?utf-8?q?KEvpYe0JsW6XD/zQyYFfCnG7QzGTSArfzD7yBEzDowcfbzgruHP2cM5jlCISaj+SE?= =?utf-8?q?4b2J8u0B2ifHUlhOl6JGbosnFCZsI/YzBg1Ethn+OkVKMUDDBvkr3VowJP36Y/U72?= =?utf-8?q?3X48+Qw7UlfWzx6cntx72zTUdMdWCNhjq4KW0GbhFUmTgjfNcS21O93Iwy7qjxc6o?= =?utf-8?q?g65JTbiOmAY1Ay1EGSrTwbjHF+w0CgJ8XvAMhmTS/EMppY49/KIx7vMygpOodS9If?= =?utf-8?q?ZGxIcmqHYFZg8ruAEe26W4FgNv/GdCgfcceXQK51CgQtcfB7zLBoE8PAoPk1TsE1q?= =?utf-8?q?oKxfe3qTDZzmSShelr6LF4y0u0ztN1FAP1k1D7Ri847ryBeq8FwXRdSgCalNQ7kJh?= =?utf-8?q?Wv/vKnovE1C3XamFEhxfNoqlERVds1iJkGY8IK7ppNLx2gDAOexyKg01buNNMveSj?= =?utf-8?q?VIGM91YRWToL6KvarG1S9rmMGI1suaoPKTBZriS8OqgsBGp0aaCndjoFn7AvlcnEi?= =?utf-8?q?tntwo/CWJ+iOu+2Qc34wjuELAM9q2PWK4yB49Bxlhf2MKxNHosS2w6F7rAqy4jrAM?= =?utf-8?q?5kebckG106Pt8bwfhXZ0kYdsd+6+pS8M4QBLT/0bi6Lcgq+GK4rpRVIVlulqHEShF?= =?utf-8?q?fJTTH5z7iolp82MWRSK0H5QhdfUJagcJBLWujvsWk5NODwQaidMk3gQxA2ah/P3Qr?= =?utf-8?q?77GvPM/UsoSV0T2xFGJAH08jryPcJHaJwJAi/L83AJlix0UmUsjmGTKD4hoMVXNEe?= =?utf-8?q?6atflO5UV7qHE/kQ/fmyDWCjRRrLl9wafvDOsRyhEu6VeQxTPHXZ7p8G9ZCS4pmrB?= =?utf-8?q?pdKuszflhtihb0i0s8hmZmWU2jjCW5So/azC7H78TK560crqeXbq4oDMz71KF2oRl?= =?utf-8?q?NftXDwcGGXkyYxbZZWNO6PZTX8swKPV9AI4taHLgZs21pN1+4tVp/xls=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)(52116005)(366007)(1800799015)(376005)(7416005)(921011)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Y2MKx/iicTp35AgZfQiy2f8V2xJy?= =?utf-8?q?FLG2V8QucHWtmmHXbUEFK3VAGofFCoOQ42Y2GGdsyLpsbFe/UtIZ3XGnsT7dwsg5G?= =?utf-8?q?+cOCTi+/WS+AsuOQINMAE6z4s9IQh47yZafoRm3GzgnlN4asbjVd+EIMttFjplbgU?= =?utf-8?q?eaF+Ippym9SBDXaKYjX/SthJDONUHSed1iNbNj06YnMpvncjqrCVVH8A5xY64fgp5?= =?utf-8?q?ij2Pftj0AZMMpVY0n5gJ9FyhVpCEAvhzbBbalBq027DurvxkmBZwl/CKB+Rlj9RHT?= =?utf-8?q?Kr82dkLITWxtfLnL7aitxtsgXkBTox9suKPYxgGsmO9Xu+T9sKkeLwbgbvIhsNHyA?= =?utf-8?q?9162Fn+QtO5gZ228Dhebb4JW8KErsTubLvosiwBhc7rsxXutCcEBSOguhinsrVESg?= =?utf-8?q?wCBL/MUXWLNYcRTiJy34KAt0dU/r3a4aqZt0g/48e0+fXC6n8p6EOXH7+GU7kAlBd?= =?utf-8?q?AmK947XKxWnY+3xgUm9L3yXwYn226fcPJpzHC4qHcYB+tpyShe69/pITZnHlDTOpi?= =?utf-8?q?AH2YengZMxIiHhqrcoylHOV2qXJD/ot4PuzTtFYN3VgZMLmB6uL6rd2N0SpOB6nzu?= =?utf-8?q?+dYPqD7LWufrlWnFpBtJTaDWpdXfnBfBPOwlWy8rea9HfRUzHetR7Om4i2A9iys7B?= =?utf-8?q?bIRGmqig4Onl/oK2QKU7OQ5lmJVtVSX1PrfFKohevm+fnSN91svvhRPgOpZnrE6qp?= =?utf-8?q?NJ9w1yq60h2kYcV9AiAezM/kHu8Ebph9fGKIsoAMbowBQ3Kzdzah9VsJnc38XiGW5?= =?utf-8?q?H1UJqZwIKSTKHtRry20fhCpT84tttY2r4qcs5r4eD5I0kXRuTQ0cKkmagMXelEbBm?= =?utf-8?q?lHsgKtFBGtiOvin0sA3tzA2QN8o/en7Y0/75w8e4StJgiS1RbTOhPfaZkzl4IozMX?= =?utf-8?q?Sz3E5Uh4nZH+lTZQpOApcqcpc0YsfS4IhvrfJyn8IRg9gxiCW94mZFLXqD933CY0I?= =?utf-8?q?sMSRQbfnW6e3uv2dzC68+biwKxbxIQ7EIBj835yWFeb6LKxAYXxuwxVlcn7nCUU/7?= =?utf-8?q?pPoelccFXU2IPDkpd4L9EkC7UZ425UTExFwu07En13WstrlxSgsDDgVSr/usJ1S7Z?= =?utf-8?q?sdg9Fosh0EhrbYMj1HqwWCuZE8BpCUs8Qw9uP1nZt8ZzfiSGw9GGWTpdTlc57l+u6?= =?utf-8?q?DaiUyITA//IvGrzGmF2tXZvqpYon+2aqjsfMtRFTvUQ3bN6LjJ4f3SA2nPI+eRpki?= =?utf-8?q?MZsnDBL/AXAiQo3CXhlw9yUe+Zf73rjjvHD7f5vDo37Np0OwwwunOocOnjBcSFBGy?= =?utf-8?q?nfPXeM41faSk1lCCXYqlU7W/NJjFOjrxWY2enEHRxqoj7CBfxn+jvzPyJgniBABZB?= =?utf-8?q?qzG+t3IKhiFKKOq4jlZc/iooWiDKDgD5tk+Ki4OiqdnIPcUeAQuLEPXblet1burjS?= =?utf-8?q?DPoWvSKJ7yroSkNEb6eLkJOWPo48zXA/cGJxYA7oVvIOaLFBeMkv3g1m+7ZkoI73i?= =?utf-8?q?hMqZeLLO+oTl+latzkHw1CGphDc9xzBWi56hPkzNNdVymLE3dvt/b6B9Yb8ymis7K?= =?utf-8?q?8u/SKMpi5K0V?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb0bffad-73dc-497b-7306-08dc70d1250e X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 09:11:15.3312 (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: v2LJuTvh1UWnomLmQwfnbHvI9U7on6GPAJdzG2TijAjliZ0hymRa6Xx49uI52WqjOcZL+goku4JfLpc/QEpLpw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8065 From: Jacky Bai 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 Reviewed-by: Peng Fan Tested-by: Chancel Liu Signed-off-by: Peng Fan --- 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))