1 From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
2 Subject: cpufreq: Add a cpu parameter to __cpufreq_driver_getavg().
4 Add a cpu parameter to __cpufreq_driver_getavg(). This is needed for software
5 cpufreq coordination where policy->cpu may not be same as the CPU on which we
6 want to getavg frequency.
8 A follow-on patch will use this parameter to getavg freq from all cpus
11 Change since last patch. Fix the offline/online and suspend/resume
12 oops reported by Youquan Song <youquan.song@intel.com>
14 Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
15 Signed-off-by: Thomas Renninger <trenn@suse.de>
18 arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 5 +++--
19 drivers/cpufreq/cpufreq.c | 6 +++---
20 drivers/cpufreq/cpufreq_ondemand.c | 2 +-
21 include/linux/cpufreq.h | 7 +++++--
22 4 files changed, 12 insertions(+), 8 deletions(-)
24 Index: cpufreq.git/drivers/cpufreq/cpufreq.c
25 ===================================================================
26 --- cpufreq.git.orig/drivers/cpufreq/cpufreq.c 2008-08-04 10:28:26.000000000 -0700
27 +++ cpufreq.git/drivers/cpufreq/cpufreq.c 2008-08-04 10:31:27.000000000 -0700
28 @@ -1485,7 +1485,7 @@ int cpufreq_driver_target(struct cpufreq
30 EXPORT_SYMBOL_GPL(cpufreq_driver_target);
32 -int __cpufreq_driver_getavg(struct cpufreq_policy *policy)
33 +int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu)
37 @@ -1493,8 +1493,8 @@ int __cpufreq_driver_getavg(struct cpufr
41 - if (cpu_online(policy->cpu) && cpufreq_driver->getavg)
42 - ret = cpufreq_driver->getavg(policy->cpu);
43 + if (cpu_online(cpu) && cpufreq_driver->getavg)
44 + ret = cpufreq_driver->getavg(policy, cpu);
46 cpufreq_cpu_put(policy);
48 Index: cpufreq.git/drivers/cpufreq/cpufreq_ondemand.c
49 ===================================================================
50 --- cpufreq.git.orig/drivers/cpufreq/cpufreq_ondemand.c 2008-08-04 10:28:26.000000000 -0700
51 +++ cpufreq.git/drivers/cpufreq/cpufreq_ondemand.c 2008-08-04 10:31:27.000000000 -0700
52 @@ -415,7 +415,7 @@ static void dbs_check_cpu(struct cpu_dbs
53 if (load < (dbs_tuners_ins.up_threshold - 10)) {
54 unsigned int freq_next, freq_cur;
56 - freq_cur = __cpufreq_driver_getavg(policy);
57 + freq_cur = __cpufreq_driver_getavg(policy, policy->cpu);
59 freq_cur = policy->cur;
61 Index: cpufreq.git/include/linux/cpufreq.h
62 ===================================================================
63 --- cpufreq.git.orig/include/linux/cpufreq.h 2008-08-04 10:28:26.000000000 -0700
64 +++ cpufreq.git/include/linux/cpufreq.h 2008-08-04 10:31:27.000000000 -0700
65 @@ -187,7 +187,8 @@ extern int __cpufreq_driver_target(struc
66 unsigned int relation);
69 -extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy);
70 +extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy,
73 int cpufreq_register_governor(struct cpufreq_governor *governor);
74 void cpufreq_unregister_governor(struct cpufreq_governor *governor);
75 @@ -226,7 +227,9 @@ struct cpufreq_driver {
76 unsigned int (*get) (unsigned int cpu);
79 - unsigned int (*getavg) (unsigned int cpu);
80 + unsigned int (*getavg) (struct cpufreq_policy *policy,
83 int (*exit) (struct cpufreq_policy *policy);
84 int (*suspend) (struct cpufreq_policy *policy, pm_message_t pmsg);
85 int (*resume) (struct cpufreq_policy *policy);
86 Index: cpufreq.git/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
87 ===================================================================
88 --- cpufreq.git.orig/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2008-08-04 10:28:26.000000000 -0700
89 +++ cpufreq.git/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2008-08-04 10:31:27.000000000 -0700
90 @@ -256,7 +256,8 @@ static u32 get_cur_val(const cpumask_t *
91 * Only IA32_APERF/IA32_MPERF ratio is architecturally defined and
92 * no meaning should be associated with absolute values of these MSRs.
94 -static unsigned int get_measured_perf(unsigned int cpu)
95 +static unsigned int get_measured_perf(struct cpufreq_policy *policy,
100 @@ -326,7 +327,7 @@ static unsigned int get_measured_perf(un
104 - retval = per_cpu(drv_data, cpu)->max_freq * perf_percent / 100;
105 + retval = per_cpu(drv_data, policy->cpu)->max_freq * perf_percent / 100;
108 set_cpus_allowed_ptr(current, &saved_mask);