diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 18:21:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 18:21:02 -0400 |
commit | 3ed1c478eff8db80e234d5446cb378b503135888 (patch) | |
tree | e1c8e0f488ca49c49b5a31fe59add4254381dd4b /arch/sh/kernel | |
parent | 151173e8ce9b95bbbbd7eedb9035cfaffbdb7cb2 (diff) | |
parent | 371deb9500831ad1afbf9ea00e373f650deaed2f (diff) |
Merge tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI updates from Rafael J Wysocki:
- ARM big.LITTLE cpufreq driver from Viresh Kumar.
- exynos5440 cpufreq driver from Amit Daniel Kachhap.
- cpufreq core cleanup and code consolidation from Viresh Kumar and
Stratos Karafotis.
- cpufreq scalability improvement from Nathan Zimmer.
- AMD "frequency sensitivity feedback" powersave bias for the ondemand
cpufreq governor from Jacob Shin.
- cpuidle code consolidation and cleanups from Daniel Lezcano.
- ARM OMAP cpuidle fixes from Santosh Shilimkar and Daniel Lezcano.
- ACPICA fixes and other improvements from Bob Moore, Jung-uk Kim, Lv
Zheng, Yinghai Lu, Tang Chen, Colin Ian King, and Linn Crosetto.
- ACPI core updates related to hotplug from Toshi Kani, Paul Bolle,
Yasuaki Ishimatsu, and Rafael J Wysocki.
- Intel Lynxpoint LPSS (Low-Power Subsystem) support improvements from
Rafael J Wysocki and Andy Shevchenko.
* tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (192 commits)
cpufreq: Revert incorrect commit 5800043
cpufreq: MAINTAINERS: Add co-maintainer
cpuidle: add maintainer entry
ACPI / thermal: do not always return THERMAL_TREND_RAISING for active trip points
ARM: s3c64xx: cpuidle: use init/exit common routine
cpufreq: pxa2xx: initialize variables
ACPI: video: correct acpi_video_bus_add error processing
SH: cpuidle: use init/exit common routine
ARM: S5pv210: compiling issue, ARM_S5PV210_CPUFREQ needs CONFIG_CPU_FREQ_TABLE=y
ACPI: Fix wrong parameter passed to memblock_reserve
cpuidle: fix comment format
pnp: use %*phC to dump small buffers
isapnp: remove debug leftovers
ARM: imx: cpuidle: use init/exit common routine
ARM: davinci: cpuidle: use init/exit common routine
ARM: kirkwood: cpuidle: use init/exit common routine
ARM: calxeda: cpuidle: use init/exit common routine
ARM: tegra: cpuidle: use init/exit common routine for tegra3
ARM: tegra: cpuidle: use init/exit common routine for tegra2
ARM: OMAP4: cpuidle: use init/exit common routine
...
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/shmobile/cpuidle.c | 101 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/shmobile/pm.c | 3 | ||||
-rw-r--r-- | arch/sh/kernel/cpufreq.c | 201 |
4 files changed, 43 insertions, 263 deletions
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile index f259b37874e9..261c8bfd75ce 100644 --- a/arch/sh/kernel/Makefile +++ b/arch/sh/kernel/Makefile | |||
@@ -31,7 +31,6 @@ obj-$(CONFIG_VSYSCALL) += vsyscall/ | |||
31 | obj-$(CONFIG_SMP) += smp.o | 31 | obj-$(CONFIG_SMP) += smp.o |
32 | obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o | 32 | obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o |
33 | obj-$(CONFIG_KGDB) += kgdb.o | 33 | obj-$(CONFIG_KGDB) += kgdb.o |
34 | obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o | ||
35 | obj-$(CONFIG_MODULES) += sh_ksyms_$(BITS).o module.o | 34 | obj-$(CONFIG_MODULES) += sh_ksyms_$(BITS).o module.o |
36 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o | 35 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o |
37 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o | 36 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o |
diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c index 1ddc876d3b26..d30622592116 100644 --- a/arch/sh/kernel/cpu/shmobile/cpuidle.c +++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c | |||
@@ -51,70 +51,53 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev, | |||
51 | return k; | 51 | return k; |
52 | } | 52 | } |
53 | 53 | ||
54 | static struct cpuidle_device cpuidle_dev; | ||
55 | static struct cpuidle_driver cpuidle_driver = { | 54 | static struct cpuidle_driver cpuidle_driver = { |
56 | .name = "sh_idle", | 55 | .name = "sh_idle", |
57 | .owner = THIS_MODULE, | 56 | .owner = THIS_MODULE, |
58 | .en_core_tk_irqen = 1, | 57 | .states = { |
58 | { | ||
59 | .exit_latency = 1, | ||
60 | .target_residency = 1 * 2, | ||
61 | .power_usage = 3, | ||
62 | .flags = CPUIDLE_FLAG_TIME_VALID, | ||
63 | .enter = cpuidle_sleep_enter, | ||
64 | .name = "C1", | ||
65 | .desc = "SuperH Sleep Mode", | ||
66 | }, | ||
67 | { | ||
68 | .exit_latency = 100, | ||
69 | .target_residency = 1 * 2, | ||
70 | .power_usage = 1, | ||
71 | .flags = CPUIDLE_FLAG_TIME_VALID, | ||
72 | .enter = cpuidle_sleep_enter, | ||
73 | .name = "C2", | ||
74 | .desc = "SuperH Sleep Mode [SF]", | ||
75 | .disabled = true, | ||
76 | }, | ||
77 | { | ||
78 | .exit_latency = 2300, | ||
79 | .target_residency = 1 * 2, | ||
80 | .power_usage = 1, | ||
81 | .flags = CPUIDLE_FLAG_TIME_VALID, | ||
82 | .enter = cpuidle_sleep_enter, | ||
83 | .name = "C3", | ||
84 | .desc = "SuperH Mobile Standby Mode [SF]", | ||
85 | .disabled = true, | ||
86 | }, | ||
87 | }, | ||
88 | .safe_state_index = 0, | ||
89 | .state_count = 3, | ||
59 | }; | 90 | }; |
60 | 91 | ||
61 | void sh_mobile_setup_cpuidle(void) | 92 | int __init sh_mobile_setup_cpuidle(void) |
62 | { | 93 | { |
63 | struct cpuidle_device *dev = &cpuidle_dev; | 94 | int ret; |
64 | struct cpuidle_driver *drv = &cpuidle_driver; | ||
65 | struct cpuidle_state *state; | ||
66 | int i; | ||
67 | 95 | ||
96 | if (sh_mobile_sleep_supported & SUSP_SH_SF) | ||
97 | cpuidle_driver.states[1].disabled = false; | ||
68 | 98 | ||
69 | for (i = 0; i < CPUIDLE_STATE_MAX; i++) { | 99 | if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) |
70 | drv->states[i].name[0] = '\0'; | 100 | cpuidle_driver.states[2].disabled = false; |
71 | drv->states[i].desc[0] = '\0'; | ||
72 | } | ||
73 | 101 | ||
74 | i = CPUIDLE_DRIVER_STATE_START; | 102 | return cpuidle_register(&cpuidle_driver); |
75 | |||
76 | state = &drv->states[i++]; | ||
77 | snprintf(state->name, CPUIDLE_NAME_LEN, "C1"); | ||
78 | strncpy(state->desc, "SuperH Sleep Mode", CPUIDLE_DESC_LEN); | ||
79 | state->exit_latency = 1; | ||
80 | state->target_residency = 1 * 2; | ||
81 | state->power_usage = 3; | ||
82 | state->flags = 0; | ||
83 | state->flags |= CPUIDLE_FLAG_TIME_VALID; | ||
84 | state->enter = cpuidle_sleep_enter; | ||
85 | |||
86 | drv->safe_state_index = i-1; | ||
87 | |||
88 | if (sh_mobile_sleep_supported & SUSP_SH_SF) { | ||
89 | state = &drv->states[i++]; | ||
90 | snprintf(state->name, CPUIDLE_NAME_LEN, "C2"); | ||
91 | strncpy(state->desc, "SuperH Sleep Mode [SF]", | ||
92 | CPUIDLE_DESC_LEN); | ||
93 | state->exit_latency = 100; | ||
94 | state->target_residency = 1 * 2; | ||
95 | state->power_usage = 1; | ||
96 | state->flags = 0; | ||
97 | state->flags |= CPUIDLE_FLAG_TIME_VALID; | ||
98 | state->enter = cpuidle_sleep_enter; | ||
99 | } | ||
100 | |||
101 | if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) { | ||
102 | state = &drv->states[i++]; | ||
103 | snprintf(state->name, CPUIDLE_NAME_LEN, "C3"); | ||
104 | strncpy(state->desc, "SuperH Mobile Standby Mode [SF]", | ||
105 | CPUIDLE_DESC_LEN); | ||
106 | state->exit_latency = 2300; | ||
107 | state->target_residency = 1 * 2; | ||
108 | state->power_usage = 1; | ||
109 | state->flags = 0; | ||
110 | state->flags |= CPUIDLE_FLAG_TIME_VALID; | ||
111 | state->enter = cpuidle_sleep_enter; | ||
112 | } | ||
113 | |||
114 | drv->state_count = i; | ||
115 | dev->state_count = i; | ||
116 | |||
117 | cpuidle_register_driver(&cpuidle_driver); | ||
118 | |||
119 | cpuidle_register_device(dev); | ||
120 | } | 103 | } |
diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c index 08d27fac8d08..ac37b7234f85 100644 --- a/arch/sh/kernel/cpu/shmobile/pm.c +++ b/arch/sh/kernel/cpu/shmobile/pm.c | |||
@@ -150,8 +150,7 @@ static const struct platform_suspend_ops sh_pm_ops = { | |||
150 | static int __init sh_pm_init(void) | 150 | static int __init sh_pm_init(void) |
151 | { | 151 | { |
152 | suspend_set_ops(&sh_pm_ops); | 152 | suspend_set_ops(&sh_pm_ops); |
153 | sh_mobile_setup_cpuidle(); | 153 | return sh_mobile_setup_cpuidle(); |
154 | return 0; | ||
155 | } | 154 | } |
156 | 155 | ||
157 | late_initcall(sh_pm_init); | 156 | late_initcall(sh_pm_init); |
diff --git a/arch/sh/kernel/cpufreq.c b/arch/sh/kernel/cpufreq.c deleted file mode 100644 index e68b45b6f3f9..000000000000 --- a/arch/sh/kernel/cpufreq.c +++ /dev/null | |||
@@ -1,201 +0,0 @@ | |||
1 | /* | ||
2 | * arch/sh/kernel/cpufreq.c | ||
3 | * | ||
4 | * cpufreq driver for the SuperH processors. | ||
5 | * | ||
6 | * Copyright (C) 2002 - 2012 Paul Mundt | ||
7 | * Copyright (C) 2002 M. R. Brown | ||
8 | * | ||
9 | * Clock framework bits from arch/avr32/mach-at32ap/cpufreq.c | ||
10 | * | ||
11 | * Copyright (C) 2004-2007 Atmel Corporation | ||
12 | * | ||
13 | * This file is subject to the terms and conditions of the GNU General Public | ||
14 | * License. See the file "COPYING" in the main directory of this archive | ||
15 | * for more details. | ||
16 | */ | ||
17 | #define pr_fmt(fmt) "cpufreq: " fmt | ||
18 | |||
19 | #include <linux/types.h> | ||
20 | #include <linux/cpufreq.h> | ||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/module.h> | ||
23 | #include <linux/init.h> | ||
24 | #include <linux/err.h> | ||
25 | #include <linux/cpumask.h> | ||
26 | #include <linux/cpu.h> | ||
27 | #include <linux/smp.h> | ||
28 | #include <linux/sched.h> /* set_cpus_allowed() */ | ||
29 | #include <linux/clk.h> | ||
30 | #include <linux/percpu.h> | ||
31 | #include <linux/sh_clk.h> | ||
32 | |||
33 | static DEFINE_PER_CPU(struct clk, sh_cpuclk); | ||
34 | |||
35 | static unsigned int sh_cpufreq_get(unsigned int cpu) | ||
36 | { | ||
37 | return (clk_get_rate(&per_cpu(sh_cpuclk, cpu)) + 500) / 1000; | ||
38 | } | ||
39 | |||
40 | /* | ||
41 | * Here we notify other drivers of the proposed change and the final change. | ||
42 | */ | ||
43 | static int sh_cpufreq_target(struct cpufreq_policy *policy, | ||
44 | unsigned int target_freq, | ||
45 | unsigned int relation) | ||
46 | { | ||
47 | unsigned int cpu = policy->cpu; | ||
48 | struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu); | ||
49 | cpumask_t cpus_allowed; | ||
50 | struct cpufreq_freqs freqs; | ||
51 | struct device *dev; | ||
52 | long freq; | ||
53 | |||
54 | if (!cpu_online(cpu)) | ||
55 | return -ENODEV; | ||
56 | |||
57 | cpus_allowed = current->cpus_allowed; | ||
58 | set_cpus_allowed_ptr(current, cpumask_of(cpu)); | ||
59 | |||
60 | BUG_ON(smp_processor_id() != cpu); | ||
61 | |||
62 | dev = get_cpu_device(cpu); | ||
63 | |||
64 | /* Convert target_freq from kHz to Hz */ | ||
65 | freq = clk_round_rate(cpuclk, target_freq * 1000); | ||
66 | |||
67 | if (freq < (policy->min * 1000) || freq > (policy->max * 1000)) | ||
68 | return -EINVAL; | ||
69 | |||
70 | dev_dbg(dev, "requested frequency %u Hz\n", target_freq * 1000); | ||
71 | |||
72 | freqs.cpu = cpu; | ||
73 | freqs.old = sh_cpufreq_get(cpu); | ||
74 | freqs.new = (freq + 500) / 1000; | ||
75 | freqs.flags = 0; | ||
76 | |||
77 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); | ||
78 | set_cpus_allowed_ptr(current, &cpus_allowed); | ||
79 | clk_set_rate(cpuclk, freq); | ||
80 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); | ||
81 | |||
82 | dev_dbg(dev, "set frequency %lu Hz\n", freq); | ||
83 | |||
84 | return 0; | ||
85 | } | ||
86 | |||
87 | static int sh_cpufreq_verify(struct cpufreq_policy *policy) | ||
88 | { | ||
89 | struct clk *cpuclk = &per_cpu(sh_cpuclk, policy->cpu); | ||
90 | struct cpufreq_frequency_table *freq_table; | ||
91 | |||
92 | freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL; | ||
93 | if (freq_table) | ||
94 | return cpufreq_frequency_table_verify(policy, freq_table); | ||
95 | |||
96 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | ||
97 | policy->cpuinfo.max_freq); | ||
98 | |||
99 | policy->min = (clk_round_rate(cpuclk, 1) + 500) / 1000; | ||
100 | policy->max = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000; | ||
101 | |||
102 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | ||
103 | policy->cpuinfo.max_freq); | ||
104 | |||
105 | return 0; | ||
106 | } | ||
107 | |||
108 | static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy) | ||
109 | { | ||
110 | unsigned int cpu = policy->cpu; | ||
111 | struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu); | ||
112 | struct cpufreq_frequency_table *freq_table; | ||
113 | struct device *dev; | ||
114 | |||
115 | if (!cpu_online(cpu)) | ||
116 | return -ENODEV; | ||
117 | |||
118 | dev = get_cpu_device(cpu); | ||
119 | |||
120 | cpuclk = clk_get(dev, "cpu_clk"); | ||
121 | if (IS_ERR(cpuclk)) { | ||
122 | dev_err(dev, "couldn't get CPU clk\n"); | ||
123 | return PTR_ERR(cpuclk); | ||
124 | } | ||
125 | |||
126 | policy->cur = policy->min = policy->max = sh_cpufreq_get(cpu); | ||
127 | |||
128 | freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL; | ||
129 | if (freq_table) { | ||
130 | int result; | ||
131 | |||
132 | result = cpufreq_frequency_table_cpuinfo(policy, freq_table); | ||
133 | if (!result) | ||
134 | cpufreq_frequency_table_get_attr(freq_table, cpu); | ||
135 | } else { | ||
136 | dev_notice(dev, "no frequency table found, falling back " | ||
137 | "to rate rounding.\n"); | ||
138 | |||
139 | policy->cpuinfo.min_freq = | ||
140 | (clk_round_rate(cpuclk, 1) + 500) / 1000; | ||
141 | policy->cpuinfo.max_freq = | ||
142 | (clk_round_rate(cpuclk, ~0UL) + 500) / 1000; | ||
143 | } | ||
144 | |||
145 | policy->min = policy->cpuinfo.min_freq; | ||
146 | policy->max = policy->cpuinfo.max_freq; | ||
147 | |||
148 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | ||
149 | |||
150 | dev_info(dev, "CPU Frequencies - Minimum %u.%03u MHz, " | ||
151 | "Maximum %u.%03u MHz.\n", | ||
152 | policy->min / 1000, policy->min % 1000, | ||
153 | policy->max / 1000, policy->max % 1000); | ||
154 | |||
155 | return 0; | ||
156 | } | ||
157 | |||
158 | static int sh_cpufreq_cpu_exit(struct cpufreq_policy *policy) | ||
159 | { | ||
160 | unsigned int cpu = policy->cpu; | ||
161 | struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu); | ||
162 | |||
163 | cpufreq_frequency_table_put_attr(cpu); | ||
164 | clk_put(cpuclk); | ||
165 | |||
166 | return 0; | ||
167 | } | ||
168 | |||
169 | static struct freq_attr *sh_freq_attr[] = { | ||
170 | &cpufreq_freq_attr_scaling_available_freqs, | ||
171 | NULL, | ||
172 | }; | ||
173 | |||
174 | static struct cpufreq_driver sh_cpufreq_driver = { | ||
175 | .owner = THIS_MODULE, | ||
176 | .name = "sh", | ||
177 | .get = sh_cpufreq_get, | ||
178 | .target = sh_cpufreq_target, | ||
179 | .verify = sh_cpufreq_verify, | ||
180 | .init = sh_cpufreq_cpu_init, | ||
181 | .exit = sh_cpufreq_cpu_exit, | ||
182 | .attr = sh_freq_attr, | ||
183 | }; | ||
184 | |||
185 | static int __init sh_cpufreq_module_init(void) | ||
186 | { | ||
187 | pr_notice("SuperH CPU frequency driver.\n"); | ||
188 | return cpufreq_register_driver(&sh_cpufreq_driver); | ||
189 | } | ||
190 | |||
191 | static void __exit sh_cpufreq_module_exit(void) | ||
192 | { | ||
193 | cpufreq_unregister_driver(&sh_cpufreq_driver); | ||
194 | } | ||
195 | |||
196 | module_init(sh_cpufreq_module_init); | ||
197 | module_exit(sh_cpufreq_module_exit); | ||
198 | |||
199 | MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>"); | ||
200 | MODULE_DESCRIPTION("cpufreq driver for SuperH"); | ||
201 | MODULE_LICENSE("GPL"); | ||