From patchwork Sun May 21 21:59:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9739459 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 6BD9B6034C for ; Sun, 21 May 2017 22:00:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C8F1285C9 for ; Sun, 21 May 2017 22:00:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 517EB285F3; Sun, 21 May 2017 22:00:18 +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=ham 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 E5599285C9 for ; Sun, 21 May 2017 22:00:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755679AbdEUWAR (ORCPT ); Sun, 21 May 2017 18:00:17 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:36654 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752119AbdEUWAR (ORCPT ); Sun, 21 May 2017 18:00:17 -0400 Received: by mail-wm0-f50.google.com with SMTP id 7so44237110wmo.1 for ; Sun, 21 May 2017 15:00:16 -0700 (PDT) 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=qxGlneLhi0DtFZ/K9PowqOO6wosVfQhYDa79tn5rL6A=; b=NTqrL9RKG9SnESDsEX5115OVfEQromhnVgfRNFrWNvmM6lD6A42sqmcj/qnqUyMuam ac5S3Tj0CinjYjA87L/TmExOkHIOc2lxKCSCL59UN0+saKp/myvOVxkCzTgDYsWnpQV0 vw1/Gj8ImsZyRXcTLq9Ak70I3DT4JNfmJDgr3NazUvJ112UDzhz2uMnqAhAjlS1BHcCs 0hGFt5ukraQLG8u5es4KP0+dX1f9u27wnpGZLjh9ONbO9Nbd/w3yN6xAAKU4dOs2c2ri I3GL5y4ZLy/d6vVqs4KfBWHozu3GWbWopZZ7XThvrrWRTkNwhvrnGdsXPiej+TzaxppT OatA== 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=qxGlneLhi0DtFZ/K9PowqOO6wosVfQhYDa79tn5rL6A=; b=ksIgYD+oORnRwb0jVtWbOvOzgswAakbJtF4isAm71Ztw4JMO9gmkTGU839vk/FDg6C fsFLIZwlORCnVXTcA2w3wCv4Op6MAClWmp+BSVdWfg9dpzi9BVE1L6bWT1jb5ujMKM69 jjUo9eUgNnw+kQ+WtXo291KfHlqliBUEN1Se49K2tC6F6FvRcQjhUADiJa6K6wb5NZ9A aI97vlCcgzfZ253kpBYw3LfkKVXV1rAR4prsi1XeHcPGB5bDLosuXeI+tTch/ekto/pV z7dGkrXCZ11B0QeCn2H967VFYRKn7MGRXUN+a1YvwUieajKR3YuoenM+maFUmRIUp5sI vmPw== X-Gm-Message-State: AODbwcACMlCiMb+TZZQFJ6aHpXa6JjQOPzr5ez/ZoMs8VR1nnvQolb4O zifnpTBo448iPXAg X-Received: by 10.223.152.6 with SMTP id v6mr9092261wrb.60.1495404015546; Sun, 21 May 2017 15:00:15 -0700 (PDT) Received: from localhost.localdomain (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id a73sm12812579wrc.58.2017.05.21.15.00.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 May 2017 15:00:15 -0700 (PDT) From: Jerome Brunet To: Michael Turquette , Stephen Boyd , Kevin Hilman Cc: Jerome Brunet , linux-clk@vger.kernel.org, linux-amlogic@lists.infradead.org, Linus Walleij , Boris Brezillon Subject: [PATCH v2 03/11] clk: rework calls to round and determine rate callbacks Date: Sun, 21 May 2017 23:59:50 +0200 Message-Id: <20170521215958.19743-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170521215958.19743-1-jbrunet@baylibre.com> References: <20170521215958.19743-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 Rework the way the callbacks round_rate and determine_rate are called. The goal is to do this at a single point and make it easier to add conditions before calling them. This rework is done to ease the integration of "protected" clock functionality. Signed-off-by: Jerome Brunet --- drivers/clk/clk.c | 78 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 6031fada37f9..100f72472e10 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -833,16 +833,34 @@ static int clk_disable_unused(void) } late_initcall_sync(clk_disable_unused); -static int clk_core_round_rate_nolock(struct clk_core *core, - struct clk_rate_request *req) +static int clk_core_determine_round(struct clk_core *core, + struct clk_rate_request *req) { - struct clk_core *parent; long rate; - lockdep_assert_held(&prepare_lock); + if (core->ops->determine_rate) { + return core->ops->determine_rate(core->hw, req); + } else if (core->ops->round_rate) { + rate = core->ops->round_rate(core->hw, req->rate, + &req->best_parent_rate); + if (rate < 0) + return rate; - if (!core) - return 0; + req->rate = rate; + } else { + return -EINVAL; + } + + return 0; +} + +static void clk_core_init_rate_req(struct clk_core *core, + struct clk_rate_request *req) +{ + struct clk_core *parent; + + if (WARN_ON(!core || !req)) + return; parent = core->parent; if (parent) { @@ -852,22 +870,24 @@ static int clk_core_round_rate_nolock(struct clk_core *core, req->best_parent_hw = NULL; req->best_parent_rate = 0; } +} - if (core->ops->determine_rate) { - return core->ops->determine_rate(core->hw, req); - } else if (core->ops->round_rate) { - rate = core->ops->round_rate(core->hw, req->rate, - &req->best_parent_rate); - if (rate < 0) - return rate; +static int clk_core_round_rate_nolock(struct clk_core *core, + struct clk_rate_request *req) +{ + lockdep_assert_held(&prepare_lock); - req->rate = rate; - } else if (core->flags & CLK_SET_RATE_PARENT) { - return clk_core_round_rate_nolock(parent, req); - } else { - req->rate = core->rate; - } + if (!core) + return 0; + + clk_core_init_rate_req(core, req); + + if (core->ops->determine_rate || core->ops->round_rate) + return clk_core_determine_round(core, req); + else if (core->flags & CLK_SET_RATE_PARENT) + return clk_core_round_rate_nolock(core->parent, req); + req->rate = core->rate; return 0; } @@ -1356,36 +1376,26 @@ static struct clk_core *clk_calc_new_rates(struct clk_core *core, clk_core_get_boundaries(core, &min_rate, &max_rate); /* find the closest rate and parent clk/rate */ - if (core->ops->determine_rate) { + if (core->ops->determine_rate || core->ops->round_rate) { struct clk_rate_request req; req.rate = rate; req.min_rate = min_rate; req.max_rate = max_rate; - if (parent) { - req.best_parent_hw = parent->hw; - req.best_parent_rate = parent->rate; - } else { - req.best_parent_hw = NULL; - req.best_parent_rate = 0; - } - ret = core->ops->determine_rate(core->hw, &req); + clk_core_init_rate_req(core, &req); + + ret = clk_core_determine_round(core, &req); if (ret < 0) return NULL; best_parent_rate = req.best_parent_rate; new_rate = req.rate; parent = req.best_parent_hw ? req.best_parent_hw->core : NULL; - } else if (core->ops->round_rate) { - ret = core->ops->round_rate(core->hw, rate, - &best_parent_rate); - if (ret < 0) - return NULL; - new_rate = ret; if (new_rate < min_rate || new_rate > max_rate) return NULL; + } else if (!parent || !(core->flags & CLK_SET_RATE_PARENT)) { /* pass-through clock without adjustable parent */ core->new_rate = core->rate;