From patchwork Wed Feb 14 13:43:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10218893 X-Patchwork-Delegate: mturquette@baylibre.com 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 06822602CB for ; Wed, 14 Feb 2018 13:44:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2B0128FD7 for ; Wed, 14 Feb 2018 13:44:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6F1428FE4; Wed, 14 Feb 2018 13:44:22 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21B3428FD7 for ; Wed, 14 Feb 2018 13:44:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030404AbeBNNny (ORCPT ); Wed, 14 Feb 2018 08:43:54 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:41241 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030376AbeBNNnu (ORCPT ); Wed, 14 Feb 2018 08:43:50 -0500 Received: by mail-wr0-f193.google.com with SMTP id q11so10403135wre.8 for ; Wed, 14 Feb 2018 05:43:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RjVrLiphTPM+bT6FXKwuW21cyg+7H6uho37k+GLzpRo=; b=0aWZ23TTZZm88XH8UqvN0hL/Dgam9nDl2nIu5RBQsIwU9Vr/VdWlE0Kul03f2OMdjy mBZqguBG2Kh8w5kDrKFfplOJmmShp9HJYI+3thcmBd6cHQ9f5eXfI6IZPdwFdNxX6Eg+ 9RP3mXe+J98I5Mol2Nnf1SYmGXU9qYRJqXoK14Xzz8/vlfyv3tswGd0DWOAVrDQx7llf eXWl/1eVHoE6lnq0fkVUq0CDNldXOrYutJZZH1Jh9YoGcPc8w996NgbzVYtKimleSmdT CE8er3P1wwpf8gTdcd2QY3k8+A+0KkTI+05J/E38PD8tsdtw4dE0fkdzEwUtapv7XSTf MfEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RjVrLiphTPM+bT6FXKwuW21cyg+7H6uho37k+GLzpRo=; b=iPi3WRV8rvz2E3ojigL4w0ZAo+LQorbBO9QzhfQ1JEd0Qo2MhYkdBfnA3TffXIhxh3 Jv1o4yFCylxMEaZg/hGdY/PExog3bma8QFbxkBOcYgt3+SY8AXxSgY3HA88RgeoX9XKI zfYCtTXBlKxZcpL9LtwLmm5G0oO8PD0X8je6xN7WSsWhuPoioaZ+ov/hRe8E3iJ8YQJp 7U9K9R4Fbgm2VHQ1Y/16v4IudgCL1A2SApZ7ebAs548LFSN/HXJY3GF/kOXw3mnhzu4O DEB+61D7wIy7nS55oREs3yJsEvlTZdynM9ShKUANBKPqjUvDHLWxlzAF2hGLIqA8+ssx 9RSA== X-Gm-Message-State: APf1xPBbqqA5WvkLekZRd/NZRXS8a5eBvd1Cg5MgOElsYmQbJV0tToqu aUKvCZwiofTlkx+2CHWRqEWmSw== X-Google-Smtp-Source: AH8x225RwRQde4dJVF3axO53t6M9DM+tVbll4+V1xh0a99Ss5yPICSeBmZXMfhPhiqt256tQb5V/mg== X-Received: by 10.223.186.83 with SMTP id t19mr4382315wrg.252.1518615829316; Wed, 14 Feb 2018 05:43:49 -0800 (PST) Received: from boomer.lan (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id k5sm6337694wmg.47.2018.02.14.05.43.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Feb 2018 05:43:48 -0800 (PST) From: Jerome Brunet To: Michael Turquette , Stephen Boyd Cc: Jerome Brunet , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Stephen Boyd , Shawn Guo , Dong Aisheng Subject: [PATCH v2 4/8] clk: migrate the count of orphaned clocks at init Date: Wed, 14 Feb 2018 14:43:36 +0100 Message-Id: <20180214134340.17242-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180214134340.17242-1-jbrunet@baylibre.com> References: <20180214134340.17242-1-jbrunet@baylibre.com> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The orphan clocks reparents should migrate any existing count from the orphan clock to its new acestor clocks, otherwise we may have inconsistent counts in the tree and end-up with gated critical clocks Assuming we have two clocks, A and B. * Clock A has CLK_IS_CRITICAL flag set. * Clock B is an ancestor of A which can gate. Clock B gate is left enabled by the bootloader. Step 1: Clock A is registered. Since it is a critical clock, it is enabled. The clock being still an orphan, no parent are enabled. Step 2: Clock B is registered and reparented to clock A (potentially through several other clocks). We are now in situation where the enable count of clock A is 1 while the enable count of its ancestors is 0, which is not good. Step 3: in lateinit, clk_disable_unused() is called, the enable_count of clock B being 0, clock B is gated and and critical clock A actually gets disabled. This situation was found while adding fdiv_clk gates to the meson8b platform. These clocks parent clk81 critical clock, which is the mother of all peripheral clocks in this system. Because of the issue described here, the system is crashing when clk_disable_unused() is called. The situation is solved by reverting commit f8f8f1d04494 ("clk: Don't touch hardware when reparenting during registration"). To avoid breaking again the situation described in this commit description, enabling critical clock should be done before walking the orphan list. This way, a parent critical clock may not be accidentally disabled due to the CLK_OPS_PARENT_ENABLE mechanism. Fixes: f8f8f1d04494 ("clk: Don't touch hardware when reparenting during registration") Cc: Stephen Boyd Cc: Shawn Guo Cc: Dong Aisheng Signed-off-by: Jerome Brunet Tested-by: Marek Szyprowski Tested-by: Heiko Stuebner --- drivers/clk/clk.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index a4b4e4d6df5e..cca05ea2c058 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2969,23 +2969,38 @@ static int __clk_core_init(struct clk_core *core) rate = 0; core->rate = core->req_rate = rate; + /* + * Enable CLK_IS_CRITICAL clocks so newly added critical clocks + * don't get accidentally disabled when walking the orphan tree and + * reparenting clocks + */ + if (core->flags & CLK_IS_CRITICAL) { + unsigned long flags; + + clk_core_prepare(core); + + flags = clk_enable_lock(); + clk_core_enable(core); + clk_enable_unlock(flags); + } + /* * walk the list of orphan clocks and reparent any that newly finds a * parent. */ hlist_for_each_entry_safe(orphan, tmp2, &clk_orphan_list, child_node) { struct clk_core *parent = __clk_init_parent(orphan); - unsigned long flags; /* - * we could call __clk_set_parent, but that would result in a - * redundant call to the .set_rate op, if it exists + * We need to use __clk_set_parent_before() and _after() to + * to properly migrate any prepare/enable count of the orphan + * clock. This is important for CLK_IS_CRITICAL clocks, which + * are enabled during init but might not have a parent yet. */ if (parent) { /* update the clk tree topology */ - flags = clk_enable_lock(); - clk_reparent(orphan, parent); - clk_enable_unlock(flags); + __clk_set_parent_before(orphan, parent); + __clk_set_parent_after(orphan, parent, NULL); __clk_recalc_accuracies(orphan); __clk_recalc_rates(orphan, 0); } @@ -3002,16 +3017,6 @@ static int __clk_core_init(struct clk_core *core) if (core->ops->init) core->ops->init(core->hw); - if (core->flags & CLK_IS_CRITICAL) { - unsigned long flags; - - clk_core_prepare(core); - - flags = clk_enable_lock(); - clk_core_enable(core); - clk_enable_unlock(flags); - } - kref_init(&core->ref); out: clk_pm_runtime_put(core);