From patchwork Mon Jun 12 19:44:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9782677 X-Patchwork-Delegate: sboyd@codeaurora.org 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 4BCA4603B5 for ; Mon, 12 Jun 2017 19:44:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DC35284EE for ; Mon, 12 Jun 2017 19:44:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 326FE284F1; Mon, 12 Jun 2017 19:44:56 +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 B5760286C8 for ; Mon, 12 Jun 2017 19:44:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752653AbdFLTox (ORCPT ); Mon, 12 Jun 2017 15:44:53 -0400 Received: from mail-wr0-f173.google.com ([209.85.128.173]:32888 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752583AbdFLTow (ORCPT ); Mon, 12 Jun 2017 15:44:52 -0400 Received: by mail-wr0-f173.google.com with SMTP id v104so108340116wrb.0 for ; Mon, 12 Jun 2017 12:44:51 -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=/raVghqy5m49cnhpvUKyZvvW8DgCOuUQI2LyK2ci9xU=; b=OdqwuSu0EfvC3Yw4oXetSH1zOI8pEYTDIImj7JdDulU8a3IqL0tmDm856wmKthf9O7 uePlhQ1ttmm0hor+V2a4fX/DawTfzvxz/cdFfT2xPIEvM+54FdThnioGCvGyMFavn+Eo o8s2CS67WxazY7/5hwQNS+bWBiSfLvi65YVB9LAp6g0HaBgLw+7zLeYF7/MEmIcBbDVp pk5RrwTx471nk1sHmN3HmnjHwIl5i96eMOqMt2cGaaAeuHhW5EQJlkBAm06kRjYwyCXZ oIlpWkbGWQDS0sRnX1j684RHSwoQvSCJxXv2+iar62RJBWJnCahrQdZVPUwNxgA8EcpE zKmQ== 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=/raVghqy5m49cnhpvUKyZvvW8DgCOuUQI2LyK2ci9xU=; b=uJz2lyp7X677O6fZaNGGAVl/lpYmjpMMz98YAPdXC7pOmOmtLAcg/V3Gq44Ncnkjk6 Iu77uf31Zr+8xB6pTzcfojPE+avq3VBUXCkUrXYaUN6UlyOFKmPy5zelxUeHsBQd+NA7 3Fk2mZVZQGaU6x6EhVgad/HQLLMA7bez/Kb0kg/V/u/4f961pdbgYxNtZUE4+3AbE91l QWMQGUP30VVFqGFhVpaApucMhVpGQsUwGNaa1DLTLsW8LTJiiOpGj59+hthSAjIcEQ56 1IdBxw6tFjAlACAh32r7v5oQ1XxnJZKqRatHSPBwCBMNywm2646VqyhV0yJBr9+ze37C CFCw== X-Gm-Message-State: AKS2vOx4Po7JfT/UJUGwIsYTVbDEKn7myTSKq1QMmpTqOPMTnDyn8H5a ziecb7tlxpC7Ab+D X-Received: by 10.223.134.161 with SMTP id 30mr408231wrx.20.1497296689797; Mon, 12 Jun 2017 12:44:49 -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 70sm13250797wmu.28.2017.06.12.12.44.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 12:44:49 -0700 (PDT) From: Jerome Brunet To: Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org Cc: Jerome Brunet , Kevin Hilman , linux-amlogic@lists.infradead.org, Russell King , Linus Walleij , Boris Brezillon Subject: [PATCH v3 03/10] clk: rework calls to round and determine rate callbacks Date: Mon, 12 Jun 2017 21:44:31 +0200 Message-Id: <20170612194438.12298-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170612194438.12298-1-jbrunet@baylibre.com> References: <20170612194438.12298-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 dceaf0ff23db..8cc4672414be 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;