From: Colin Cross <ccross@android.com> To: linux-tegra@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, olof@lixom.net, konkers@android.com, Colin Cross <ccross@android.com>, Russell King <linux@arm.linux.org.uk>, linux-kernel@vger.kernel.org Subject: [PATCH v2 20/28] ARM: tegra: cpufreq: Disable cpufreq during suspend Date: Sun, 23 Jan 2011 18:01:25 -0800 [thread overview] Message-ID: <1295834493-5019-21-git-send-email-ccross@android.com> (raw) In-Reply-To: <1295834493-5019-1-git-send-email-ccross@android.com> Adds a SUSPEND_PREPARE notification hook to drop the frequency to the lowest possible during suspend. This prevents the cpufreq driver from attempting regulator calls after suspend has started - the regulator api can call into drivers that have already been suspended. Also adds 216MHz (off of PLLP) as the lowest CPU frequency, which allows PLLX to be turned off. Signed-off-by: Colin Cross <ccross@android.com> --- arch/arm/mach-tegra/cpu-tegra.c | 75 +++++++++++++++++++++++++++++++-------- 1 files changed, 60 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c index fea5719..ad26a9f 100644 --- a/arch/arm/mach-tegra/cpu-tegra.c +++ b/arch/arm/mach-tegra/cpu-tegra.c @@ -28,6 +28,7 @@ #include <linux/err.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/suspend.h> #include <asm/system.h> @@ -36,14 +37,15 @@ /* Frequency table index must be sequential starting at 0 */ static struct cpufreq_frequency_table freq_table[] = { - { 0, 312000 }, - { 1, 456000 }, - { 2, 608000 }, - { 3, 760000 }, - { 4, 816000 }, - { 5, 912000 }, - { 6, 1000000 }, - { 7, CPUFREQ_TABLE_END }, + { 0, 216000 }, + { 1, 312000 }, + { 2, 456000 }, + { 3, 608000 }, + { 4, 760000 }, + { 5, 816000 }, + { 6, 912000 }, + { 7, 1000000 }, + { 8, CPUFREQ_TABLE_END }, }; #define NUM_CPUS 2 @@ -51,6 +53,8 @@ static struct cpufreq_frequency_table freq_table[] = { static struct clk *cpu_clk; static unsigned long target_cpu_speed[NUM_CPUS]; +static DEFINE_MUTEX(tegra_cpu_lock); +static bool is_suspended; int tegra_verify_speed(struct cpufreq_policy *policy) { @@ -68,16 +72,11 @@ unsigned int tegra_getspeed(unsigned int cpu) return rate; } -static int tegra_update_cpu_speed(void) +static int tegra_update_cpu_speed(unsigned long rate) { - int i; - unsigned long rate = 0; int ret = 0; struct cpufreq_freqs freqs; - for_each_online_cpu(i) - rate = max(rate, target_cpu_speed[i]); - freqs.old = tegra_getspeed(0); freqs.new = rate; @@ -105,12 +104,30 @@ static int tegra_update_cpu_speed(void) return 0; } +static unsigned long tegra_cpu_highest_speed(void) +{ + unsigned long rate = 0; + int i; + + for_each_online_cpu(i) + rate = max(rate, target_cpu_speed[i]); + return rate; +} + static int tegra_target(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation) { int idx; unsigned int freq; + int ret = 0; + + mutex_lock(&tegra_cpu_lock); + + if (is_suspended) { + ret = -EBUSY; + goto out; + } cpufreq_frequency_table_target(policy, freq_table, target_freq, relation, &idx); @@ -119,9 +136,34 @@ static int tegra_target(struct cpufreq_policy *policy, target_cpu_speed[policy->cpu] = freq; - return tegra_update_cpu_speed(); + ret = tegra_update_cpu_speed(tegra_cpu_highest_speed()); + +out: + mutex_unlock(&tegra_cpu_lock); + return ret; } +static int tegra_pm_notify(struct notifier_block *nb, unsigned long event, + void *dummy) +{ + mutex_lock(&tegra_cpu_lock); + if (event == PM_SUSPEND_PREPARE) { + is_suspended = true; + pr_info("Tegra cpufreq suspend: setting frequency to %d kHz\n", + freq_table[0].frequency); + tegra_update_cpu_speed(freq_table[0].frequency); + } else if (event == PM_POST_SUSPEND) { + is_suspended = false; + } + mutex_unlock(&tegra_cpu_lock); + + return NOTIFY_OK; +} + +static struct notifier_block tegra_cpu_pm_notifier = { + .notifier_call = tegra_pm_notify, +}; + static int tegra_cpu_init(struct cpufreq_policy *policy) { if (policy->cpu >= NUM_CPUS) @@ -142,6 +184,9 @@ static int tegra_cpu_init(struct cpufreq_policy *policy) policy->shared_type = CPUFREQ_SHARED_TYPE_ALL; cpumask_copy(policy->related_cpus, cpu_possible_mask); + if (policy->cpu == 0) + register_pm_notifier(&tegra_cpu_pm_notifier); + return 0; } -- 1.7.3.1
WARNING: multiple messages have this Message-ID (diff)
From: ccross@android.com (Colin Cross) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 20/28] ARM: tegra: cpufreq: Disable cpufreq during suspend Date: Sun, 23 Jan 2011 18:01:25 -0800 [thread overview] Message-ID: <1295834493-5019-21-git-send-email-ccross@android.com> (raw) In-Reply-To: <1295834493-5019-1-git-send-email-ccross@android.com> Adds a SUSPEND_PREPARE notification hook to drop the frequency to the lowest possible during suspend. This prevents the cpufreq driver from attempting regulator calls after suspend has started - the regulator api can call into drivers that have already been suspended. Also adds 216MHz (off of PLLP) as the lowest CPU frequency, which allows PLLX to be turned off. Signed-off-by: Colin Cross <ccross@android.com> --- arch/arm/mach-tegra/cpu-tegra.c | 75 +++++++++++++++++++++++++++++++-------- 1 files changed, 60 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c index fea5719..ad26a9f 100644 --- a/arch/arm/mach-tegra/cpu-tegra.c +++ b/arch/arm/mach-tegra/cpu-tegra.c @@ -28,6 +28,7 @@ #include <linux/err.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/suspend.h> #include <asm/system.h> @@ -36,14 +37,15 @@ /* Frequency table index must be sequential starting at 0 */ static struct cpufreq_frequency_table freq_table[] = { - { 0, 312000 }, - { 1, 456000 }, - { 2, 608000 }, - { 3, 760000 }, - { 4, 816000 }, - { 5, 912000 }, - { 6, 1000000 }, - { 7, CPUFREQ_TABLE_END }, + { 0, 216000 }, + { 1, 312000 }, + { 2, 456000 }, + { 3, 608000 }, + { 4, 760000 }, + { 5, 816000 }, + { 6, 912000 }, + { 7, 1000000 }, + { 8, CPUFREQ_TABLE_END }, }; #define NUM_CPUS 2 @@ -51,6 +53,8 @@ static struct cpufreq_frequency_table freq_table[] = { static struct clk *cpu_clk; static unsigned long target_cpu_speed[NUM_CPUS]; +static DEFINE_MUTEX(tegra_cpu_lock); +static bool is_suspended; int tegra_verify_speed(struct cpufreq_policy *policy) { @@ -68,16 +72,11 @@ unsigned int tegra_getspeed(unsigned int cpu) return rate; } -static int tegra_update_cpu_speed(void) +static int tegra_update_cpu_speed(unsigned long rate) { - int i; - unsigned long rate = 0; int ret = 0; struct cpufreq_freqs freqs; - for_each_online_cpu(i) - rate = max(rate, target_cpu_speed[i]); - freqs.old = tegra_getspeed(0); freqs.new = rate; @@ -105,12 +104,30 @@ static int tegra_update_cpu_speed(void) return 0; } +static unsigned long tegra_cpu_highest_speed(void) +{ + unsigned long rate = 0; + int i; + + for_each_online_cpu(i) + rate = max(rate, target_cpu_speed[i]); + return rate; +} + static int tegra_target(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation) { int idx; unsigned int freq; + int ret = 0; + + mutex_lock(&tegra_cpu_lock); + + if (is_suspended) { + ret = -EBUSY; + goto out; + } cpufreq_frequency_table_target(policy, freq_table, target_freq, relation, &idx); @@ -119,9 +136,34 @@ static int tegra_target(struct cpufreq_policy *policy, target_cpu_speed[policy->cpu] = freq; - return tegra_update_cpu_speed(); + ret = tegra_update_cpu_speed(tegra_cpu_highest_speed()); + +out: + mutex_unlock(&tegra_cpu_lock); + return ret; } +static int tegra_pm_notify(struct notifier_block *nb, unsigned long event, + void *dummy) +{ + mutex_lock(&tegra_cpu_lock); + if (event == PM_SUSPEND_PREPARE) { + is_suspended = true; + pr_info("Tegra cpufreq suspend: setting frequency to %d kHz\n", + freq_table[0].frequency); + tegra_update_cpu_speed(freq_table[0].frequency); + } else if (event == PM_POST_SUSPEND) { + is_suspended = false; + } + mutex_unlock(&tegra_cpu_lock); + + return NOTIFY_OK; +} + +static struct notifier_block tegra_cpu_pm_notifier = { + .notifier_call = tegra_pm_notify, +}; + static int tegra_cpu_init(struct cpufreq_policy *policy) { if (policy->cpu >= NUM_CPUS) @@ -142,6 +184,9 @@ static int tegra_cpu_init(struct cpufreq_policy *policy) policy->shared_type = CPUFREQ_SHARED_TYPE_ALL; cpumask_copy(policy->related_cpus, cpu_possible_mask); + if (policy->cpu == 0) + register_pm_notifier(&tegra_cpu_pm_notifier); + return 0; } -- 1.7.3.1
next prev parent reply other threads:[~2011-01-24 2:02 UTC|newest] Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-01-24 2:01 [PATCH v2 00/28] Updates for Tegra support in 2.6.39 Colin Cross 2011-01-24 2:01 ` [PATCH v2 01/28] ARM: tegra: irq: Rename gic pointers to avoid conflicts Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-26 7:10 ` Colin Cross 2011-01-26 7:10 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 02/28] ARM: gic: Add functions to save and restore gic state Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-02-01 13:03 ` Russell King - ARM Linux 2011-02-01 13:03 ` Russell King - ARM Linux 2011-01-24 2:01 ` [PATCH v2 03/28] ARM: gic: Export irq chip functions Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 6:39 ` Santosh Shilimkar 2011-01-24 6:39 ` Santosh Shilimkar 2011-01-24 2:01 ` [PATCH v2 04/28] ARM: mm: cache-l2x0: Add support for re-enabling l2x0 Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-25 15:14 ` Catalin Marinas 2011-01-25 15:14 ` Catalin Marinas 2011-01-25 15:41 ` Russell King - ARM Linux 2011-01-25 15:41 ` Russell King - ARM Linux 2011-01-25 18:14 ` Catalin Marinas 2011-01-25 18:14 ` Catalin Marinas 2011-01-25 18:32 ` Santosh Shilimkar 2011-01-25 18:32 ` Santosh Shilimkar 2011-01-25 18:39 ` Will Deacon [not found] ` <-8932138696981683633@unknownmsgid> 2011-02-04 23:32 ` Colin Cross 2011-02-04 23:32 ` Colin Cross 2011-02-04 23:32 ` Colin Cross 2011-02-04 23:43 ` Russell King - ARM Linux 2011-02-04 23:43 ` Russell King - ARM Linux [not found] ` <20110204234331.GF8732-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 2011-02-05 1:44 ` Colin Cross 2011-02-05 1:44 ` Colin Cross 2011-02-05 1:44 ` Colin Cross [not found] ` <AANLkTi=fHnivHXHnYrQvdP6JWbEA3t1X3DuBxj5gN3H0-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2011-02-05 7:51 ` Santosh Shilimkar 2011-02-05 7:51 ` Santosh Shilimkar 2011-02-05 7:51 ` Santosh Shilimkar [not found] ` <1bebe4b5c8590059b70a146d5486fa6a-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2011-02-05 9:47 ` Russell King - ARM Linux 2011-02-05 9:47 ` Russell King - ARM Linux 2011-02-05 9:47 ` Russell King - ARM Linux 2011-02-05 10:41 ` [PATCH v2 04/28] ARM: mm: cache-l2x0: Add support forre-enabling l2x0 Santosh Shilimkar 2011-02-05 10:41 ` Santosh Shilimkar 2011-02-05 16:36 ` Colin Cross 2011-02-05 16:36 ` Colin Cross [not found] ` <AANLkTik_r4k_5o+F47vRbGPcWLwfgHgWqhym49XfhBZ9-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2011-02-07 6:13 ` Santosh Shilimkar 2011-02-07 6:13 ` Santosh Shilimkar 2011-02-07 6:13 ` Santosh Shilimkar 2011-01-24 2:01 ` [PATCH v2 05/28] ARM: tegra: Centralize macros to define debug uart base Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 06/28] ARM: tegra: Add api to control internal powergating Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 07/28] ARM: tegra: irqs: Update irq list Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 08/28] ARM: tegra: Add prototypes for subsystem suspend functions Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 09/28] ARM: tegra: clock: Suspend fixes, and add new clocks Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 10/28] ARM: tegra: pinmux: Add missing drive pingroups and fix suspend Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 11/28] ARM: tegra: timer: Add idle and suspend support to timers Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 12/28] ARM: tegra: irq: Add support for suspend wake sources Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 13/28] ARM: tegra: Add suspend and hotplug support Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 7:31 ` Colin Cross 2011-01-24 7:31 ` Colin Cross 2011-01-24 9:07 ` Russell King - ARM Linux 2011-01-24 9:07 ` Russell King - ARM Linux 2011-01-24 9:26 ` Colin Cross 2011-01-24 9:26 ` Colin Cross 2011-01-24 10:15 ` Russell King - ARM Linux 2011-01-24 10:15 ` Russell King - ARM Linux 2011-01-24 2:01 ` [PATCH v2 14/28] ARM: tegra: irq: Add set_wake and set_type support for suspend Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 15/28] ARM: tegra: irq: Add debugfs file to show wake irqs Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-27 19:45 ` Stephen Boyd 2011-01-27 19:45 ` Stephen Boyd 2011-01-24 2:01 ` [PATCH v2 16/28] ARM: tegra: irq: Implement retrigger Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 17/28] ARM: tegra: gpio: Add support for waking from suspend Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 18/28] ARM: tegra: add CPU_IDLE driver Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-27 20:38 ` Stephen Boyd 2011-01-27 20:38 ` Stephen Boyd 2011-01-27 21:51 ` Colin Cross 2011-01-27 21:51 ` Colin Cross 2011-01-27 22:07 ` Colin Cross 2011-01-27 22:07 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 19/28] ARM: tegra: iomap: Add missing devices, fix use of SZ_8, SZ_64 Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` Colin Cross [this message] 2011-01-24 2:01 ` [PATCH v2 20/28] ARM: tegra: cpufreq: Disable cpufreq during suspend Colin Cross 2011-01-24 14:41 ` Mark Brown 2011-01-24 14:41 ` Mark Brown 2011-01-24 18:50 ` Colin Cross 2011-01-24 18:50 ` Colin Cross 2011-01-24 19:35 ` Mark Brown 2011-01-24 19:35 ` Mark Brown 2011-01-24 19:52 ` Colin Cross 2011-01-24 19:52 ` Colin Cross 2011-01-24 20:26 ` Mark Brown 2011-01-24 20:26 ` Mark Brown 2011-01-24 20:52 ` Colin Cross 2011-01-24 20:52 ` Colin Cross 2011-01-24 21:08 ` Mark Brown 2011-01-24 21:08 ` Mark Brown 2011-01-24 21:24 ` Colin Cross 2011-01-24 21:24 ` Colin Cross 2011-01-25 4:26 ` Kyungmin Park 2011-01-25 4:26 ` Kyungmin Park 2011-01-24 2:01 ` [PATCH v2 21/28] ARM: tegra: Allow overriding arch_reset Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 22/28] ARM: tegra: dma: Fix critical data corruption bugs Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 23/28] ARM: tegra: add tegra_defconfig Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 24/28] ARM: tegra: Use writel_relaxed in tegra_init_cache Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 25/28] ARM: tegra: suspend: Save protected aperture across LP0 Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 26/28] ARM: tegra: suspend: protect suspend functions with CONFIG_PM Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 27/28] ARM: tegra: enable emc clock updates after lp0 Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 2:01 ` [PATCH v2 28/28] ARM: tegra: clock: Add forward reference to struct clk Colin Cross 2011-01-24 2:01 ` Colin Cross 2011-01-24 10:26 ` Russell King - ARM Linux 2011-01-24 10:26 ` Russell King - ARM Linux 2011-01-25 1:23 ` Colin Cross 2011-01-25 1:23 ` Colin Cross 2011-01-26 3:19 ` Grant Likely 2011-01-26 3:19 ` Grant Likely 2011-01-26 3:21 ` Colin Cross 2011-01-26 3:21 ` Colin Cross 2011-01-26 4:16 ` Grant Likely 2011-01-26 4:16 ` Grant Likely 2011-01-25 10:56 [PATCH v2 20/28] ARM: tegra: cpufreq: Disable cpufreq during suspend MyungJoo Ham 2011-01-25 12:40 ` Mark Brown 2011-01-25 12:40 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1295834493-5019-21-git-send-email-ccross@android.com \ --to=ccross@android.com \ --cc=konkers@android.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=olof@lixom.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.