From patchwork Mon Feb 28 06:11:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12762391 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B74DC433EF for ; Mon, 28 Feb 2022 06:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=y89V3OnzuAgtE083zyyIeJMtsf1yqB2SRzoQA/4nm3w=; b=OdR9HarJk4PQ4Z 3/5hB866wWMTKOPpkObt193kZJqJkUijHoUxoBj3i8s/9TEH3GQvIsDK3R7SCW3hiL2DzsNen6H3n M2nBxMGvFau7+9j8ar2MnMQrn12crmgnbdTUmbX5n55M1Pj2mY3HIpmx1lr4eTFC0zXw85oLc8gmD 2SOmckcQfc1Ei5GGJPVb5kR7uXevNKPWQw98AhhAgZ8pivAJfXi9ppuri+nvsWpH+eOn/ndq4EPwK 1J+xYXWIacFMPDcS6fqhfWzWx3wKhSI2znqWH0yGJn3Ea1Q06jCkpB+voSi5VffQGJSeV1EwY+tUp oaCxAzJxOqYGiDQwuSAg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOZEh-00Ar4Y-M3; Mon, 28 Feb 2022 06:10:20 +0000 Received: from mail-db8eur05on20616.outbound.protection.outlook.com ([2a01:111:f400:7e1a::616] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOZES-00Ar0X-Tl for linux-arm-kernel@lists.infradead.org; Mon, 28 Feb 2022 06:10:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W2zGzutq3t9RdJMeUE+rqHE20o3kmdED9OqxZF/9AiBUNta6MdBzqpG44yVbhdiVECeyS4H8eZ7xPKFFW9RaW5+k7u87cfDy0atpK3riVRinC6RqLEQEbVOmD2123xlirFOEzQ7bnxd6Mw788wZvk5z0czyqR2FUoCSAuqRciKkgvCUEbAqE5kSG3CGhp1yg+kjV41Y8x5rG0rQ/y+1a40y3WOkEyXIH7NPXpP87yaBAU8bzqHRhhhIzYr8zDDFOb16LiHPKiQiV/mQ8fp0v4LsC10YCFZS9TBppEdO1LoCHq6Me2fevmdvNNigOtl8wZOvn2Mk5a2KVgxkBRpsEpg== 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=lhXno/c4QzPBpAYvEf5vof4xdAAowndZ5zT5fGuee/w=; b=Wt/XTgyhC1tALYCiOzVBIebEXLWT4tlfKxHy9wR4rzl9abc2wL/8W9oBwjUJ1hcRqIglZS3kUqVdiBoDqE69oIWI+Zrh1HS56a7rJSkFHF+Zrhz4QflbTVG/T+acwpZjd88AHAuyJEDgzf2bkULTqWjrRqespHHri+LzPfcomERE0TEnGnwL1j9BoyMUWY5OPgRIgW7sjlwy66L8qBwAEMAL7cvbK7LqJB35fOcwq4/pnRfdS8LS4YPVVExXwaRTnzj8S4k78ZIVzBXRhVNRVCJjjcD8vx+2QoGi8FDB1oxjsYu35OswTN3/zVdrAxFl9cd6eafvJDuzjShPLP3LFA== 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=lhXno/c4QzPBpAYvEf5vof4xdAAowndZ5zT5fGuee/w=; b=OcJThCKUtRtGcD6mmWmLWkYuEzAHBVj1vOkh9LhYFmqEEYd6tvPn6ia8vveMk13xYxtX4rE/MCbQ6rvJEbhZQBf/qOJs6GMpL52b9UoJLgWg3uODBGncVtjWTLrGvj2qLShinpG/cl60zJIWyfSzO078qttw+Ln/MDcRX9JuHeM= 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 DB6PR0402MB2902.eurprd04.prod.outlook.com (2603:10a6:4:9a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.25; Mon, 28 Feb 2022 06:10:02 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::552c:ed46:26dc:77cc]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::552c:ed46:26dc:77cc%4]) with mapi id 15.20.4995.018; Mon, 28 Feb 2022 06:10:02 +0000 From: "Peng Fan (OSS)" To: sboyd@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, abel.vesa@nxp.com Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: [PATCH 2/2] clk: imx8m: check mcore_booted before register clk Date: Mon, 28 Feb 2022 14:11:50 +0800 Message-Id: <20220228061150.3006113-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228061150.3006113-1-peng.fan@oss.nxp.com> References: <20220228061150.3006113-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0035.apcprd01.prod.exchangelabs.com (2603:1096:4:192::13) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfa2242f-62a8-4a17-bb6f-08d9fa80f4b4 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2902:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oSTIrn2q6fEA9ok3JY4NuANX8lKnqywuOwjWLzHs3Z48Rpk0M3ASfiz9YiLGDAlOFOUxU2SX+GrPABpcP7rz5eI/DsucK7hiWHboBwX10bFDFDJwHVp91i7J2agE/4E8QT/9s6Lv5/RMVWt0fbdPwibv6sO8fKjCBrOf9Xre5ApI5P7PW0G/CV0EVZwOk4xqsuzz6YkILDQAf1PrN/2/IunKyGvrD8RGZS4ixsyy6TVLCbNci/mnp66AoPNjlImdM5BhoXvZ3mqry3RNnrnhEQCKKIsmrMuwn3NDFQnZwvB1yG9GwjxIguFzuDOeN04x8cn/03+pJPmuOdeg8qkPWGoQu9bwMUupBGm1YfUPLfL3+Xuwa4YKLkLSbltFFS+A0MW8BMKqVIWkNMvMPxQhNbQjriCR27FHFOsorCgUjstv1TDLmcOFTfUWGHP2QePTRWZK+lGZvmQ5500PqEmVjqCXokBXQbA17tKtGfz4UT35Nk+fTHJ+SRxUvDWsM/RGwksOvICH+pNntwZiR8rSbKAYS5Zh9/fPGQid2Q14TbIX7Ne6/fM0Qw8cK9qP1DUiMzxI05cGAZTWJa+zT4+wEJ+YkK+eOdMsSo/o6hr5Xtd5+8su8SZsyqqDuEeDQ7tPoltdoz23Z3GGoWS5Sd1nQSRIcw5CyReTsmtq5Fq4udnD9fVsZvprw4gg3s3mn8kJevxTyBRKaBB6BnBtFsm7Wj47DgBz8SorUv1o0EILlUc= 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:(13230001)(4636009)(366004)(66556008)(66476007)(66946007)(2616005)(508600001)(86362001)(83380400001)(8676002)(4326008)(52116002)(6666004)(6506007)(6486002)(5660300002)(186003)(6512007)(8936002)(316002)(38100700002)(38350700002)(1076003)(26005)(2906002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wO+Y23Hw6RglHx2tVquX2dgBHnNJ49KHX6LrnGoyeFac0DlBrR7Kesb34CcjpT60+QElL4xkWjKiCOSfLptw5kFnNvnBRkKdcN2QD4F/pMshww/xuIF05OuPDogQitIq5nKsCPMQgIObAf894womahSpX77ikF0NiO4BrhIGS+JwbFRtUYoJWarzZ8FKHhknwyELb+dm9LE76w7k2NNH32Y0yRZK0aG9m/DoIOWNcwrPiPmVa/cVKnYFZohXQ+zdosdS/EQpJw110IteLY1FFexoJYNty2ymHubTGss9Blg+sM933C/DZ7OohK6hyTZwrTpr8vbvCn3hfXk2N6JzA7B5Br3UnlgZykPH+pyBnYnf/2RntfXOwl+ZByngSjJVmWmx0z8NrfdIajkyM2+IjzpXObK6nrfqfs0oeZgaZ9wr7AJ+SAOQ92YwNfH6GHH187+j+d0WDBmdBWErX+uO0FZVNhtmpjWOXzK/2c4vhsXFX2Za6qeuMhAm9xBtKh7pLJm2PsnelH8n7UbroCq0JVuN7pZmMxfCqn1o9+0f4jvlio8DDrg8qDlgDFa/lafGsyL2b1Z9cwmpAcsreSqBOfeqd/xgFuO1O5qc0V28SE44rZs2txqfLLL1+Q4AwL8cN+sJFJBOmqHOZBqxJjdfhNN86fZkZSqC+PSWMHEo3JPBponhkuvsreDjn0KIE6vst5wtRtjSqCZztRYA8aWi/52vYCwZhpwi5kMR45GxxzibIPOytgt7iwAR+otgn7pV5m15oIsj3iZQv3QFqv+Lur6zGXtqrqJpRVZMUcmY6eNJx8CAcsJ32H+2mIooBxYu78rHyo9pCUC4kfQnDrXRBqHilR9Jd/sEs+bFz9ACvKXH0KWSjfJLDPMoxzwM7Fmr5Lj8g3B7I08UGqo9vXHOly8WjodqM944uy/3q1hRfRhJTDhEuWN6oMFhGkGEqtiREIPLk/UQ6ua1MFIF26DoaMBBHybGLRBtkxRhU+Fwt3S8GNDDHgU8+PC1HfnhyalTFNAQYe27sj9wN7EWmtdhLmgVIeKDEc8g85CqotIVUV/xPoJYclX+pLjTUOSTXqjgpT6ToL6wA1sf7QCIU47rLRoL+/zRElcjkhkAy7qcDWt+dIi8Ea1CcQ00NegylsCL5+bGDCOdzlGsb0nUi8XxdLQXbLq3Hl0hRoejLixZ6cGJE+nc6d9r6Qgy+PJnEPUurE6i1RUCfxGJfjmg50IQPfmhb20kE7OcMyI5mXpt3tYTl6rO3x1KFlc1BBYq1ByRKr7h7A24EojpE665CwdUotCgkFywW9SW8CQrnnmRmbED9unv06tIL9cBJpcTZSmzpRzZkcRY6sue/KahNxilnu+Lm1jX4OF9r7gOsy8pYYmwYqUXYyFJBj7ClEt0+E0+UDFVGkmMoKiJrAACXUEDvnVQ0ptMJnux2HkA9WjknwcEm+qMbo2nKbZ8M16sV+LRa2MXtXpCGnv89/g8hoFqRoc97Thk2qBKjPxGQZ502Wqm7LLReVS44GgfVztsQd3R+PlrYvPw+1lnpaT/061aBo0KYqXZtUal2aT9k1/BMYT2PVd1ENZNklWAhxGUIe45AcPv3RxPAboWB3/U18JPFrRyXINWKf3JXk7gOjuGThA= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfa2242f-62a8-4a17-bb6f-08d9fa80f4b4 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2022 06:10:01.9753 (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: X1XxZ0Ji70706yhpPqgUJ88HeasRQrHp4oZQ/iJ96Z0Psp36z+R4VXPPjLuKRZUjJFhT95ti1Tzwx4ClkKqz8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2902 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220227_221004_995994_35E11331 X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peng Fan If mcore_booted is true, ignore the clk root gate registration and this will simplify AMP clock management and avoid system hang unexpectly especially Linux shutdown clk used by mcore. Signed-off-by: Peng Fan --- V1: If this method is acceptable, we could also use mcore_booted to choose to register the pll gate in clk-imx8mm/n/p driver drivers/clk/imx/clk-composite-8m.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c index 2dfd6149e528..b16c2c0ea9f6 100644 --- a/drivers/clk/imx/clk-composite-8m.c +++ b/drivers/clk/imx/clk-composite-8m.c @@ -223,14 +223,19 @@ struct clk_hw *__imx8m_clk_hw_composite(const char *name, div->lock = &imx_ccm_lock; div->flags = CLK_DIVIDER_ROUND_CLOSEST; - gate = kzalloc(sizeof(*gate), GFP_KERNEL); - if (!gate) - goto fail; - - gate_hw = &gate->hw; - gate->reg = reg; - gate->bit_idx = PCG_CGC_SHIFT; - gate->lock = &imx_ccm_lock; + /* skip registering the gate ops if M4 is enabled */ + if (mcore_booted) { + gate_hw = NULL; + } else { + gate = kzalloc(sizeof(*gate), GFP_KERNEL); + if (!gate) + goto fail; + + gate_hw = &gate->hw; + gate->reg = reg; + gate->bit_idx = PCG_CGC_SHIFT; + gate->lock = &imx_ccm_lock; + } hw = clk_hw_register_composite(NULL, name, parent_names, num_parents, mux_hw, mux_ops, div_hw,