From patchwork Fri May 10 09:19:03 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: 13661109 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2070.outbound.protection.outlook.com [40.107.22.70]) (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 4D30816F84A for ; Fri, 10 May 2024 09:11:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715332315; cv=fail; b=RzHu9ID+NZ5960oq+FMJpFxLPQIL9sn8RRzRWbJvrEUyefFX/HzXzR0kKFn7Hqf3LQIt2+c7gC9BdXDdBTz7dgs9SWU1hsM4d2Tn86bPHGjlcJjB6JuUrnhvfJsm0FX3t3MXX3GsHALLWqTYmR3XwUbXNDFGlU+bnT+0I3sM3G4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715332315; c=relaxed/simple; bh=nvSam4mK3om9TVz6wuJK2Z7DSK/o6N1d+PGOO/OShvI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=dQfO0St/JdT0pH12WyWta543jSohdh4o9NYrd5FmJSg4Kc0kdwsWy7oStVgy0ycy8HOs4AbjWVf/tfoDOcrbVLtPitWsYNiKc/VJPo7ywlRGZuu34Rx0inDnPGGTYrQaF2OF5gHncxsotrX91a0iwha0/IR4EPxDpFzddvej7gg= 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=XGVeI+HP; arc=fail smtp.client-ip=40.107.22.70 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="XGVeI+HP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FphXK06iXuYZJgInURNh06p/6j85+z04juU94iJPJV66MQV1quIoQoXgj9MxfFJhqWhSflhe1xYfp2qFlhEk/tvIDV4ehnUxHT0O2f8TJbTlMB5Fwulj8uQTHm//Ko1qyZ3K5b+IZl4czt6GFU3oI2E0haPmL3WnE/OVWsDOfpiEq/rqh6uYOqthoudTc7LSwU5LlU1AS2x53Gzs+rCnpuVqMAE0d2BxjHn0lZsMzigYRiL1NSbkXF+6I/4tdMvNU1gjylSwbxnHjVzw4Mc5mp+57QNF6CEfyf/cAuf/F5bvssujugV+y16LmAcM0kRI2PWYqxSnk6WJF0Va1+mFPQ== 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=usPxMF+abDDxGyg9lU1ffDPQeliZbPP71G7yzsYJVQ8=; b=E3LPeYBeUc9PxrKgiG6MIqx44Hpu5nlFJwJYvhIja4GKvoMkSvy+we6Hy1RStJsf/EUJFIG/C51QrJ0735J+a7M4zmAp7wWUpDxWpr99P2cOpfv44MY94OXkLihDOm5zUrl6QV6bmkhR0huvBig9Ua67r/SI7f0sb3kCLGhAaav5fx5KQiMg8NJw9hkMgzFl219vCynLO54qqTeJ6+D8IwymkCQiQ6E4wQkRJq5HaHGMcWq8vZ72xpYrqP71W6kYBXoSYMc345SpkKzMt3r4CTKdMC+oI005PO2+Mc1R2LPRJ4Sm0QRNpemF9y59NlZ3G4LNDN3ZPBU3HmENTW74VA== 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=usPxMF+abDDxGyg9lU1ffDPQeliZbPP71G7yzsYJVQ8=; b=XGVeI+HPi6vcP2n2UHKyRNZzuzOXwiLR7Z7xkhmfoxHJbTUN6WD8XA+t7h0IBsah7RdFw9fAMPY+sJO9w+A3UGd8fH9yb6nDBrpEaHhJL2O/Mwf5V1KFHMox7KoUSpSE3oBJ2/Uf38sxq1QJN/wZsjYKdQKmk1Nhk7H3oQdAQi8= 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 PA1PR04MB10399.eurprd04.prod.outlook.com (2603:10a6:102:452::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.47; Fri, 10 May 2024 09:11:50 +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:50 +0000 From: "Peng Fan (OSS)" Date: Fri, 10 May 2024 17:19:03 +0800 Subject: [PATCH v2 08/17] clk: imx: imx8mp: fix clock tree update of TF-A managed clocks Message-Id: <20240510-imx-clk-v2-8-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 , Zhipeng Wang X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715332748; l=2375; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=a0EXy0fZ6h4g3hX/vQwYN1ZZTioQoMQK+mQT/+3QweE=; b=XwJxC9OUx2jRhp+GlBmHpmQv4o447U6v4NK8sIdXX6d2Y//GrTvS3y1qyOEtgEX39Bp6XxigC aAioSvpPVkdBOQt1FpFdiWFALd8sg1s7fD5y1d6dd2pqfOznDR5xk4O 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_|PA1PR04MB10399:EE_ X-MS-Office365-Filtering-Correlation-Id: 80c19b88-699f-4421-9070-08dc70d139d0 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|376005|1800799015|52116005|7416005|366007|38350700005|921011; X-Microsoft-Antispam-Message-Info: =?utf-8?q?l3t/fMDLnUnuMKlZFQS4FKJ+AZzItwt?= =?utf-8?q?vWafxowBAESf6edjzg2ndtioh9/qRmc5whw/+u/0Ddg0pD3NGRaEiv4MtqDXiR1Fi?= =?utf-8?q?FK+t11i4Kv2pfJ0t31WfIrEvlN7po15pJRgAneFeg2RgH81B5WlDFWg6USOqlFCWF?= =?utf-8?q?0CvsoOFjF4UHTQRblZvYp5WLTsFy7XI57FYGGBxAFHwOHmtV+9I7PdY+LWyUV55U4?= =?utf-8?q?GwaYMsIeXC8vjXC2/t8/IPK6m11xB4oZ1MUERvU1gsDnnWzOyfHISTnKgOmSSYj3e?= =?utf-8?q?3wm1SPWYYO+e/NRcr/Q9OnWtGdHDSV9I/NGHkxWsRj2vRVSXLfFbdE9Rj4CUBa9+V?= =?utf-8?q?XFEyH2AriBo4hI3BZU+C9fNeX3u1IixOfbbHcj7l9AjtmjEwbgmtlzhm5WsRq/ZDP?= =?utf-8?q?ouCLjAoPccvOIKSUYUmzy2ksA498HflT9KRc1Kt1KgqAE9eMwgeuyWNHX5kvGRZKB?= =?utf-8?q?WdyI8HCK/1TDV6BP1+BJQ0TV7lZXlWUjEOcFMehpXTk7Ciy/t18EmatzV0ydDfCx+?= =?utf-8?q?ArcvEX0Qe4mcaUH3jP+1um+ywatvBT2cGOu76hmluG+PdTiOmkaQQjqTVo336WNGc?= =?utf-8?q?TekFSyv69RmbdzWRS/R6DXx0baRq+uH8Q+szdHgKP4jLnNdQTRODHGy7PWEpUVuK6?= =?utf-8?q?fs8h7QOE5Xei5XIu4peZXlxQkj+QIWPobbNLMia6JDxYfUVZjZK/NNHvoBA8tkM6R?= =?utf-8?q?nosog4Ibjn8ctF+PX+U9YBy1LbUuxVMNU5ADZ3DAH/LnLHD9kqPlsGK6z3G8gNLOp?= =?utf-8?q?VLGNIfJtwCrtPkIlUegHacrErM057uaCU3LwLGLc3Gy2vXX/85hbv7HKwjOvdWPzl?= =?utf-8?q?4Xb0Mu9oShteF3SUXGIYi3t3nJp8f5xc+JJg4welU/6rJdKJw4e9Bta9lPguZmVCW?= =?utf-8?q?qHmT/yqardNiKdygNSrXPbSNNXU5IXXyPDfXmeu6IsjjNa/X2izVB1jeEAGrZxp2i?= =?utf-8?q?TdH09e9md1pRggAZ2Zc9E541vcZHmlliACNGNA0yELIBMgsSwkzmGPssvsF8bxWIO?= =?utf-8?q?ZKrrdge+5I/rb7yG8SqMiaJT0iqOcFLQ9AMvELbM53dknuhIMIFYVZm39qTVyrzN2?= =?utf-8?q?/+RtkbLXzobSCiXHXaM4p4+fk7yqtCtaDmZA6LyJ3AaRD9eT2O0XqfJ4MZpSj2urJ?= =?utf-8?q?xklodLIqDoJUrGzSCiFjWoqqpnOfyZ02iz7JQio/l9UsAdMRt3kU5T113yCapKfph?= =?utf-8?q?HoPxluxiM17Naa+1xInoTp3EqJPxb+NmKSjuxIDGyw5yAa1EQOA4j/yehXc3ZkAuK?= =?utf-8?q?VzDcyeXByYvu0mEtMfWLRFLchAkA2USJkkQIOUPtIHaL7VrFedTBLea0=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)(376005)(1800799015)(52116005)(7416005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?TEcrOaWVKpr/Jvg4Sh1HZITvC3Ls?= =?utf-8?q?wUM8zim9milyVYQljsUXu6ThbVt2aloB4tp2mbwBzzsq3SkIE+qKY0Hb3Gx4GEg3M?= =?utf-8?q?Nrl4Eypd2ugP5f3PexJZnCj3VJ0YGYZeZWt5VD4sr+aRpPBPOjE9Lj8iaVcXog6Vu?= =?utf-8?q?qVhNCKkYMV2breOYED89rFWCvon57A1Z4H1EwNIEMhQTSvA1shwLUcC+GtqwRBtdo?= =?utf-8?q?gdZmEAxwRDMH3waSccXEvk6bmvrTg4Ip1AufOEg1uesBPcKvAVqD2EiTulRsoWulg?= =?utf-8?q?DTKtftinI5UHyjw61UYblooFERZ9aB6IS7jgE7aUGGVQX9tC0lVqAA7L4+6NRs4SY?= =?utf-8?q?UlllXCkEXEOlr/TUFi+I2lrn7m6ITmJAHf228tputtlhtvc1a6zn2QdbsR0jQvULW?= =?utf-8?q?zCIYNPe41+Xu/3HGyJ+6Xf1VTbuQ6sR39ca3YJ5DNO7pRCpVLUxgk5ny3tNqZiRys?= =?utf-8?q?nV4dgQCG/1GsvQmuOD7KP6skjQUT1uNj/l/CGQVcFJDH3hQ9Qwlsqef86QIAh/fdt?= =?utf-8?q?7GQlvJVv/5qOXQLBou/g4gMObODDnb/Q44xYTpNTE+qap9d7CNO5QOPO4KfLoFt80?= =?utf-8?q?jb+Y7FJ2fO/li60rqDQEkMRdpqKsyxkAuaYzA+vWgsajxhGSZ9sz1tgPYZKt5mPZk?= =?utf-8?q?bXbx1OMJRNLg/5fjceLvPlSXak2mWztb//1tN6HGNn7kNIng1BRnhsqHBOC5sw4aH?= =?utf-8?q?hx1/NSXZCoz+OSfHjyeP8lPjVlN4prjGCxs34v0t1ibKXXrs5z1aO9adpB/A7442H?= =?utf-8?q?zfiMou0cpBes0frJewbjmmEvwZiHN4ELD9nDf74hDNani/DrEooEPSpi7u7IQdavF?= =?utf-8?q?g9XzX6CgmtbKNVlOQoc3iNCPt2pcEJpKfBkiVqZFZWorxW/MUZoP09VWPIOadLikK?= =?utf-8?q?Kji4R7amHZ91GMyBsdtLWKe7l3aTWNvDfP3eObaGS2YejtL++14GR26HFa8QazPPi?= =?utf-8?q?uDzx/BsJANQzlmyRCeeSrw+YTpVXb0S0ajV2vzWjBZ6U1rrXjspNGa++d19uH4MNK?= =?utf-8?q?8QEZZn2Dp5/P2Hq3Sff8rSiiDOc49CjXhiRZ1kURr5S2hTgtgYfrs/GSunASTubOV?= =?utf-8?q?FI2RVY9ZvGzRU8HkGsiP5xJFc3ruUgjSsr+0SX+v4AqMoyirXNLOFFQoc/Cu0tCjQ?= =?utf-8?q?rXKgg/eB6FRih3bOgi2ZQVNw3kYzY2rMzigwcMwAPtq3WQN0SdwiwlDibDWjZGGZY?= =?utf-8?q?0JjW3M6NrwjFxrE6Xdh9NANn9F1rLlRxtl+mdlgNylOBCqFN6OE2RAzDTja3yOgoy?= =?utf-8?q?iN5ls9Ly41nUdZ5GzMIaT1jWoCv1MW64Wwh3ejy2b1m462blf4t55mbmbWNF6rHAB?= =?utf-8?q?M+ic/fMjfBjFUUWHknkAATuis+Ny83i2CEQ4uuZoNnjARc/zXpRC8lXoVDbj05Xzj?= =?utf-8?q?Iip8a/I/rzhz+eywAsUjabBNkIs9T22paTsI5rChXMjNOZEamOOIcaSYIa6wmG8kB?= =?utf-8?q?voFXnX/O0LTb9G+LDWfNhvmzcRYF85gigdIUiA853FC+sbqu4HBariBDntCxw8mvr?= =?utf-8?q?xhBNKBlzjUlt?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80c19b88-699f-4421-9070-08dc70d139d0 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:50.1832 (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: x94WhFat2nc0WGnjTBU2GwZHxMCZGZQK3e6SHrnT3fnc9Px7nY9pMtJchtDS2RJcFpP0Xw+zt+pE+4EeZlFJNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10399 From: Zhipeng Wang On the i.MX8M*, the TF-A exposes a SiP (Silicon Provider) service for DDR frequency scaling. The imx8m-ddrc-devfreq driver calls the SiP and then does clk_set_parent on the DDR muxes to synchronize the clock tree. since commit 936c383673b9 ("clk: imx: fix composite peripheral flags"), these TF-A managed muxes have SET_PARENT_GATE set, which results in imx8m-ddrc-devfreq's clk_set_parent after SiP failing with -EBUSY: clk_set_parent(dram_apb_src, sys1_pll_40m);(busfreq-imx8mq.c) This is safe to do, because updating the Linux clock tree to reflect reality will always be glitch-free. commit 926bf91248dd ("clk: imx8m: fix clock tree update of TF-A managed clocks") adds this method and enables 8mm, 8mn and 8mq. i.MX8MP also needs it. Another reason to this patch is that powersave image BT music requires dram to be 400MTS, so clk_set_parent(dram_alt_src, sys1_pll_800m); is required. Without this patch, it will not succeed. Fixes: 936c383673b9 ("clk: imx: fix composite peripheral flags") Signed-off-by: Zhipeng Wang Signed-off-by: Peng Fan Reviewed-by: Ahmad Fatoum --- drivers/clk/imx/clk-imx8mp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index 670aa2bab301..e561ff7b135f 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -551,8 +551,8 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_IPG_ROOT] = imx_clk_hw_divider2("ipg_root", "ahb_root", ccm_base + 0x9080, 0, 1); - hws[IMX8MP_CLK_DRAM_ALT] = imx8m_clk_hw_composite("dram_alt", imx8mp_dram_alt_sels, ccm_base + 0xa000); - hws[IMX8MP_CLK_DRAM_APB] = imx8m_clk_hw_composite_critical("dram_apb", imx8mp_dram_apb_sels, ccm_base + 0xa080); + hws[IMX8MP_CLK_DRAM_ALT] = imx8m_clk_hw_fw_managed_composite("dram_alt", imx8mp_dram_alt_sels, ccm_base + 0xa000); + hws[IMX8MP_CLK_DRAM_APB] = imx8m_clk_hw_fw_managed_composite_critical("dram_apb", imx8mp_dram_apb_sels, ccm_base + 0xa080); hws[IMX8MP_CLK_VPU_G1] = imx8m_clk_hw_composite("vpu_g1", imx8mp_vpu_g1_sels, ccm_base + 0xa100); hws[IMX8MP_CLK_VPU_G2] = imx8m_clk_hw_composite("vpu_g2", imx8mp_vpu_g2_sels, ccm_base + 0xa180); hws[IMX8MP_CLK_CAN1] = imx8m_clk_hw_composite("can1", imx8mp_can1_sels, ccm_base + 0xa200);