From patchwork Fri Nov 8 21:21:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3159931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6DC03C045B for ; Fri, 8 Nov 2013 21:25:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E4812047B for ; Fri, 8 Nov 2013 21:25:26 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3A49E20457 for ; Fri, 8 Nov 2013 21:25:25 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VetWf-00008g-W4; Fri, 08 Nov 2013 21:23:36 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VetWE-0006Cb-Pb; Fri, 08 Nov 2013 21:23:06 +0000 Received: from mail-pb0-x231.google.com ([2607:f8b0:400e:c01::231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VetV6-0005xd-Ti for linux-arm-kernel@lists.infradead.org; Fri, 08 Nov 2013 21:22:01 +0000 Received: by mail-pb0-f49.google.com with SMTP id um1so689852pbc.8 for ; Fri, 08 Nov 2013 13:21:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=RJUT8AlWks6AXMSNCQgmV6Z5yZFIvSDlMZujj4O4hyE=; b=qttjrCuAJki698ZJRiWcA6p7FgPtFoqgJdnNuhK+QEqd9da4lsGMuHAefqdV2nH7Or 90MeR8A0imzT0eAGFiD3f5M3BKpEaHdteloosui+dWlke4dveCj1odUMYQllsv5dAK6c Vcok8yyHLiyc7XXOG9zhswsfpZPG3dwvVCFQyEEP239LwdFCU+Za+iiwExE3rI+fdfgY M+0YjVLIgGJIxyOVP1Vv5Ooceesem7Y0EkI87raVelNT74OI6xEnVx4S9ndxlaQRa3y7 0iG7YVKEMxcVNzAhseofATRHnjGPY6t89sjOx/0fw3P6U9Vt8g43KWU37glszwFRAbbB JblA== X-Received: by 10.66.100.227 with SMTP id fb3mr18101094pab.26.1383945695344; Fri, 08 Nov 2013 13:21:35 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id dq3sm14175909pbc.35.2013.11.08.13.21.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 08 Nov 2013 13:21:34 -0800 (PST) From: Soren Brinkmann To: Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Russell King , Michal Simek , Daniel Lezcano , Thomas Gleixner Subject: [PATCH 5/7] clocksource/cadence_ttc: Overhaul clocksource frequency adjustment Date: Fri, 8 Nov 2013 13:21:15 -0800 Message-Id: <1383945677-29674-6-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1383945677-29674-1-git-send-email-soren.brinkmann@xilinx.com> References: <1383945677-29674-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131108_162157_304183_94E6B4F9 X-CRM114-Status: GOOD ( 24.25 ) X-Spam-Score: -1.9 (-) Cc: Soren Brinkmann , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The currently used method adjusting the clocksource to a changing input frequency does not work on kernels from 3.11 on. The new approach is to keep the timer frequency as constant as possible. I.e. - due to the TTC's prescaler limitations, allow frequency changes only if the frequency scales by a power of 2 - adjust the counter's divider on the fly when a frequency change occurs When suspending though, the driver should not prevent rate changes in order to allow the system to enter its low power state. For that reason a PM notifier is added so rate changes can be ignored during suspend/resume. This limits cpufreq to scale by certain factors only. But we may keep the time base somewhat constant, so that sleep() & co keep working as expected, while supporting cpufreq and suspend. Signed-off-by: Soren Brinkmann --- drivers/clocksource/cadence_ttc_timer.c | 142 +++++++++++++++++++++++++++----- 1 file changed, 122 insertions(+), 20 deletions(-) diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c index 68a336038d8f..421b942dd707 100644 --- a/drivers/clocksource/cadence_ttc_timer.c +++ b/drivers/clocksource/cadence_ttc_timer.c @@ -16,12 +16,14 @@ */ #include +#include #include #include #include #include #include #include +#include /* * This driver configures the 2 16-bit count-up timers as follows: @@ -52,6 +54,8 @@ #define TTC_CNT_CNTRL_DISABLE_MASK 0x1 #define TTC_CLK_CNTRL_CSRC_MASK (1 << 5) /* clock source */ +#define TTC_CLK_CNTRL_PSV_MASK 0x1e +#define TTC_CLK_CNTRL_PSV_SHIFT 1 /* * Setup the timers to use pre-scaling, using a fixed value for now that will @@ -63,6 +67,8 @@ #define CLK_CNTRL_PRESCALE_EN 1 #define CNT_CNTRL_RESET (1 << 4) +#define MAX_F_ERR 50 + /** * struct ttc_timer - This definition defines local timer structure * @@ -82,8 +88,13 @@ struct ttc_timer { container_of(x, struct ttc_timer, clk_rate_change_nb) struct ttc_timer_clocksource { + int scale_dir; + u32 scale_clk_ctrl_reg_old; + u32 scale_clk_ctrl_reg_new; + int suspending; struct ttc_timer ttc; struct clocksource cs; + struct notifier_block suspend_nb; }; #define to_ttc_timer_clksrc(x) \ @@ -228,33 +239,120 @@ static int ttc_rate_change_clocksource_cb(struct notifier_block *nb, struct ttc_timer_clocksource *ttccs = container_of(ttc, struct ttc_timer_clocksource, ttc); + if (ttccs->suspending) + return NOTIFY_OK; + switch (event) { - case POST_RATE_CHANGE: + case PRE_RATE_CHANGE: + { + u32 psv; + unsigned long factor, rate_low, rate_high; + + if (ndata->new_rate == ndata->old_rate) { + ttccs->scale_dir = 0; + return NOTIFY_OK; + } + + if (ndata->new_rate > ndata->old_rate) { + factor = DIV_ROUND_CLOSEST(ndata->new_rate, + ndata->old_rate); + ttccs->scale_dir = 1; + rate_low = ndata->old_rate; + rate_high = ndata->new_rate; + } else { + factor = DIV_ROUND_CLOSEST(ndata->old_rate, + ndata->new_rate); + ttccs->scale_dir = -1; + rate_low = ndata->new_rate; + rate_high = ndata->old_rate; + } + + if (!is_power_of_2(factor)) + return NOTIFY_BAD; + + if (abs(rate_high - (factor * rate_low)) > MAX_F_ERR) + return NOTIFY_BAD; + + factor = __ilog2_u32(factor); + /* - * Do whatever is necessary to maintain a proper time base - * - * I cannot find a way to adjust the currently used clocksource - * to the new frequency. __clocksource_updatefreq_hz() sounds - * good, but does not work. Not sure what's that missing. - * - * This approach works, but triggers two clocksource switches. - * The first after unregister to clocksource jiffies. And - * another one after the register to the newly registered timer. - * - * Alternatively we could 'waste' another HW timer to ping pong - * between clock sources. That would also use one register and - * one unregister call, but only trigger one clocksource switch - * for the cost of another HW timer used by the OS. + * store timer clock ctrl register so we can restore it in case + * of an abort. */ - clocksource_unregister(&ttccs->cs); - clocksource_register_hz(&ttccs->cs, - ndata->new_rate / PRESCALE); - /* fall through */ - case PRE_RATE_CHANGE: + ttccs->scale_clk_ctrl_reg_old = + __raw_readl(ttccs->ttc.base_addr + + TTC_CLK_CNTRL_OFFSET); + + psv = (ttccs->scale_clk_ctrl_reg_old & + TTC_CLK_CNTRL_PSV_MASK) >> + TTC_CLK_CNTRL_PSV_SHIFT; + if (ttccs->scale_dir < 0) + psv -= factor; + else + psv += factor; + + /* prescaler within legal range? */ + if (psv & ~(TTC_CLK_CNTRL_PSV_MASK >> TTC_CLK_CNTRL_PSV_SHIFT)) + return NOTIFY_BAD; + + ttccs->scale_clk_ctrl_reg_new = ttccs->scale_clk_ctrl_reg_old & + ~TTC_CLK_CNTRL_PSV_MASK; + ttccs->scale_clk_ctrl_reg_new |= psv << TTC_CLK_CNTRL_PSV_SHIFT; + + + /* scale down: adjust divider in post-change notification */ + if (ttccs->scale_dir < 0) + return NOTIFY_DONE; + + /* scale up: adjust divider now - before frequency change */ + __raw_writel(ttccs->scale_clk_ctrl_reg_new, + ttccs->ttc.base_addr + TTC_CLK_CNTRL_OFFSET); + break; + } + case POST_RATE_CHANGE: + /* scale up: pre-change notification did the adjustment */ + if (ttccs->scale_dir >= 0) + return NOTIFY_OK; + + /* scale down: adjust divider now - after frequency change */ + __raw_writel(ttccs->scale_clk_ctrl_reg_new, + ttccs->ttc.base_addr + TTC_CLK_CNTRL_OFFSET); + break; + case ABORT_RATE_CHANGE: + /* we have to undo the adjustment in case we scale up */ + if (ttccs->scale_dir <= 0) + return NOTIFY_OK; + + /* restore original register value */ + __raw_writel(ttccs->scale_clk_ctrl_reg_old, + ttccs->ttc.base_addr + TTC_CLK_CNTRL_OFFSET); + /* fall through */ default: return NOTIFY_DONE; } + + return NOTIFY_DONE; +} + +static int ttc_suspend_notifier_cb(struct notifier_block *nb, + unsigned long event, void *data) +{ + struct ttc_timer_clocksource *ttccs = container_of(nb, + struct ttc_timer_clocksource, suspend_nb); + + switch (event) { + case PM_SUSPEND_PREPARE: + ttccs->suspending = 1; + break; + case PM_POST_SUSPEND: + ttccs->suspending = 0; + break; + default: + break; + } + + return NOTIFY_DONE; } static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base) @@ -283,6 +381,10 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base) &ttccs->ttc.clk_rate_change_nb)) pr_warn("Unable to register clock notifier.\n"); + ttccs->suspend_nb.notifier_call = ttc_suspend_notifier_cb; + if (register_pm_notifier(&ttccs->suspend_nb)) + pr_warn("Unable to register PM notifier.\n"); + ttccs->ttc.base_addr = base; ttccs->cs.name = "ttc_clocksource"; ttccs->cs.rating = 200;