From patchwork Fri Jul 24 16:58:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 51457 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id A4A3520323 for ; Fri, 24 Jul 2015 16:59:04 +0000 (UTC) Received: by lbcjj5 with SMTP id jj5sf9304952lbc.1 for ; Fri, 24 Jul 2015 09:59:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=tT4QS/t/PFUFGMfiagm2HdqLwuFlp38Nho2wzyeiYUY=; b=iFk08XPAH5lRgn3/QH7YNEoxtEwyqTTOpVxGcOjFbLBpEDRqdJdtk+aduPtFG+YXp7 QeCfF/myVE05lDNHQHdGicRG+h/G2WQtlV84vfm9rRmlKPwvsoW2K7Kh91k4y5hxroo5 U3Em/ZJEnVg9elVLqW7DLa1ImGvL+w35Xo38mvLqulmLBiMr6JRERh+ATz6YpCPmz0Se kYUgcRh1lSJsSGW0dpXKe+NG3PLC00MSlAFyQbCq4hemQEZqqeQyn7aYnmJdTSitoHoX 2sN8QjgyZA3UnUI1M+8+BVnTlvfSb4iOEKwqAwLiH3X1O9a4hodjl1ZnuKwa6cnw4vUA OWtA== X-Gm-Message-State: ALoCoQlerOIkE9EVPFyKp04h//Uz44oFLh/lSdU77vhRAVcXZwC1kGY09vc9d17kc3Gc733Wtec6 X-Received: by 10.112.9.100 with SMTP id y4mr6509265lba.20.1437757143611; Fri, 24 Jul 2015 09:59:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.136 with SMTP id kq8ls459997lac.32.gmail; Fri, 24 Jul 2015 09:59:03 -0700 (PDT) X-Received: by 10.153.7.166 with SMTP id dd6mr14639039lad.42.1437757143316; Fri, 24 Jul 2015 09:59:03 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id pc7si8013905lbb.120.2015.07.24.09.59.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jul 2015 09:59:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lagw2 with SMTP id w2so17665438lag.3 for ; Fri, 24 Jul 2015 09:59:03 -0700 (PDT) X-Received: by 10.112.55.207 with SMTP id u15mr14599255lbp.88.1437757143151; Fri, 24 Jul 2015 09:59:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp110977lba; Fri, 24 Jul 2015 09:59:02 -0700 (PDT) X-Received: by 10.50.59.242 with SMTP id c18mr8249460igr.66.1437757141446; Fri, 24 Jul 2015 09:59:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd5si2376139igb.0.2015.07.24.09.59.00; Fri, 24 Jul 2015 09:59:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754571AbbGXQ6x (ORCPT + 28 others); Fri, 24 Jul 2015 12:58:53 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:37196 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754721AbbGXQ6t (ORCPT ); Fri, 24 Jul 2015 12:58:49 -0400 Received: by wibud3 with SMTP id ud3so35930075wib.0 for ; Fri, 24 Jul 2015 09:58:48 -0700 (PDT) X-Received: by 10.180.76.202 with SMTP id m10mr9296265wiw.63.1437757128098; Fri, 24 Jul 2015 09:58:48 -0700 (PDT) Received: from mms.wifi.mm-sol.com ([37.157.136.206]) by smtp.googlemail.com with ESMTPSA id ft5sm4415485wib.4.2015.07.24.09.58.46 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Jul 2015 09:58:47 -0700 (PDT) From: Georgi Djakov To: sboyd@codeaurora.org, agross@codeaurora.org Cc: mturquette@linaro.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v2 2/5] clk: Add safe switch hook Date: Fri, 24 Jul 2015 19:58:36 +0300 Message-Id: <1437757119-6910-3-git-send-email-georgi.djakov@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1437757119-6910-1-git-send-email-georgi.djakov@linaro.org> References: <1437757119-6910-1-git-send-email-georgi.djakov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: georgi.djakov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Stephen Boyd Sometimes clocks can't accept their parent source turning off while the source is reprogrammed to a different rate. Most notably CPU clocks require a way to switch away from the current PLL they're running on, reprogram that PLL to a new rate, and then switch back to the PLL with the new rate once they're done. Add a hook that drivers can implement allowing them to return a 'safe parent' and 'safe frequency' that they can switch their parent to while the upstream source is reprogrammed to support this. Signed-off-by: Stephen Boyd Signed-off-by: Georgi Djakov --- drivers/clk/clk.c | 73 +++++++++++++++++++++++++++++++++++++++--- include/linux/clk-provider.h | 2 ++ 2 files changed, 70 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 67f778bd093b..94d52ddafc21 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -51,9 +51,13 @@ struct clk_core { struct clk_core **parents; u8 num_parents; u8 new_parent_index; + u8 safe_parent_index; unsigned long rate; unsigned long req_rate; + unsigned long old_rate; unsigned long new_rate; + unsigned long safe_freq; + struct clk_core *safe_parent; struct clk_core *new_parent; struct clk_core *new_child; unsigned long flags; @@ -1244,7 +1248,9 @@ out: static void clk_calc_subtree(struct clk_core *core, unsigned long new_rate, struct clk_core *new_parent, u8 p_index) { - struct clk_core *child; + struct clk_core *child, *parent; + struct clk_hw *parent_hw; + unsigned long safe_freq = 0; core->new_rate = new_rate; core->new_parent = new_parent; @@ -1254,6 +1260,23 @@ static void clk_calc_subtree(struct clk_core *core, unsigned long new_rate, if (new_parent && new_parent != core->parent) new_parent->new_child = core; + if (core->ops->get_safe_parent) { + parent_hw = core->ops->get_safe_parent(core->hw, &safe_freq); + if (parent_hw) { + parent = parent_hw->core; + p_index = clk_fetch_parent_index(core, parent); + core->safe_parent_index = p_index; + core->safe_parent = parent; + if (safe_freq) + core->safe_freq = safe_freq; + else + core->safe_freq = 0; + } + } else { + core->safe_parent = NULL; + core->safe_freq = 0; + } + hlist_for_each_entry(child, &core->children, child_node) { child->new_rate = clk_recalc(child, new_rate); clk_calc_subtree(child, child->new_rate, NULL, 0); @@ -1366,14 +1389,51 @@ static struct clk_core *clk_propagate_rate_change(struct clk_core *core, unsigned long event) { struct clk_core *child, *tmp_clk, *fail_clk = NULL; + struct clk_core *old_parent; int ret = NOTIFY_DONE; - if (core->rate == core->new_rate) + if (core->rate == core->new_rate && event != POST_RATE_CHANGE) return NULL; + switch (event) { + case PRE_RATE_CHANGE: + if (core->safe_parent) { + if (core->safe_freq) + core->ops->set_rate_and_parent(core->hw, + core->safe_freq, + core->safe_parent->rate, + core->safe_parent_index); + else + core->ops->set_parent(core->hw, + core->safe_parent_index); + } + core->old_rate = core->rate; + break; + case POST_RATE_CHANGE: + if (core->safe_parent) { + old_parent = __clk_set_parent_before(core, + core->new_parent); + if (core->ops->set_rate_and_parent) { + core->ops->set_rate_and_parent(core->hw, + core->new_rate, + core->new_parent ? + core->new_parent->rate : 0, + core->new_parent_index); + } else if (core->ops->set_parent) { + core->ops->set_parent(core->hw, + core->new_parent_index); + } + __clk_set_parent_after(core, core->new_parent, + old_parent); + } + break; + } + if (core->notifier_count) { - ret = __clk_notify(core, event, core->rate, core->new_rate); - if (ret & NOTIFY_STOP_MASK) + if (event != POST_RATE_CHANGE || core->old_rate != core->rate) + ret = __clk_notify(core, event, core->old_rate, + core->new_rate); + if (ret & NOTIFY_STOP_MASK && event != POST_RATE_CHANGE) fail_clk = core; } @@ -1416,7 +1476,8 @@ static void clk_change_rate(struct clk_core *core) else if (core->parent) best_parent_rate = core->parent->rate; - if (core->new_parent && core->new_parent != core->parent) { + if (core->new_parent && core->new_parent != core->parent && + !core->safe_parent) { old_parent = __clk_set_parent_before(core, core->new_parent); trace_clk_set_parent(core, core->new_parent); @@ -1500,6 +1561,8 @@ static int clk_core_set_rate_nolock(struct clk_core *core, core->req_rate = req_rate; + clk_propagate_rate_change(top, POST_RATE_CHANGE); + return ret; } diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 402478ed9933..9e032c52462d 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -202,6 +202,8 @@ struct clk_ops { struct clk_rate_request *req); int (*set_parent)(struct clk_hw *hw, u8 index); u8 (*get_parent)(struct clk_hw *hw); + struct clk_hw *(*get_safe_parent)(struct clk_hw *hw, + unsigned long *safe_freq); int (*set_rate)(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate); int (*set_rate_and_parent)(struct clk_hw *hw,