From patchwork Wed Jun 29 14:59:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9205613 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AE4B76075F for ; Wed, 29 Jun 2016 15:09:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D5D9285C3 for ; Wed, 29 Jun 2016 15:09:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9087F2866E; Wed, 29 Jun 2016 15:09:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0EC77285C3 for ; Wed, 29 Jun 2016 15:09:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIH5J-0007ch-E7; Wed, 29 Jun 2016 15:07:25 +0000 Received: from mail-by2on0058.outbound.protection.outlook.com ([207.46.100.58] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIH4c-0007I9-Dw for linux-arm-kernel@lists.infradead.org; Wed, 29 Jun 2016 15:06:44 +0000 Received: from DM2PR03CA0038.namprd03.prod.outlook.com (10.141.96.37) by BY2PR03MB1928.namprd03.prod.outlook.com (10.164.114.32) with Microsoft SMTP Server (TLS) id 15.1.447.15; Wed, 29 Jun 2016 15:06:20 +0000 Received: from BN1BFFO11FD056.protection.gbl (2a01:111:f400:7c10::1:172) by DM2PR03CA0038.outlook.office365.com (2a01:111:e400:2428::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.528.16 via Frontend Transport; Wed, 29 Jun 2016 15:06:20 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD056.mail.protection.outlook.com (10.58.145.11) with Microsoft SMTP Server (TLS) id 15.1.523.9 via Frontend Transport; Wed, 29 Jun 2016 15:06:20 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u5TF65JY021502; Wed, 29 Jun 2016 08:06:17 -0700 From: Dong Aisheng To: Subject: [PATCH V2 4/8] clk: core: support clocks which requires parents enable (part 2) Date: Wed, 29 Jun 2016 22:59:07 +0800 Message-ID: <1467212351-16626-5-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467212351-16626-1-git-send-email-aisheng.dong@nxp.com> References: <1467212351-16626-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131116863805223070; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(7846002)(5003940100001)(110136002)(87936001)(76176999)(8676002)(19580395003)(19580405001)(81156014)(2906002)(8666005)(105606002)(77096005)(92566002)(50986999)(4326007)(81166006)(50466002)(47776003)(69596002)(2950100001)(2351001)(8936002)(48376002)(106466001)(86362001)(36756003)(104016004)(6806005)(33646002)(97736004)(356003)(189998001)(50226002)(11100500001)(68736007)(305945005)(85426001)(229853001)(586003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB1928; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD056; 1:OwAZaJY4ruA8TdvESu6Mb1rIxKlidcVgFZu05DoblPYIzNUrDuZtdAFVsk0PeYWzXEVM0aAXEca2xDDht2P1QdUaQGCfTiQEeainKT2Kgeg8a+pr3Px4qrEzMVcBh4RSAoH+Fts39NmaUntsFJNDjgrKKX/BKiG99MI4ADWLQ1rD+5g56WnoTHPZr1eoCkDiBiTNz0oPylKF25K7CZu+OMwZZWbtX0Jaul4OT6LTex/3LAUOxAwySxh2MMg+IFiewdFRCU+t55mq5u67nY9lOx++Z2YfqLXzVfuSaDtLdIA9pbgDq0OzGqK6aamjxafgK3RxaVLeBAhCDU2xYX+zZvkMLaKRkCi/tG2ZxRrpkOINCYTDoR7GOt/d4MJnz638Fu7Vsndsn/usOmprxwHlj3tQDJNDZiepn11qgm4Sy+6QxnBrD0dMjOV0AxH0963Ddr9Qvxm9Ob5apkFtllynDV2PpfTRDYj0DVPUbtF6soTfNlAU9ecS03udZXbQVZK00vmbcRRLXxvEt6t0h4/HuZEGkqlrAko8/BzuGGZUFc76DsjRKWcoOk8ssdeDKuejHUqtQ2DIwL00uG0tzNrubSqUZKSQ8PFRtioU0l9f+MKeSChzHM6a2EMnrWD0Z7+sy5ePs7w57f9KMvV/yp044wBZICYutbrAqyHMVrv57aCXaLzKznrPmy1Qlgr4UXmH1v165dTOvxCvaq7N5q/cy6kIAL+HQH4AnRlM9dl773Q= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 4b4b78e9-bedc-4c2d-0f41-08d3a02eeda1 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1928; 2:8+CTqKlsu3I5ugZ50GLa4yfk45Fyqulel68HM5q2jmMKSKlcWZkWGiYY9xK1bPnSBQcuAXxT+I/zINEggRdhlqnUBYb7+7SZiP8sUnGCkh1i9jU7oek9tjJC7w4ozKi2G8d3BrzWRsleeIqIQUhEWFDS54AX/gkEqcbJlBrudOuWcwzUxw1/rtDpZ4Xv06qa; 3:KCwRzmDmIIdInJrDR2WNdKuezgMT9WYHrSJtbY1kDQm8IknPk2sQt5dggS4ulXkx++ZaTBpCyXIPPn4IeGHGnD3gzLtfUYX/nl1GZheXN/Fy/o1xL/lRKJMCmH9PERSAGj+wXNfip+a5HFFhvW2Ay1EuQtNw4ekGIFECIVh/TLhJYIQcMKFUzsPN9f1Z+Pv+npNdPOVuIvDEsw+EsLaHJMh6RkwnPSRFYAswnBVcimI=; 25:k2pk4DeO08bUpsk0crsc2BoY4sqIe3X2isFI1srT26zUyYC2mBv6WvpqpT0Scn70qzQutMGFCdEE8sTuG6LhjvCan/2VylG4B4OmKABsbbx87et+nwxNSDiFLHOlQqJO2TybAfbFohQ8UB/KAGDyzLAQdb/u5IvFHl/pJDeQ63rTW860wOd7pMwgYIwsjRQsWCAV1Dhm2Cfq3ptBUyZYqulqwwy32WfVZ0a67RgGQr4FfPEyvKnOsjXJNc7EiT2l X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB1928; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(5005006)(13023025)(13017025)(8121501046)(13024025)(13018025)(3002001)(10201501046)(6055026); SRVR:BY2PR03MB1928; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB1928; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1928; 4:3SqANt7zbkyVAVuOz71bMvoFgv6MmN3WeZ+tLoVv5xB8rTdS+48GyHLTPJ2UbJHKaXwegilYD0PK24rq+8KvZgk/IgdV+YZKGVZ0TCPX/doroI3O37EtRrOv8vavplD7IwCzsxCwB7xpXqKeZA/H35lgrub+7UjErEVWtkC/KqJIE7uLkrfsXFRoXrxmIq3g9t+sft+yPBp9f/a7FvoOZCEQp6ZRnHpN4n9lqiZDfnb45YgxoyvhgEaS/F57+fAT+IlmNNGxD621cbz2rNxfjPuv3WV4gIvqqmDAT4AdcGdskTy0pUiWQSbTL90Ojgi6Mc7Ygc/dZmm5rOjjnoTUdT+yXyl/7u/XF5y8om4e9xPyxEWpTDn1gZ9T13flg4jmDvnFS2jHlGTwIS5fW5KfpWe2r7lHWo4vPvRNs4c+eeuWcx7wVdfwBsmKhr64MH81V+WtKtxhPSSnYeodGhE2Vnbm2K+7b8YPhoBrAmYJk1L0RIFPeq97l4pthPgAeCGmRLHQ3VC2A/z4d68qbqmFOw== X-Forefront-PRVS: 09888BC01D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB1928; 23:as1rS+h5iBIgSWszb0KQ1VPnPO7KxqAxsBy2UzlTn?= =?us-ascii?Q?FuSC+l89w1yzWa/WYXtRVP2xHibu8s5fxLtFPis1VG/8ujzQ5X+XSzjRT5lu?= =?us-ascii?Q?9CBEGxbr85twSKdNi29/KjvU7takb3c6ZCQvI8sfh/kw1ev6L0LWExCRNVHk?= =?us-ascii?Q?LlVPNktQ8BqmVL8ZGWxesMAI+nVKCibc4I6VoAI9W8MnJYWozdnS7eZ2swIo?= =?us-ascii?Q?wc/rDuVeRSJ96iS3qmMbY4hjCEg15LcCDf5kr7NkIqwxT5HbofY4swDLQUPY?= =?us-ascii?Q?yEMWHb4/N7Ln1QoieEpplmcWqhTCT4pTOdUpRLJbBuyHPJKfERx2/CMWRVYs?= =?us-ascii?Q?ZmKRNOOuRu6MnME05g7cLx3mRvDJ+BmgfeajIaQtPNXrTqDu/jXs1kCv/9Z8?= =?us-ascii?Q?trhTKrEO+dRyy/3BjMVl+AL3mKB9yCSzOuDj8/pTdGDnVBhIhiOIRnBUkR+P?= =?us-ascii?Q?QsSiTy73VYpleCouepgAUVkfFNpk2wI5a5TLjBAGZEPBp45hgNWHLQMsRP4M?= =?us-ascii?Q?R/bvGIprM/4XjoP9H8R3BG8aitNthXDO6dKq/PHQqJ/OAudBkXJMOfvSWWsa?= =?us-ascii?Q?6yiSQWYBdycnVt44pVqTcSsHir2DiqNM8Vn8u0fo/i8q1C2MnchUCgcKpbvS?= =?us-ascii?Q?9gXtbi7O0p3ag+vXsCAdOBJ8aSTtCkFYriRCw57lVDWMhtFp7E/6QkfSqZZA?= =?us-ascii?Q?DIsb+72bZRnBF/lEdHUn8T+Q0cv+FSEXFF0mrLD9umip/XKROduHH6nnz+tP?= =?us-ascii?Q?2A0Eu7RUriGTpJHSXR61vwzqCVMxMZn6gb3ap5Fu2iX+4cRlgrxM9Xjs3kmx?= =?us-ascii?Q?Pn4GzdSb2JhqpIj88EqT8bjs7HqDieg8jBB9eCWVo63mPuDs6E6+PFDPwCGY?= =?us-ascii?Q?iNjqTacIeF3CrfFza/XZZrulxi+BlSdCVX2OLC/rXLNguFHxL35L5r5jL9Fp?= =?us-ascii?Q?1qOqh0aDNsSXPl+cf35j/oA4/8sev2e216kJwT/e46RQfW/JYbJ1v/r2H3go?= =?us-ascii?Q?G48P4aFFU7vHqAS5e2Hxf7VrWBtGEj7yJ6St1AghUk94e51asOuprxhyWXiR?= =?us-ascii?Q?0y3pxze80ANH4aviIQ3vo6/qxY29M9cFYEvw3BSlvny7Vd1yuqCzMl7OJLeg?= =?us-ascii?Q?++iW3/6sQxDmdRXCqDLEAgxn/Wy6SRJgeyMvupgTBHrH45H9U2XAJcnYxM5Q?= =?us-ascii?Q?iLFfQsX1zARY60pzake+V1I6JRwzKFhyXVP?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1928; 5:PMf0yBhruU3LKcFofxI4d0AD8SbXwJVdXBsT+Y2bZ2Oi3nd0BOp3E4D2dgVz1oDHxr1BtE3t9NIADS11mmbMOS0to13kHxshdFg6YTYz4D6qdT/Ay1fKEfFBSgn8fKF/8rb7MDRuRW6jI7giXBKJ+nPCT/MDjJq+IXA6DHbQVpU=; 24:gSFSldJTKkFfI5vUS9TVKJ5C0PpYB2uUfgSEd0i7L2Pxlu6S6ngh+Hc2Dsdc3bCXQEQa76uVNo4XDZd0aiHihGlqvE0SBwd44mkRtO02n2g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2016 15:06:20.2727 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB1928 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160629_080642_619397_CC712AF2 X-CRM114-Status: GOOD ( 16.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aisheng.dong@nxp.com, anson.huang@nxp.com, mturquette@baylibre.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Freescale i.MX7D platform, all clocks operations, including enable/disable, rate change and re-parent, requires its parent clock on. Current clock core can not support it well. This patch adding flag CLK_OPS_PARENT_ENABLE to handle this special case in clock core that enable its parent clock firstly for each operation and disable it later after operation complete. The patch part 2 fixes set clock rate and set parent while its parent is off. The most special case is for set_parent() operation which requires all parents including both old and new one to be enabled at the same time during the operation. Cc: Michael Turquette Cc: Stephen Boyd Cc: Shawn Guo Signed-off-by: Dong Aisheng --- drivers/clk/clk.c | 52 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index e3bd28c9ef28..f1f56158b8c7 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1172,7 +1172,7 @@ static struct clk_core *__clk_set_parent_before(struct clk_core *core, struct clk_core *old_parent = core->parent; /* - * Migrate prepare state between parents and prevent race with + * 1. Migrate prepare state between parents and prevent race with * clk_enable(). * * If the clock is not prepared, then a race with @@ -1187,13 +1187,20 @@ static struct clk_core *__clk_set_parent_before(struct clk_core *core, * hardware and software states. * * See also: Comment for clk_set_parent() below. + * + * 2. enable parent clocks for CLK_OPS_PARENT_ENABLE clock */ + + /* enable old_parent & parent if CLK_OPS_PARENT_ENABLE is set */ + if (core->flags & CLK_OPS_PARENT_ENABLE) { + clk_core_prepare_enable(old_parent); + clk_core_prepare_enable(parent); + } + + /* migrate prepare count if > 0 */ if (core->prepare_count) { - clk_core_prepare(parent); - flags = clk_enable_lock(); - clk_core_enable(parent); - clk_core_enable(core); - clk_enable_unlock(flags); + clk_core_prepare_enable(parent); + clk_core_enable_lock(core); } /* update the clk tree topology */ @@ -1208,19 +1215,20 @@ static void __clk_set_parent_after(struct clk_core *core, struct clk_core *parent, struct clk_core *old_parent) { - unsigned long flags; - /* * Finish the migration of prepare state and undo the changes done * for preventing a race with clk_enable(). */ - if (core->prepare_count) { - flags = clk_enable_lock(); - clk_core_disable(core); - clk_core_disable(old_parent); - clk_enable_unlock(flags); - clk_core_unprepare(old_parent); - } + if (core->prepare_count) { + clk_core_disable_lock(core); + clk_core_disable_unprepare(old_parent); + + /* re-balance ref counting if CLK_OPS_PARENT_ENABLE is set */ + if (core->flags & CLK_OPS_PARENT_ENABLE) { + clk_core_disable_unprepare(parent); + clk_core_disable_unprepare(old_parent); + } + } static int __clk_set_parent(struct clk_core *core, struct clk_core *parent, @@ -1466,13 +1474,17 @@ static void clk_change_rate(struct clk_core *core) unsigned long best_parent_rate = 0; bool skip_set_rate = false; struct clk_core *old_parent; + struct clk_core *parent = NULL; old_rate = core->rate; - if (core->new_parent) + if (core->new_parent) { + parent = core->new_parent; best_parent_rate = core->new_parent->rate; - else if (core->parent) + } else if (core->parent) { + parent = core->parent; best_parent_rate = core->parent->rate; + } if (core->flags & CLK_SET_RATE_UNGATE) { unsigned long flags; @@ -1502,6 +1514,9 @@ static void clk_change_rate(struct clk_core *core) trace_clk_set_rate(core, core->new_rate); + if (core->flags & CLK_OPS_PARENT_ON) + clk_core_prepare_enable(parent); + if (!skip_set_rate && core->ops->set_rate) core->ops->set_rate(core->hw, core->new_rate, best_parent_rate); @@ -1518,6 +1533,9 @@ static void clk_change_rate(struct clk_core *core) clk_core_unprepare(core); } + if (core->flags & CLK_OPS_PARENT_ON) + clk_core_disable_unprepare(parent); + if (core->notifier_count && old_rate != core->rate) __clk_notify(core, POST_RATE_CHANGE, old_rate, core->rate);