From patchwork Fri Jun 23 09:00:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 106243 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp104061qgd; Fri, 23 Jun 2017 02:01:51 -0700 (PDT) X-Received: by 10.84.232.5 with SMTP id h5mr8054780plk.261.1498208511086; Fri, 23 Jun 2017 02:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498208511; cv=none; d=google.com; s=arc-20160816; b=UNMuanRGnuEmSSx4mcUpQcX8CR1PKo2Pukd1523kL98KgFnHnr9FFUVFU7XcHW9oCI 8bUopYhiz0Z8qnFyRhyKK5Y4CDMvvfs364KR1s4yxZ4ApBlrTka4LXt7bMJ5ZIgtbtDg pEPjqJntScKy51MHyxoM3T/Kcd4NLnxnakSEcFJCCVnh4mxwonYQwzqaxiSU651+wRmy ppx40oLeVicCQEybGdmUEYl36cbuwpJ3qNbJ6on1P4/lbJ8onntQ70KWTfhAh0sY4RAh 8dOVeRcWY3tR+aGzxwfFR+Vyv5jUTBZju8gjjijwhOWNZXFO17Yh5k1pIiNRSN2dSek3 vyhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=uApCZBbD30SqDCyR6FdxrXAwl3ilqiJCPwsUcT4s1B8=; b=dnYtoVMeBwGb/zjlcHdJbl5yC/N+JpCTvNOuq7fH52JX3/qe5ar1ppECJoe/tuMD6S UMEwyc5kNTp+lVfZOyeOvFcyWd3G+21N93LuUJwp1qWn7PcoEa2m5+B1wdU8TrXWAWdA XhEICRbCE8r/5lAtTMFNKbivKQKFGMmnH8SaZrE62JpJ+E71zwXzeLycAYQY6QqJL+78 42xU8slsGa+8drnNGilnqEt9/D552rGEBT1Xoilln8E7j4V7wnT6TvI2Wnv+xmFmZCse tGswcDcMmlYF1C2nl9qvfOyyvWlw+j2B0iXVxhhPxjPnIdO01+AFKcvnw4beSZMOU4GH E5xA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c206si2933971pfc.424.2017.06.23.02.01.50; Fri, 23 Jun 2017 02:01:51 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754323AbdFWJBc (ORCPT + 25 others); Fri, 23 Jun 2017 05:01:32 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:36261 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754140AbdFWJBX (ORCPT ); Fri, 23 Jun 2017 05:01:23 -0400 Received: by mail.free-electrons.com (Postfix, from userid 110) id 7AAA720981; Fri, 23 Jun 2017 11:01:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 1C8CA20922; Fri, 23 Jun 2017 11:01:19 +0200 (CEST) From: Quentin Schulz To: mturquette@baylibre.com, sboyd@codeaurora.org, robh+dt@kernel.org, mark.rutland@arm.com, nicolas.ferre@microchip.com, alexandre.belloni@free-electrons.com, linux@armlinux.org.uk, boris.brezillon@free-electrons.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com Cc: Quentin Schulz , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, thomas.petazzoni@free-electrons.com Subject: [PATCH 5/6] clk: at91: clk-generated: make gclk determine audio_pll rate Date: Fri, 23 Jun 2017 11:00:58 +0200 Message-Id: <20170623090059.8371-6-quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170623090059.8371-1-quentin.schulz@free-electrons.com> References: <20170623090059.8371-1-quentin.schulz@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allows gclk to determine audio_pll rate and set the parent rate accordingly. However, there are multiple children clocks that could technically change the rate of audio_pll. Since the clock rate is usually critical for IPs, it isn't a good idea to have multiple clocks changing audio_pll clock rate. There isn't any rate locking system for the moment, thus we enforce that classd_gclk be the only one allowed to change audio_pll rate. To remain consistent, we deny other clocks to be children of audio_pll so classd_gclk altering audio_pll rate does not impact any other device. This needs to be re-worked once we have a rate locking system so two clocks could be children of the same clock and be sure the clock rate isn't changed by one or the other. Signed-off-by: Quentin Schulz --- drivers/clk/at91/clk-generated.c | 41 ++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) -- 2.11.0 diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c index 6530a2e7e84d..e66ee735a569 100644 --- a/drivers/clk/at91/clk-generated.c +++ b/drivers/clk/at91/clk-generated.c @@ -26,6 +26,9 @@ #define GENERATED_SOURCE_MAX 6 #define GENERATED_MAX_DIV 255 +#define GCK_ID_CLASSD 59 +#define GCK_INDEX_DT_AUDIO_PLL 5 + struct clk_generated { struct clk_hw hw; struct regmap *regmap; @@ -126,15 +129,14 @@ static int clk_generated_determine_rate(struct clk_hw *hw, { struct clk_generated *gck = to_clk_generated(hw); struct clk_hw *parent = NULL; + struct clk_rate_request req_parent = *req; long best_rate = -EINVAL; - unsigned long min_rate; + unsigned long min_rate, parent_rate; int best_diff = -1; int i; + u32 div; - for (i = 0; i < clk_hw_get_num_parents(hw); i++) { - u32 div; - unsigned long parent_rate; - + for (i = 0; i < clk_hw_get_num_parents(hw) - 1; i++) { parent = clk_hw_get_parent_by_index(hw, i); if (!parent) continue; @@ -150,11 +152,37 @@ static int clk_generated_determine_rate(struct clk_hw *hw, clk_generated_best_diff(req, parent, parent_rate, div, &best_diff, &best_rate); + if (!best_diff) + break; + } + + /* + * The audio_pll rate can be modified unlike the five others clocks that + * should never be altered. + * The audio_pll can technically be used by multiple consumers. However, + * they all are likely to want to modify its rate while the rate is + * critical for each one. Since we do not have a rate locking for the + * moment, let classd_gclk be the only consumer of the audio_pll clock. + */ + + if (gck->id != GCK_ID_CLASSD) + goto end; + + parent = clk_hw_get_parent_by_index(hw, GCK_INDEX_DT_AUDIO_PLL); + if (!parent) + goto end; + + for (div = 1; div < GENERATED_MAX_DIV + 2; div++) { + req_parent.rate = req->rate * div; + __clk_determine_rate(parent, &req_parent); + clk_generated_best_diff(req, parent, req_parent.rate, div, + &best_diff, &best_rate); if (!best_diff) break; } +end: pr_debug("GCLK: %s, best_rate = %ld, parent clk: %s @ %ld\n", __func__, best_rate, __clk_get_name((req->best_parent_hw)->clk), @@ -264,7 +292,8 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock, init.ops = &generated_ops; init.parent_names = parent_names; init.num_parents = num_parents; - init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE; + init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | + CLK_SET_RATE_PARENT; gck->id = id; gck->hw.init = &init;