From patchwork Tue Sep 25 16:05:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 1505111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id AAEA63FC71 for ; Tue, 25 Sep 2012 16:08:33 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TGXeV-0003cS-Be; Tue, 25 Sep 2012 16:06:27 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TGXe1-0003YR-5x for linux-arm-kernel@lists.infradead.org; Tue, 25 Sep 2012 16:05:59 +0000 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id q8PG5tOs027878; Tue, 25 Sep 2012 11:05:55 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8PG5toJ002140; Tue, 25 Sep 2012 11:05:55 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Tue, 25 Sep 2012 11:05:55 -0500 Received: from localhost.localdomain (h64-6.vpn.ti.com [172.24.64.6]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8PG5nP7021798; Tue, 25 Sep 2012 11:05:54 -0500 From: Tero Kristo To: , , Subject: [PATCHv6 03/11] ARM: OMAP3+: voltage: add support for voltagedomain usecounts Date: Tue, 25 Sep 2012 19:05:34 +0300 Message-ID: <1348589142-11983-4-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1348589142-11983-1-git-send-email-t-kristo@ti.com> References: <1348589142-11983-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.41 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org These are updated based on powerdomain usecounts. Also added support for voltdm->sleep and voltdm->wakeup calls that will be invoked once voltagedomain enters sleep or wakes up based on usecount numbers. These will be used for controlling voltage scaling functionality. Signed-off-by: Tero Kristo Cc: Paul Walmsley Cc: Kevin Hilman --- arch/arm/mach-omap2/powerdomain.c | 17 +++++++++- arch/arm/mach-omap2/voltage.c | 65 +++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/voltage.h | 13 +++++++ 3 files changed, 94 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index ba49029..abc50c2 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -1475,10 +1475,17 @@ int pwrdm_state_switch(struct powerdomain *pwrdm) */ void pwrdm_clkdm_enable(struct powerdomain *pwrdm) { + unsigned long flags; + if (!pwrdm) return; - atomic_inc(&pwrdm->usecount); + spin_lock_irqsave(&pwrdm->lock, flags); + + if (atomic_inc_return(&pwrdm->usecount) == 1) + voltdm_pwrdm_enable(pwrdm->voltdm.ptr); + + spin_unlock_irqrestore(&pwrdm->lock, flags); } /** @@ -1492,12 +1499,20 @@ void pwrdm_clkdm_enable(struct powerdomain *pwrdm) void pwrdm_clkdm_disable(struct powerdomain *pwrdm) { int val; + unsigned long flags; if (!pwrdm) return; + spin_lock_irqsave(&pwrdm->lock, flags); + val = atomic_dec_return(&pwrdm->usecount); + if (!val) + voltdm_pwrdm_disable(pwrdm->voltdm.ptr); + + spin_unlock_irqrestore(&pwrdm->lock, flags); + WARN_ON(val < 0); } diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index 4dc60e8..0fc2a25 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -340,6 +340,70 @@ int voltdm_add_pwrdm(struct voltagedomain *voltdm, struct powerdomain *pwrdm) } /** + * voltdm_pwrdm_enable - increase usecount for a voltagedomain + * @voltdm: struct voltagedomain * to increase count for + * + * Increases usecount for a given voltagedomain. If the usecount reaches + * 1, the domain is awakened from idle and the function will call the + * voltagedomain->wakeup callback for this domain. + */ +void voltdm_pwrdm_enable(struct voltagedomain *voltdm) +{ + unsigned long flags; + + if (!voltdm) + return; + + spin_lock_irqsave(&voltdm->lock, flags); + + if (atomic_inc_return(&voltdm->usecount) == 1 && voltdm->wakeup) + voltdm->wakeup(voltdm); + + spin_unlock_irqrestore(&voltdm->lock, flags); +} + +/** + * voltdm_pwrdm_disable - decrease usecount for a voltagedomain + * @voltdm: struct voltagedomain * to decrease count for + * + * Decreases the usecount for a given voltagedomain. If the usecount + * reaches zero, the domain can idle and the function will call the + * voltagedomain->sleep callback, and calculate the overall target + * state for the voltagedomain. + */ +void voltdm_pwrdm_disable(struct voltagedomain *voltdm) +{ + u8 target_state = PWRDM_POWER_OFF; + int state; + struct powerdomain *pwrdm; + int val; + unsigned long flags; + + if (!voltdm) + return; + + spin_lock_irqsave(&voltdm->lock, flags); + + val = atomic_dec_return(&voltdm->usecount); + + WARN_ON(val < 0); + + if (val == 0) { + /* Determine target state for voltdm */ + list_for_each_entry(pwrdm, &voltdm->pwrdm_list, voltdm_node) { + state = pwrdm_read_next_pwrst(pwrdm); + if (state > target_state) + target_state = state; + } + voltdm->target_state = target_state; + if (voltdm->sleep) + voltdm->sleep(voltdm); + } + + spin_unlock_irqrestore(&voltdm->lock, flags); +} + +/** * voltdm_for_each_pwrdm - call function for each pwrdm in a voltdm * @voltdm: struct voltagedomain * to iterate over * @fn: callback function * @@ -402,6 +466,7 @@ static int _voltdm_register(struct voltagedomain *voltdm) INIT_LIST_HEAD(&voltdm->pwrdm_list); list_add(&voltdm->node, &voltdm_list); + spin_lock_init(&voltdm->lock); pr_debug("voltagedomain: registered %s\n", voltdm->name); return 0; diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index 0ac2caf..7f4f99d 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h @@ -15,6 +15,7 @@ #define __ARCH_ARM_MACH_OMAP2_VOLTAGE_H #include +#include #include @@ -56,10 +57,14 @@ struct omap_vfsm_instance { * @pwrdm_list: list_head linking all powerdomains in this voltagedomain * @vc: pointer to VC channel associated with this voltagedomain * @vp: pointer to VP associated with this voltagedomain + * @usecount: number of users for this voltagedomain + * @target_state: calculated target state for the children of this domain * @read: read a VC/VP register * @write: write a VC/VP register * @read: read-modify-write a VC/VP register * @sys_clk: system clock name/frequency, used for various timing calculations + * @sleep: function to call once the domain enters idle + * @wakeup: function to call once the domain wakes up from idle * @scale: function used to scale the voltage of the voltagedomain * @nominal_volt: current nominal voltage for this voltage domain * @volt_data: voltage table having the distinct voltages supported @@ -75,6 +80,9 @@ struct voltagedomain { struct omap_vp_instance *vp; struct omap_voltdm_pmic *pmic; + atomic_t usecount; + u8 target_state; + /* VC/VP register access functions: SoC specific */ u32 (*read) (u8 offset); void (*write) (u32 val, u8 offset); @@ -85,11 +93,14 @@ struct voltagedomain { u32 rate; } sys_clk; + void (*sleep) (struct voltagedomain *voltdm); + void (*wakeup) (struct voltagedomain *voltdm); int (*scale) (struct voltagedomain *voltdm, unsigned long target_volt); u32 nominal_volt; struct omap_volt_data *volt_data; + spinlock_t lock; }; /** @@ -145,6 +156,8 @@ extern void omap44xx_voltagedomains_init(void); struct voltagedomain *voltdm_lookup(const char *name); void voltdm_init(struct voltagedomain **voltdm_list); int voltdm_add_pwrdm(struct voltagedomain *voltdm, struct powerdomain *pwrdm); +void voltdm_pwrdm_enable(struct voltagedomain *voltdm); +void voltdm_pwrdm_disable(struct voltagedomain *voltdm); int voltdm_for_each(int (*fn)(struct voltagedomain *voltdm, void *user), void *user); int voltdm_for_each_pwrdm(struct voltagedomain *voltdm,