CPUFreq Updates & Fixes for 3.10
Subsystems (16)
Viresh Kumar
maintainercover CPUFreq Updates & Fixes for 3.10
Hi Rafael,
These are fixes and updates that are sent and reviewed as separate patchsets earlier. They are all now combined as part of a single patchset for you to apply in your linux-next branch.
All have got reviews earlier and got fixups mailed and applied.
The remaining patches: "Move Cpufreq drivers to drivers/cpufreq" are awaiting few more Acks before I send them to you.
I wanted to have another patch as part of this patchset, but I am awaiting Ack for it:
tools: cpufreq: Fix cpufreq-info print messages for affected[related]_cpus
That can be applied separately once it receives an Ack.
Thanks
Viresh
Viresh Kumar (9):
cpufreq: cpu0: Fix mistake in Documentation example
cpufreq: Documentation: Fix cpufreq_frequency_table name
cpufreq: cpufreq-cpu0: No need to check cpu number in init()
cpufreq: cpufreq-cpu0: Call CPUFREQ_POSTCHANGE notifier for failure
cases too
cpufreq: Notify all policy->cpus in cpufreq_notify_transition()
cpufreq: Don't check if cpu is online/offline for cpufreq callbacks
cpufreq: drivers: don't check range of target freq in .target()
cpufreq: drivers: Remove unnecessary assignments of policy-> members
cpufreq: ARM big LITTLE: Add generic cpufreq driver and its DT glue
Documentation/cpu-freq/cpu-drivers.txt | 9 +- .../bindings/cpufreq/arm_big_little_dt.txt | 65 +++++ .../devicetree/bindings/cpufreq/cpufreq-cpu0.txt | 2 +- MAINTAINERS | 11 + arch/arm/mach-davinci/cpufreq.c | 33 +-- arch/arm/mach-imx/cpufreq.c | 8 +- arch/arm/mach-integrator/cpu.c | 6 +- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 5 +- arch/arm/mach-pxa/cpufreq-pxa3xx.c | 5 +- arch/arm/mach-s3c24xx/cpufreq.c | 8 +- arch/arm/mach-sa1100/cpu-sa1100.c | 5 +- arch/arm/mach-sa1100/cpu-sa1110.c | 5 +- arch/arm/mach-tegra/cpu-tegra.c | 15 +- arch/avr32/mach-at32ap/cpufreq.c | 5 +- arch/blackfin/mach-common/cpufreq.c | 79 +++--- arch/cris/arch-v32/mach-a3/cpufreq.c | 20 +- arch/cris/arch-v32/mach-fs/cpufreq.c | 17 +- arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 22 +- arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 11 +- arch/powerpc/platforms/cell/cbe_cpufreq.c | 5 +- arch/powerpc/platforms/pasemi/cpufreq.c | 5 +- arch/powerpc/platforms/powermac/cpufreq_32.c | 14 +- arch/powerpc/platforms/powermac/cpufreq_64.c | 5 +- arch/sh/kernel/cpufreq.c | 20 +- arch/sparc/kernel/us2e_cpufreq.c | 19 +- arch/sparc/kernel/us3_cpufreq.c | 19 +- arch/unicore32/kernel/cpu-ucv2.c | 5 +- drivers/cpufreq/Kconfig.arm | 12 + drivers/cpufreq/Makefile | 5 + drivers/cpufreq/acpi-cpufreq.c | 11 +- drivers/cpufreq/arm_big_little.c | 282 +++++++++++++++++++++ drivers/cpufreq/arm_big_little.h | 40 +++ drivers/cpufreq/arm_big_little_dt.c | 92 +++++++ drivers/cpufreq/cpufreq-cpu0.c | 28 +- drivers/cpufreq/cpufreq-nforce2.c | 11 +- drivers/cpufreq/cpufreq.c | 45 ++-- drivers/cpufreq/dbx500-cpufreq.c | 12 +- drivers/cpufreq/e_powersaver.c | 11 +- drivers/cpufreq/elanfreq.c | 10 +- drivers/cpufreq/exynos-cpufreq.c | 7 +- drivers/cpufreq/gx-suspmod.c | 11 +- drivers/cpufreq/imx6q-cpufreq.c | 12 +- drivers/cpufreq/kirkwood-cpufreq.c | 10 +- drivers/cpufreq/longhaul.c | 18 +- drivers/cpufreq/maple-cpufreq.c | 5 +- drivers/cpufreq/omap-cpufreq.c | 15 +- drivers/cpufreq/p4-clockmod.c | 13 +- drivers/cpufreq/pcc-cpufreq.c | 5 +- drivers/cpufreq/powernow-k6.c | 12 +- drivers/cpufreq/powernow-k7.c | 10 +- drivers/cpufreq/powernow-k8.c | 19 +- drivers/cpufreq/s3c2416-cpufreq.c | 5 +- drivers/cpufreq/s3c64xx-cpufreq.c | 7 +- drivers/cpufreq/s5pv210-cpufreq.c | 5 +- drivers/cpufreq/sc520_freq.c | 10 +- drivers/cpufreq/spear-cpufreq.c | 7 +- drivers/cpufreq/speedstep-centrino.c | 28 +- drivers/cpufreq/speedstep-ich.c | 12 +- drivers/cpufreq/speedstep-smi.c | 5 +- include/linux/cpufreq.h | 4 +- 60 files changed, 773 insertions(+), 429 deletions(-) create mode 100644 Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt create mode 100644 drivers/cpufreq/arm_big_little.c create mode 100644 drivers/cpufreq/arm_big_little.h create mode 100644 drivers/cpufreq/arm_big_little_dt.c
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 1/9 cpufreq: cpu0: Fix mistake in Documentation example
"clock-latency" is incorrectly written as "transition-latency" in an example present in Documentation of cpufreq-cpu0. Fix it.
--- Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt +1 -1
@@ -32,7 +32,7 @@ cpus { 396000 950000 198000 850000 >; - transition-latency = <61036>; /* two CLK32 periods */ + clock-latency = <61036>; /* two CLK32 periods */ }; cpu@1 {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 2/9 cpufreq: Documentation: Fix cpufreq_frequency_table name
In reply to Viresh KumarAt few places in documentation cpufreq_frequency_table is written as cpufreq_freq_table. Fix these.
--- Documentation/cpu-freq/cpu-drivers.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/cpu-freq/cpu-drivers.txt +2 -2
@@ -184,10 +184,10 @@ the reference implementation in drivers/cpufreq/longrun.c As most cpufreq processors only allow for being set to a few specific frequencies, a "frequency table" with some functions might assist in some work of the processor driver. Such a "frequency table" consists -of an array of struct cpufreq_freq_table entries, with any value in +of an array of struct cpufreq_frequency_table entries, with any value in "index" you want to use, and the corresponding frequency in "frequency". At the end of the table, you need to add a -cpufreq_freq_table entry with frequency set to CPUFREQ_TABLE_END. And +cpufreq_frequency_table entry with frequency set to CPUFREQ_TABLE_END. And if you want to skip one entry in the table, set the frequency to CPUFREQ_ENTRY_INVALID. The entries don't need to be in ascending order.
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 3/9 cpufreq: cpufreq-cpu0: No need to check cpu number in init()
In reply to Viresh KumarIt is not possible for init() to be called for any cpu other than cpu0. During bootup whatever cpu is used to boot system will be assigned as cpu0. And later on policy->cpu can only change if we hotunplug all cpus first and then hotplug them back in different order, which isn't possible (system requires atleast one cpu to be up always :)).
Though I can see one situation where policy->cpu can be different then zero.
- Hot-unplug cpu 0.
- rmmod cpufreq-cpu0 module
- insmod it back
- hotplug cpu 0 again.
Here, policy->cpu would be different. But the driver doesn't have any dependency on cpu0 as such. We don't mind which cpu of a system is policy->cpu and so this check is just not required.
Remove it.
--- drivers/cpufreq/cpufreq-cpu0.c | 3 --- 1 file changed, 3 deletions(-)
drivers/cpufreq/cpufreq-cpu0.c +0 -3
@@ -130,9 +130,6 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy) {int ret; -if (policy->cpu !=0 ) -return -EINVAL ; - ret =cpufreq_frequency_table_cpuinfo (policy, freq_table);if (ret) {pr_err ("invalid frequency table: %d\n" , ret);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 4/9 cpufreq: cpufreq-cpu0: Call CPUFREQ_POSTCHANGE notifier for failure cases too
In reply to Viresh KumarCurrently we are simply returning from target() if we encounter some error after broadcasting CPUFREQ_PRECHANGE notifier. Which looks to be wrong as others might depend on POSTCHANGE notifier for their functioning.
So, better broadcast CPUFREQ_POSTCHANGE notifier for these failure cases too, but with old frequency.
--- drivers/cpufreq/cpufreq-cpu0.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/cpufreq/cpufreq-cpu0.c +8 -5
@@ -77,7 +77,9 @@ static int cpu0_set_target(struct cpufreq_policy *policy,if (IS_ERR (opp)) {rcu_read_unlock ();pr_err ("failed to find OPP for %ld\n" , freq_Hz); -return PTR_ERR (opp); + freqs.new = freqs.old; + ret =PTR_ERR (opp); + goto post_notify; } volt =opp_get_voltage (opp);rcu_read_unlock ();
@@ -95,7 +97,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy,if (ret) {pr_err ("failed to scale voltage up: %d\n" , ret); freqs.new = freqs.old; -return ret; + goto post_notify; } }
@@ -104,7 +106,8 @@ static int cpu0_set_target(struct cpufreq_policy *policy,pr_err ("failed to set clock rate: %d\n" , ret);if (cpu_reg)regulator_set_voltage_tol (cpu_reg, volt_old, tol); -return ret; + freqs.new = freqs.old; + goto post_notify; }/* scaling down? scale voltage after frequency */
@@ -114,16 +117,16 @@ static int cpu0_set_target(struct cpufreq_policy *policy,pr_err ("failed to scale voltage down: %d\n" , ret);clk_set_rate (cpu_clk, freqs.old *1000 ); freqs.new = freqs.old; -return ret; } } +post_notify:for_each_online_cpu (cpu) { freqs.cpu = cpu;cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); } -return 0 ; +return ret; }static int cpu0_cpufreq_init (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 5/9 cpufreq: Notify all policy->cpus in cpufreq_notify_transition()
In reply to Viresh Kumarpolicy->cpus contains all online cpus that have single shared clock line. And their frequencies are always updated together.
Many SMP system's cpufreq drivers take care of this in individual drivers but the best place for this code is in cpufreq core.
This patch modifies cpufreq_notify_transition() to notify frequency change for all cpus in policy->cpus and hence updates all users of this API.
--- arch/arm/mach-davinci/cpufreq.c | 5 +- arch/arm/mach-imx/cpufreq.c | 5 +- arch/arm/mach-integrator/cpu.c | 6 +-- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 5 +- arch/arm/mach-pxa/cpufreq-pxa3xx.c | 5 +- arch/arm/mach-s3c24xx/cpufreq.c | 8 +-- arch/arm/mach-sa1100/cpu-sa1100.c | 5 +- arch/arm/mach-sa1100/cpu-sa1110.c | 5 +- arch/arm/mach-tegra/cpu-tegra.c | 15 +++--- arch/avr32/mach-at32ap/cpufreq.c | 5 +- arch/blackfin/mach-common/cpufreq.c | 79 ++++++++++++---------------- arch/cris/arch-v32/mach-a3/cpufreq.c | 20 +++---- arch/cris/arch-v32/mach-fs/cpufreq.c | 17 +++--- arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 22 ++++---- arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 5 +- arch/powerpc/platforms/cell/cbe_cpufreq.c | 5 +- arch/powerpc/platforms/pasemi/cpufreq.c | 5 +- arch/powerpc/platforms/powermac/cpufreq_32.c | 14 ++--- arch/powerpc/platforms/powermac/cpufreq_64.c | 5 +- arch/sh/kernel/cpufreq.c | 5 +- arch/sparc/kernel/us2e_cpufreq.c | 13 ++--- arch/sparc/kernel/us3_cpufreq.c | 13 ++--- arch/unicore32/kernel/cpu-ucv2.c | 5 +- drivers/cpufreq/acpi-cpufreq.c | 11 +--- drivers/cpufreq/cpufreq-cpu0.c | 12 ++--- drivers/cpufreq/cpufreq-nforce2.c | 5 +- drivers/cpufreq/cpufreq.c | 45 +++++++++------- drivers/cpufreq/dbx500-cpufreq.c | 6 +-- drivers/cpufreq/e_powersaver.c | 11 ++-- drivers/cpufreq/elanfreq.c | 10 ++-- drivers/cpufreq/exynos-cpufreq.c | 7 +-- drivers/cpufreq/gx-suspmod.c | 11 ++-- drivers/cpufreq/imx6q-cpufreq.c | 12 ++--- drivers/cpufreq/kirkwood-cpufreq.c | 10 ++-- drivers/cpufreq/longhaul.c | 18 ++++--- drivers/cpufreq/maple-cpufreq.c | 5 +- drivers/cpufreq/omap-cpufreq.c | 11 +--- drivers/cpufreq/p4-clockmod.c | 10 +--- drivers/cpufreq/pcc-cpufreq.c | 5 +- drivers/cpufreq/powernow-k6.c | 12 ++--- drivers/cpufreq/powernow-k7.c | 10 ++-- drivers/cpufreq/powernow-k8.c | 16 +++--- drivers/cpufreq/s3c2416-cpufreq.c | 5 +- drivers/cpufreq/s3c64xx-cpufreq.c | 7 ++- drivers/cpufreq/s5pv210-cpufreq.c | 5 +- drivers/cpufreq/sc520_freq.c | 10 ++-- drivers/cpufreq/spear-cpufreq.c | 7 +-- drivers/cpufreq/speedstep-centrino.c | 24 ++------- drivers/cpufreq/speedstep-ich.c | 12 +---- drivers/cpufreq/speedstep-smi.c | 5 +- include/linux/cpufreq.h | 4 +- 51 files changed, 238 insertions(+), 340 deletions(-)
arch/arm/mach-davinci/cpufreq.c +2 -3
@@ -90,7 +90,6 @@ static int davinci_target(struct cpufreq_policy *policy, freqs.old =davinci_getspeed (0 ); freqs.new =clk_round_rate (armclk, target_freq *1000 ) /1000 ; - freqs.cpu =0 ;if (freqs.old == freqs.new)return ret;
@@ -102,7 +101,7 @@ static int davinci_target(struct cpufreq_policy *policy,if (ret)return -EINVAL ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* if moving to higher frequency, up the voltage beforehand */ if (pdata->set_voltage && freqs.new > freqs.old) {
@@ -126,7 +125,7 @@ static int davinci_target(struct cpufreq_policy *policy, pdata->set_voltage (idx); out: -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
arch/arm/mach-imx/cpufreq.c +2 -3
@@ -87,13 +87,12 @@ static int mxc_set_target(struct cpufreq_policy *policy, freqs.old =clk_get_rate (cpu_clk) /1000 ; freqs.new = freq_Hz /1000 ; - freqs.cpu =0 ; freqs.flags =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); ret =set_cpu_freq (freq_Hz); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
arch/arm/mach-integrator/cpu.c +2 -4
@@ -123,14 +123,12 @@ static int integrator_set_target(struct cpufreq_policy *policy, vco =icst_hz_to_vco (&cclk_params, target_freq *1000 ); freqs.new =icst_hz (&cclk_params, vco) /1000 ; - freqs.cpu = policy->cpu; -if (freqs.old == freqs.new) {set_cpus_allowed (current, cpus_allowed);return 0 ; } -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); cm_osc =__raw_readl (CM_OSC );
@@ -151,7 +149,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,*/ set_cpus_allowed (current, cpus_allowed); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
arch/arm/mach-pxa/cpufreq-pxa2xx.c +2 -3
@@ -311,7 +311,6 @@ static int pxa_set_target(struct cpufreq_policy *policy, new_freq_mem = pxa_freq_settings[idx].membus; freqs.old = policy->cur; freqs.new = new_freq_cpu; - freqs.cpu = policy->cpu;if (freq_debug) pr_debug("Changing CPU frequency to %d Mhz, (SDRAM %d Mhz)\n",
@@ -327,7 +326,7 @@ static int pxa_set_target(struct cpufreq_policy *policy,* you should add a notify client with any platform specific * Vcc changing capability */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Calculate the next MDREFR. If we're slowing down the SDRAM clock * we need to preset the smaller DRI before the change. If we're
@@ -382,7 +381,7 @@ static int pxa_set_target(struct cpufreq_policy *policy,* you should add a notify client with any platform specific * SDRAM refresh timer adjustments */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );/* * Even if voltage setting fails, we don't report it, as the frequency
arch/arm/mach-pxa/cpufreq-pxa3xx.c +2 -3
@@ -184,7 +184,6 @@ static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy, freqs.old = policy->cur; freqs.new = next->cpufreq_mhz *1000 ; - freqs.cpu = policy->cpu; pr_debug("CPU frequency from %d MHz to %d MHz%s\n", freqs.old / 1000, freqs.new / 1000,
@@ -193,14 +192,14 @@ static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy,if (freqs.old == target_freq)return 0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );local_irq_save (flags);__update_core_freq (next);__update_bus_freq (next);local_irq_restore (flags); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
arch/arm/mach-s3c24xx/cpufreq.c +2 -6
@@ -204,7 +204,6 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy, freqs.old = cpu_cur.freq; freqs.new = cpu_new.freq; - freqs.freqs.cpu =0 ; freqs.freqs.old = cpu_cur.freq.armclk /1000 ; freqs.freqs.new = cpu_new.freq.armclk /1000 ;
@@ -218,9 +217,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,s3c_cpufreq_updateclk (clk_pclk, cpu_new.freq.pclk);/* start the frequency change */ - -if (policy) -cpufreq_notify_transition (&freqs.freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs.freqs,CPUFREQ_PRECHANGE );/* If hclk is staying the same, then we do not need to * re-write the IO or the refresh timings whilst we are changing
@@ -264,8 +261,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,local_irq_restore (flags);/* notify everyone we've done this */ -if (policy) -cpufreq_notify_transition (&freqs.freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs.freqs,CPUFREQ_POSTCHANGE );s3c_freq_dbg ("%s: finished\n" , __func__);return 0 ;
arch/arm/mach-sa1100/cpu-sa1100.c +2 -3
@@ -201,9 +201,8 @@ static int sa1100_target(struct cpufreq_policy *policy, freqs.old = cur; freqs.new =sa11x0_ppcr_to_freq (new_ppcr); - freqs.cpu =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (freqs.new > cur)sa1100_update_dram_timings (cur, freqs.new);
@@ -213,7 +212,7 @@ static int sa1100_target(struct cpufreq_policy *policy,if (freqs.new < cur)sa1100_update_dram_timings (cur, freqs.new); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
arch/arm/mach-sa1100/cpu-sa1110.c +2 -3
@@ -258,7 +258,6 @@ static int sa1110_target(struct cpufreq_policy *policy, freqs.old =sa11x0_getspeed (0 ); freqs.new =sa11x0_ppcr_to_freq (ppcr); - freqs.cpu =0 ;sdram_calculate_timing (&sd, freqs.new, sdram);
@@ -279,7 +278,7 @@ static int sa1110_target(struct cpufreq_policy *policy, sd.mdcas[2 ] =0xaaaaaaaa ;#endif -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* * The clock could be going away for some time. Set the SDRAMs
@@ -327,7 +326,7 @@ static int sa1110_target(struct cpufreq_policy *policy,*/ sdram_update_refresh (freqs.new, sdram); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
arch/arm/mach-tegra/cpu-tegra.c +8 -7
@@ -106,7 +106,8 @@ out:return ret; } -static int tegra_update_cpu_speed (unsigned long rate) +static int tegra_update_cpu_speed (struct cpufreq_policy *policy, +unsigned long rate) {int ret =0 ;struct cpufreq_freqs freqs;
@@ -128,8 +129,7 @@ static int tegra_update_cpu_speed(unsigned long rate)else clk_set_rate (emc_clk,100000000 );/* emc 50Mhz */ -for_each_online_cpu (freqs.cpu) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );#ifdef CONFIG_CPU_FREQ_DEBUG printk(KERN_DEBUG "cpufreq-tegra: transition: %u --> %u\n",
@@ -143,8 +143,7 @@ static int tegra_update_cpu_speed(unsigned long rate)return ret; } -for_each_online_cpu (freqs.cpu) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
@@ -181,7 +180,7 @@ static int tegra_target(struct cpufreq_policy *policy, target_cpu_speed[policy->cpu] = freq; - ret =tegra_update_cpu_speed (tegra_cpu_highest_speed ()); + ret =tegra_update_cpu_speed (policy,tegra_cpu_highest_speed ()); out:mutex_unlock (&tegra_cpu_lock);
@@ -193,10 +192,12 @@ static int tegra_pm_notify(struct notifier_block *nb, unsigned long event, {mutex_lock (&tegra_cpu_lock);if (event ==PM_SUSPEND_PREPARE ) { +struct cpufreq_policy *policy =cpufreq_cpu_get (0 ); 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); +tegra_update_cpu_speed (policy, freq_table[0 ].frequency); +cpufreq_cpu_put (policy); }else if (event ==PM_POST_SUSPEND ) { is_suspended = false; }
arch/avr32/mach-at32ap/cpufreq.c +2 -3
@@ -61,7 +61,6 @@ static int at32_set_target(struct cpufreq_policy *policy, freqs.old =at32_get_speed (0 ); freqs.new = (freq +500 ) /1000 ; - freqs.cpu =0 ; freqs.flags =0 ;if (!ref_freq) {
@@ -69,7 +68,7 @@ static int at32_set_target(struct cpufreq_policy *policy, loops_per_jiffy_ref = boot_cpu_data.loops_per_jiffy; } -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (freqs.old < freqs.new) boot_cpu_data.loops_per_jiffy =cpufreq_scale ( loops_per_jiffy_ref, ref_freq, freqs.new);
@@ -77,7 +76,7 @@ static int at32_set_target(struct cpufreq_policy *policy,if (freqs.new < freqs.old) boot_cpu_data.loops_per_jiffy =cpufreq_scale ( loops_per_jiffy_ref, ref_freq, freqs.new); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );pr_debug ("cpufreq: set frequency %lu Hz\n" , freq);
arch/blackfin/mach-common/cpufreq.c +34 -45
106 lines not on this page · raw message
arch/cris/arch-v32/mach-a3/cpufreq.c +7 -13
@@ -27,23 +27,17 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)return clk_ctrl.pll ?200000 :6000 ; } -static void cris_freq_set_cpu_state (unsigned int state) +static void cris_freq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int state) { -int i =0 ;struct cpufreq_freqs freqs;reg_clkgen_rw_clk_ctrl clk_ctrl; clk_ctrl =REG_RD (clkgen, regi_clkgen, rw_clk_ctrl); -#ifdef CONFIG_SMP - for_each_present_cpu(i) -#endif - { - freqs.old =cris_freq_get_cpu_frequency (i); - freqs.new = cris_freq_table[state].frequency; - freqs.cpu = i; - } + freqs.old =cris_freq_get_cpu_frequency (policy->cpu); + freqs.new = cris_freq_table[state].frequency; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );local_irq_disable ();
@@ -57,7 +51,7 @@ static void cris_freq_set_cpu_state(unsigned int state)local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };static int cris_freq_verify (struct cpufreq_policy *policy)
@@ -75,7 +69,7 @@ static int cris_freq_target(struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; -cris_freq_set_cpu_state (newstate); +cris_freq_set_cpu_state (policy, newstate);return 0 ; }
arch/cris/arch-v32/mach-fs/cpufreq.c +7 -10
@@ -27,20 +27,17 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)return clk_ctrl.pll ?200000 :6000 ; } -static void cris_freq_set_cpu_state (unsigned int state) +static void cris_freq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int state) { -int i;struct cpufreq_freqs freqs;reg_config_rw_clk_ctrl clk_ctrl; clk_ctrl =REG_RD (config, regi_config, rw_clk_ctrl); -for_each_possible_cpu (i) { - freqs.old =cris_freq_get_cpu_frequency (i); - freqs.new = cris_freq_table[state].frequency; - freqs.cpu = i; - } + freqs.old =cris_freq_get_cpu_frequency (policy->cpu); + freqs.new = cris_freq_table[state].frequency; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );local_irq_disable ();
@@ -54,7 +51,7 @@ static void cris_freq_set_cpu_state(unsigned int state)local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };static int cris_freq_verify (struct cpufreq_policy *policy)
@@ -71,7 +68,7 @@ static int cris_freq_target(struct cpufreq_policy *policy, (policy, cris_freq_table, target_freq, relation, &newstate)) return -EINVAL; -cris_freq_set_cpu_state (newstate); +cris_freq_set_cpu_state (policy, newstate);return 0 ; }
arch/ia64/kernel/cpufreq/acpi-cpufreq.c +12 -10
@@ -137,7 +137,7 @@ migrate_end:static int processor_set_freq (struct cpufreq_acpi_io *data, -unsigned int cpu, +struct cpufreq_policy *policy,int state) {int ret =0 ;
@@ -149,8 +149,8 @@ processor_set_freq (pr_debug ("processor_set_freq\n" ); saved_mask = current->cpus_allowed; -set_cpus_allowed_ptr (current,cpumask_of (cpu)); -if (smp_processor_id () != cpu) { +set_cpus_allowed_ptr (current,cpumask_of (policy->cpu)); +if (smp_processor_id () != policy->cpu) { retval = -EAGAIN ; goto migrate_end; }
@@ -170,12 +170,11 @@ processor_set_freq ( data->acpi_data.state, state);/* cpufreq frequency struct */ - cpufreq_freqs.cpu = cpu; cpufreq_freqs.old = data->freq_table[data->acpi_data.state].frequency; cpufreq_freqs.new = data->freq_table[state].frequency;/* notify cpufreq */ -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs,CPUFREQ_PRECHANGE );/* * First we write the target state's 'control' value to the
@@ -189,17 +188,20 @@ processor_set_freq ( ret =processor_set_pstate (value);if (ret) {unsigned int tmp = cpufreq_freqs.new; -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs, +CPUFREQ_POSTCHANGE ); cpufreq_freqs.new = cpufreq_freqs.old; cpufreq_freqs.old = tmp; -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_PRECHANGE ); -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs, +CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs, +CPUFREQ_POSTCHANGE );printk (KERN_WARNING "Transition failed with error %d\n" , ret); retval = -ENODEV ; goto migrate_end; } -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs,CPUFREQ_POSTCHANGE ); data->acpi_data.state = state;
@@ -240,7 +242,7 @@ acpi_cpufreq_target (if (result)return (result); - result =processor_set_freq (data, policy->cpu, next_state); + result =processor_set_freq (data, policy, next_state);return (result); }
arch/mips/kernel/cpufreq/loongson2_cpufreq.c +2 -3
@@ -80,7 +80,6 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,pr_debug ("cpufreq: requested frequency %u Hz\n" , target_freq *1000 ); - freqs.cpu = cpu; freqs.old =loongson2_cpufreq_get (cpu); freqs.new = freq; freqs.flags =0 ;
@@ -89,7 +88,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,return 0 ;/* notifiers */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );set_cpus_allowed_ptr (current, &cpus_allowed);
@@ -97,7 +96,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,clk_set_rate (cpuclk, freq);/* notifiers */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );pr_debug ("cpufreq: set frequency %u kHz\n" , freq);
arch/powerpc/platforms/cell/cbe_cpufreq.c +2 -3
@@ -156,10 +156,9 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy, freqs.old = policy->cur; freqs.new = cbe_freqs[cbe_pmode_new].frequency; - freqs.cpu = policy->cpu;mutex_lock (&cbe_switch_mutex); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); pr_debug("setting frequency for cpu %d to %d kHz, " \ "1/%d of max frequency\n",
@@ -169,7 +168,7 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy, rc =set_pmode (policy->cpu, cbe_pmode_new); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&cbe_switch_mutex);return rc;
arch/powerpc/platforms/pasemi/cpufreq.c +2 -3
@@ -273,10 +273,9 @@ static int pas_cpufreq_target(struct cpufreq_policy *policy, freqs.old = policy->cur; freqs.new = pas_freqs[pas_astate_new].frequency; - freqs.cpu = policy->cpu;mutex_lock (&pas_switch_mutex); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); pr_debug("setting frequency for cpu %d to %d kHz, 1/%d of max frequency\n", policy->cpu,
@@ -288,7 +287,7 @@ static int pas_cpufreq_target(struct cpufreq_policy *policy,for_each_online_cpu (i)set_astate (i, pas_astate_new); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&pas_switch_mutex); ppc_proc_freq = freqs.new *1000ul ;
arch/powerpc/platforms/powermac/cpufreq_32.c +7 -7
@@ -335,7 +335,8 @@ static int pmu_set_cpu_speed(int low_speed)return 0 ; } -static int do_set_cpu_speed (int speed_mode,int notify) +static int do_set_cpu_speed (struct cpufreq_policy *policy,int speed_mode, +int notify) {struct cpufreq_freqs freqs;unsigned long l3cr;
@@ -343,13 +344,12 @@ static int do_set_cpu_speed(int speed_mode, int notify) freqs.old = cur_freq; freqs.new = (speed_mode ==CPUFREQ_HIGH ) ? hi_freq : low_freq; - freqs.cpu =smp_processor_id ();if (freqs.old == freqs.new)return 0 ;if (notify) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (speed_mode ==CPUFREQ_LOW &&cpu_has_feature (CPU_FTR_L3CR )) { l3cr =_get_L3CR ();
@@ -366,7 +366,7 @@ static int do_set_cpu_speed(int speed_mode, int notify)_set_L3CR (prev_l3cr); }if (notify) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); cur_freq = (speed_mode ==CPUFREQ_HIGH ) ? hi_freq : low_freq;return 0 ;
@@ -393,7 +393,7 @@ static int pmac_cpufreq_target( struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; - rc =do_set_cpu_speed (newstate,1 ); + rc =do_set_cpu_speed (policy, newstate,1 ); ppc_proc_freq = cur_freq *1000ul ;return rc;
@@ -442,7 +442,7 @@ static int pmac_cpufreq_suspend(struct cpufreq_policy *policy) no_schedule =1 ; sleep_freq = cur_freq;if (cur_freq == low_freq && !is_pmu_based) -do_set_cpu_speed (CPUFREQ_HIGH ,0 ); +do_set_cpu_speed (policy,CPUFREQ_HIGH ,0 );return 0 ; }
@@ -458,7 +458,7 @@ static int pmac_cpufreq_resume(struct cpufreq_policy *policy)* is that we force a switch to whatever it was, which is * probably high speed due to our suspend() routine */ -do_set_cpu_speed (sleep_freq == low_freq ? +do_set_cpu_speed (policy, sleep_freq == low_freq ?CPUFREQ_LOW :CPUFREQ_HIGH ,0 ); ppc_proc_freq = cur_freq *1000ul ;
arch/powerpc/platforms/powermac/cpufreq_64.c +2 -3
@@ -339,11 +339,10 @@ static int g5_cpufreq_target(struct cpufreq_policy *policy, freqs.old = g5_cpu_freqs[g5_pmode_cur].frequency; freqs.new = g5_cpu_freqs[newstate].frequency; - freqs.cpu =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); rc =g5_switch_freq (newstate); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&g5_switch_mutex);
arch/sh/kernel/cpufreq.c +2 -3
@@ -69,15 +69,14 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy,dev_dbg (dev,"requested frequency %u Hz\n" , target_freq *1000 ); - freqs.cpu = cpu; freqs.old =sh_cpufreq_get (cpu); freqs.new = (freq +500 ) /1000 ; freqs.flags =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );set_cpus_allowed_ptr (current, &cpus_allowed);clk_set_rate (cpuclk, freq); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );dev_dbg (dev,"set frequency %lu Hz\n" , freq);
arch/sparc/kernel/us2e_cpufreq.c +7 -6
@@ -248,8 +248,10 @@ static unsigned int us2e_freq_get(unsigned int cpu)return clock_tick /estar_to_divisor (estar); } -static void us2e_set_cpu_divider_index (unsigned int cpu,unsigned int index) +static void us2e_set_cpu_divider_index (struct cpufreq_policy *policy, +unsigned int index) { +unsigned int cpu = policy->cpu;unsigned long new_bits, new_freq;unsigned long clock_tick, divisor, old_divisor, estar;cpumask_t cpus_allowed;
@@ -272,14 +274,13 @@ static void us2e_set_cpu_divider_index(unsigned int cpu, unsigned int index) freqs.old = clock_tick / old_divisor; freqs.new = new_freq; - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (old_divisor != divisor)us2e_transition (estar, new_bits, clock_tick *1000 , old_divisor, divisor); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );set_cpus_allowed_ptr (current, &cpus_allowed); }
@@ -295,7 +296,7 @@ static int us2e_freq_target(struct cpufreq_policy *policy, target_freq, relation, &new_index))return -EINVAL ; -us2e_set_cpu_divider_index (policy->cpu, new_index); +us2e_set_cpu_divider_index (policy, new_index);return 0 ; }
@@ -335,7 +336,7 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)static int us2e_freq_cpu_exit (struct cpufreq_policy *policy) {if (cpufreq_us2e_driver) -us2e_set_cpu_divider_index (policy->cpu,0 ); +us2e_set_cpu_divider_index (policy,0 );return 0 ; }
arch/sparc/kernel/us3_cpufreq.c +7 -6
@@ -96,8 +96,10 @@ static unsigned int us3_freq_get(unsigned int cpu)return ret; } -static void us3_set_cpu_divider_index (unsigned int cpu,unsigned int index) +static void us3_set_cpu_divider_index (struct cpufreq_policy *policy, +unsigned int index) { +unsigned int cpu = policy->cpu;unsigned long new_bits, new_freq, reg;cpumask_t cpus_allowed;struct cpufreq_freqs freqs;
@@ -131,14 +133,13 @@ static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index) freqs.old =get_current_freq (cpu, reg); freqs.new = new_freq; - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); reg &= ~SAFARI_CFG_DIV_MASK ; reg |= new_bits;write_safari_cfg (reg); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );set_cpus_allowed_ptr (current, &cpus_allowed); }
@@ -156,7 +157,7 @@ static int us3_freq_target(struct cpufreq_policy *policy, &new_index))return -EINVAL ; -us3_set_cpu_divider_index (policy->cpu, new_index); +us3_set_cpu_divider_index (policy, new_index);return 0 ; }
@@ -192,7 +193,7 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)static int us3_freq_cpu_exit (struct cpufreq_policy *policy) {if (cpufreq_us3_driver) -us3_set_cpu_divider_index (policy->cpu,0 ); +us3_set_cpu_divider_index (policy,0 );return 0 ; }
arch/unicore32/kernel/cpu-ucv2.c +2 -3
@@ -52,15 +52,14 @@ static int ucv2_target(struct cpufreq_policy *policy,struct cpufreq_freqs freqs;struct clk *mclk =clk_get (NULL ,"MAIN_CLK" ); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (!clk_set_rate (mclk, target_freq *1000 )) { freqs.old = cur; freqs.new = target_freq; - freqs.cpu =0 ; } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/acpi-cpufreq.c +2 -9
@@ -423,7 +423,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,struct drv_cmd cmd;unsigned int next_state =0 ;/* Index into freq_table */ unsigned int next_perf_state =0 ;/* Index into perf table */ -unsigned int i;int result =0 ;pr_debug ("acpi_cpufreq_target %d (%d)\n" , target_freq, policy->cpu);
@@ -486,10 +485,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, freqs.old = perf->states[perf->state].core_frequency *1000 ; freqs.new = data->freq_table[next_state].frequency; -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );drv_write (&cmd);
@@ -502,10 +498,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, } } -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); perf->state = next_perf_state; out:
drivers/cpufreq/cpufreq-cpu0.c +3 -9
@@ -46,7 +46,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy,struct opp *opp;unsigned long volt =0 , volt_old =0 , tol =0 ;long freq_Hz; -unsigned int index, cpu; +unsigned int index;int ret; ret = cpufreq_frequency_table_target(policy, freq_table, target_freq,
@@ -66,10 +66,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy,if (freqs.old == freqs.new)return 0 ; -for_each_online_cpu (cpu) { - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (cpu_reg) {rcu_read_lock ();
@@ -121,10 +118,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy, } post_notify: -for_each_online_cpu (cpu) { - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
drivers/cpufreq/cpufreq-nforce2.c +2 -3
@@ -263,7 +263,6 @@ static int nforce2_target(struct cpufreq_policy *policy, freqs.old =nforce2_get (policy->cpu); freqs.new = target_fsb * fid *100 ; - freqs.cpu =0 ;/* Only one CPU on nForce2 platforms */ if (freqs.old == freqs.new)return 0 ;
@@ -271,7 +270,7 @@ static int nforce2_target(struct cpufreq_policy *policy,pr_debug ("Old CPU frequency %d kHz, new %d kHz\n" , freqs.old, freqs.new); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Disable IRQs */ /* local_irq_save(flags); */
@@ -286,7 +285,7 @@ static int nforce2_target(struct cpufreq_policy *policy,/* Enable IRQs */ /* local_irq_restore(flags); */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/cpufreq.c +26 -19
77 lines not on this page · raw message
drivers/cpufreq/dbx500-cpufreq.c +2 -4
@@ -55,8 +55,7 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,return 0 ;/* pre-change notification */ -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* update armss clk frequency */ ret =clk_set_rate (armss_clk, freqs.new *1000 );
@@ -68,8 +67,7 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy, }/* post change notification */ -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/e_powersaver.c +5 -6
@@ -104,7 +104,7 @@ static unsigned int eps_get(unsigned int cpu) }static int eps_set_state (struct eps_cpu_data *centaur, -unsigned int cpu, +struct cpufreq_policy *policy,u32 dest_state) {struct cpufreq_freqs freqs;
@@ -112,10 +112,9 @@ static int eps_set_state(struct eps_cpu_data *centaur,int err =0 ;int i; - freqs.old =eps_get (cpu); + freqs.old =eps_get (policy->cpu); freqs.new = centaur->fsb * ((dest_state >>8 ) &0xff ); - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Wait while CPU is busy */ rdmsr (MSR_IA32_PERF_STATUS , lo, hi);
@@ -162,7 +161,7 @@ postchange: current_multiplier); }#endif -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return err; }
@@ -190,7 +189,7 @@ static int eps_target(struct cpufreq_policy *policy,/* Make frequency transition */ dest_state = centaur->freq_table[newstate].index &0xffff ; - ret =eps_set_state (centaur, cpu, dest_state); + ret =eps_set_state (centaur, policy, dest_state);if (ret)printk (KERN_ERR "eps: Timeout!\n" );return ret;
drivers/cpufreq/elanfreq.c +5 -5
@@ -117,15 +117,15 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)* There is no return value. */ -static void elanfreq_set_cpu_state (unsigned int state) +static void elanfreq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int state) {struct cpufreq_freqs freqs; freqs.old =elanfreq_get_cpu_frequency (0 ); freqs.new = elan_multiplier[state].clock; - freqs.cpu =0 ;/* elanfreq.c is UP only driver */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );printk (KERN_INFO "elanfreq: attempting to set frequency to %i kHz\n" , elan_multiplier[state].clock);
@@ -161,7 +161,7 @@ static void elanfreq_set_cpu_state(unsigned int state)udelay (10000 );local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };
@@ -188,7 +188,7 @@ static int elanfreq_target(struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; -elanfreq_set_cpu_state (newstate); +elanfreq_set_cpu_state (policy, newstate);return 0 ; }
drivers/cpufreq/exynos-cpufreq.c +2 -5
@@ -70,7 +70,6 @@ static int exynos_cpufreq_scale(unsigned int target_freq) freqs.old = policy->cur; freqs.new = target_freq; - freqs.cpu = policy->cpu;if (freqs.new == freqs.old) goto out;
@@ -105,8 +104,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq) } arm_volt = volt_table[index]; -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* When the new frequency is higher than current frequency */ if ((freqs.new > freqs.old) && !safe_arm_volt) {
@@ -131,8 +129,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq) exynos_info->set_freq (old_index, index); -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );/* When the new frequency is lower than current frequency */ if ((freqs.new < freqs.old) ||
drivers/cpufreq/gx-suspmod.c +4 -7
@@ -251,14 +251,13 @@ static unsigned int gx_validate_speed(unsigned int khz, u8 *on_duration,* set cpu speed in khz. **/ -static void gx_set_cpuspeed (unsigned int khz) +static void gx_set_cpuspeed (struct cpufreq_policy *policy,unsigned int khz) {u8 suscfg, pmer1;unsigned int new_khz;unsigned long flags;struct cpufreq_freqs freqs; - freqs.cpu =0 ; freqs.old =gx_get_cpuspeed (0 ); new_khz = gx_validate_speed(khz, &gx_params->on_duration,
@@ -266,11 +265,9 @@ static void gx_set_cpuspeed(unsigned int khz) freqs.new = new_khz; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );local_irq_save (flags); - -if (new_khz != stock_freq) {/* if new khz == 100% of CPU speed, it is special case */ switch (gx_params->cs55x0->device) {
@@ -317,7 +314,7 @@ static void gx_set_cpuspeed(unsigned int khz) gx_params->pci_suscfg = suscfg; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );pr_debug ("suspend modulation w/ duration of ON:%d us, OFF:%d us\n" , gx_params->on_duration *32 , gx_params->off_duration *32 );
@@ -397,7 +394,7 @@ static int cpufreq_gx_target(struct cpufreq_policy *policy, tmp_freq =gx_validate_speed (tmp_freq, &tmp1, &tmp2); } -gx_set_cpuspeed (tmp_freq); +gx_set_cpuspeed (policy, tmp_freq);return 0 ; }
drivers/cpufreq/imx6q-cpufreq.c +3 -9
@@ -50,7 +50,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,struct cpufreq_freqs freqs;struct opp *opp;unsigned long freq_hz, volt, volt_old; -unsigned int index, cpu; +unsigned int index;int ret; ret = cpufreq_frequency_table_target(policy, freq_table, target_freq,
@@ -68,10 +68,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,if (freqs.old == freqs.new)return 0 ; -for_each_online_cpu (cpu) { - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );rcu_read_lock (); opp =opp_find_freq_ceil (cpu_dev, &freq_hz);
@@ -166,10 +163,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy, } } -for_each_online_cpu (cpu) { - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/kirkwood-cpufreq.c +5 -5
@@ -55,7 +55,8 @@ static unsigned int kirkwood_cpufreq_get_cpu_frequency(unsigned int cpu)return kirkwood_freq_table[0 ].frequency; } -static void kirkwood_cpufreq_set_cpu_state (unsigned int index) +static void kirkwood_cpufreq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int index) {struct cpufreq_freqs freqs;unsigned int state = kirkwood_freq_table[index].index;
@@ -63,9 +64,8 @@ static void kirkwood_cpufreq_set_cpu_state(unsigned int index) freqs.old =kirkwood_cpufreq_get_cpu_frequency (0 ); freqs.new = kirkwood_freq_table[index].frequency; - freqs.cpu =0 ;/* Kirkwood is UP */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );dev_dbg (priv.dev,"Attempting to set frequency to %i KHz\n" , kirkwood_freq_table[index].frequency);
@@ -99,7 +99,7 @@ static void kirkwood_cpufreq_set_cpu_state(unsigned int index)local_irq_enable (); } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };static int kirkwood_cpufreq_verify (struct cpufreq_policy *policy)
@@ -117,7 +117,7 @@ static int kirkwood_cpufreq_target(struct cpufreq_policy *policy, target_freq, relation, &index))return -EINVAL ; -kirkwood_cpufreq_set_cpu_state (index); +kirkwood_cpufreq_set_cpu_state (policy, index);return 0 ; }
drivers/cpufreq/longhaul.c +10 -8
@@ -242,7 +242,8 @@ static void do_powersaver(int cx_address, unsigned int mults_index,* Sets a new clock ratio. */ -static void longhaul_setstate (unsigned int table_index) +static void longhaul_setstate (struct cpufreq_policy *policy, +unsigned int table_index) {unsigned int mults_index;int speed, mult;
@@ -267,9 +268,8 @@ static void longhaul_setstate(unsigned int table_index) freqs.old =calc_speed (longhaul_get_cpu_mult ()); freqs.new = speed; - freqs.cpu =0 ;/* longhaul.c is UP only driver */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );pr_debug ("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n" , fsb, mult/10 , mult%10 ,print_speed (speed/1000 ));
@@ -386,7 +386,7 @@ retry_loop: } }/* Report true CPU frequency */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );if (!bm_timeout) printk(KERN_INFO PFX "Warning: Timeout while waiting for "
@@ -648,7 +648,7 @@ static int longhaul_target(struct cpufreq_policy *policy,return 0 ;if (!can_scale_voltage) -longhaul_setstate (table_index); +longhaul_setstate (policy, table_index);else {/* On test system voltage transitions exceeding single * step up or down were turning motherboard off. Both
@@ -663,7 +663,7 @@ static int longhaul_target(struct cpufreq_policy *policy,while (i != table_index) { vid = (longhaul_table[i].index >>8 ) &0x1f ;if (vid != current_vid) { -longhaul_setstate (i); +longhaul_setstate (policy, i); current_vid = vid;msleep (200 ); }
@@ -672,7 +672,7 @@ static int longhaul_target(struct cpufreq_policy *policy,else i--; } -longhaul_setstate (table_index); +longhaul_setstate (policy, table_index); } longhaul_index = table_index;return 0 ;
@@ -998,15 +998,17 @@ static int __init longhaul_init(void) static void __exit longhaul_exit(void) { +struct cpufreq_policy *policy =cpufreq_cpu_get (0 );int i;for (i =0 ; i < numscales; i++) {if (mults[i] == maxmult) { -longhaul_setstate (i); +longhaul_setstate (policy, i);break ; } } +cpufreq_cpu_put (policy);cpufreq_unregister_driver (&longhaul_driver);kfree (longhaul_table); }
drivers/cpufreq/maple-cpufreq.c +2 -3
@@ -158,11 +158,10 @@ static int maple_cpufreq_target(struct cpufreq_policy *policy, freqs.old = maple_cpu_freqs[maple_pmode_cur].frequency; freqs.new = maple_cpu_freqs[newstate].frequency; - freqs.cpu =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); rc =maple_scom_switch_freq (newstate); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&maple_switch_mutex);
drivers/cpufreq/omap-cpufreq.c +2 -9
@@ -88,16 +88,12 @@ static int omap_target(struct cpufreq_policy *policy, } freqs.old =omap_getspeed (policy->cpu); - freqs.cpu = policy->cpu;if (freqs.old == freqs.new && policy->cur == freqs.new)return ret;/* notifiers */ -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); freq = freqs.new *1000 ; ret =clk_round_rate (mpu_clk, freq);
@@ -157,10 +153,7 @@ static int omap_target(struct cpufreq_policy *policy, done:/* notifiers */ -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
drivers/cpufreq/p4-clockmod.c +2 -8
@@ -125,10 +125,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,return 0 ;/* notifiers */ -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* run on each logical CPU, * see section 13.15.3 of IA32 Intel Architecture Software
@@ -138,10 +135,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,cpufreq_p4_setdc (i, p4clockmod_table[newstate].index);/* notifiers */ -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/pcc-cpufreq.c +2 -3
@@ -215,8 +215,7 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy, (pcch_virt_addr + pcc_cpu_data->input_offset)); freqs.new = target_freq; - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); input_buffer =0x1 | (((target_freq *100 ) / (ioread32 (&pcch_hdr->nominal) *1000 )) <<8 );
@@ -237,7 +236,7 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy, }iowrite16 (0 , &pcch_hdr->status); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );pr_debug ("target: was SUCCESSFUL for cpu %d\n" , cpu);spin_unlock (&pcc_lock);
drivers/cpufreq/powernow-k6.c +6 -6
@@ -68,7 +68,8 @@ static int powernow_k6_get_cpu_multiplier(void)* * Tries to change the PowerNow! multiplier */ -static void powernow_k6_set_state (unsigned int best_i) +static void powernow_k6_set_state (struct cpufreq_policy *policy, +unsigned int best_i) {unsigned long outvalue =0 , invalue =0 ;unsigned long msrval;
@@ -81,9 +82,8 @@ static void powernow_k6_set_state(unsigned int best_i) freqs.old = busfreq *powernow_k6_get_cpu_multiplier (); freqs.new = busfreq * clock_ratio[best_i].index; - freqs.cpu =0 ;/* powernow-k6.c is UP only driver */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* we now need to transform best_i to the BVC format, see AMD#23446 */
@@ -98,7 +98,7 @@ static void powernow_k6_set_state(unsigned int best_i) msrval =POWERNOW_IOPORT +0x0 ;wrmsr (MSR_K6_EPMR , msrval,0 );/* disable it again */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ; }
@@ -136,7 +136,7 @@ static int powernow_k6_target(struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; -powernow_k6_set_state (newstate); +powernow_k6_set_state (policy, newstate);return 0 ; }
@@ -182,7 +182,7 @@ static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)unsigned int i;for (i =0 ; i <8 ; i++) {if (i == max_multiplier) -powernow_k6_set_state (i); +powernow_k6_set_state (policy, i); }cpufreq_frequency_table_put_attr (policy->cpu);return 0 ;
drivers/cpufreq/powernow-k7.c +4 -6
@@ -248,7 +248,7 @@ static void change_VID(int vid) } -static void change_speed (unsigned int index) +static void change_speed (struct cpufreq_policy *policy,unsigned int index) {u8 fid, vid;struct cpufreq_freqs freqs;
@@ -263,15 +263,13 @@ static void change_speed(unsigned int index) fid = powernow_table[index].index &0xFF ; vid = (powernow_table[index].index &0xFF00 ) >>8 ; - freqs.cpu =0 ; -rdmsrl (MSR_K7_FID_VID_STATUS , fidvidstatus.val); cfid = fidvidstatus.bits.CFID; freqs.old = fsb * fid_codes[cfid] /10 ; freqs.new = powernow_table[index].frequency; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Now do the magic poking into the MSRs. */
@@ -292,7 +290,7 @@ static void change_speed(unsigned int index)if (have_a0 ==1 )local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); }
@@ -546,7 +544,7 @@ static int powernow_target(struct cpufreq_policy *policy, relation, &newstate))return -EINVAL ; -change_speed (newstate); +change_speed (policy, newstate);return 0 ; }
drivers/cpufreq/powernow-k8.c +7 -9
@@ -928,9 +928,10 @@ static int get_transition_latency(struct powernow_k8_data *data)static int transition_frequency_fidvid (struct powernow_k8_data *data,unsigned int index) { +struct cpufreq_policy *policy;u32 fid =0 ;u32 vid =0 ; -int res, i; +int res;struct cpufreq_freqs freqs;pr_debug ("cpu %d transition to index %u\n" ,smp_processor_id (), index);
@@ -959,10 +960,10 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data, freqs.old =find_khz_freq_from_fid (data->currfid); freqs.new =find_khz_freq_from_fid (fid); -for_each_cpu (i, data->available_cores) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } + policy =cpufreq_cpu_get (smp_processor_id ()); +cpufreq_cpu_put (policy); + +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); res =transition_fid_vid (data, fid, vid);if (res)
@@ -970,10 +971,7 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data, freqs.new =find_khz_freq_from_fid (data->currfid); -for_each_cpu (i, data->available_cores) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return res; }
drivers/cpufreq/s3c2416-cpufreq.c +2 -3
@@ -256,7 +256,6 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy, goto out; } - freqs.cpu =0 ; freqs.flags =0 ; freqs.old = s3c_freq->is_dvs ?FREQ_DVS :clk_get_rate (s3c_freq->armclk) /1000 ;
@@ -274,7 +273,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy,if (!to_dvs && freqs.old == freqs.new) goto out; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (to_dvs) {pr_debug ("cpufreq: enter dvs\n" );
@@ -287,7 +286,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy, ret =s3c2416_cpufreq_set_armdiv (s3c_freq, freqs.new); } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); out:mutex_unlock (&cpufreq_lock);
drivers/cpufreq/s3c64xx-cpufreq.c +3 -4
@@ -84,7 +84,6 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,if (ret !=0 )return ret; - freqs.cpu =0 ; freqs.old =clk_get_rate (armclk) /1000 ; freqs.new = s3c64xx_freq_table[i].frequency; freqs.flags =0 ;
@@ -95,7 +94,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,pr_debug ("Transition %d-%dkHz\n" , freqs.old, freqs.new); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );#ifdef CONFIG_REGULATOR if (vddarm && freqs.new > freqs.old) {
@@ -117,7 +116,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy, goto err; } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );#ifdef CONFIG_REGULATOR if (vddarm && freqs.new < freqs.old) {
@@ -141,7 +140,7 @@ err_clk:if (clk_set_rate (armclk, freqs.old *1000 ) <0 )pr_err ("Failed to restore original clock rate\n" ); err: -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
drivers/cpufreq/s5pv210-cpufreq.c +2 -3
@@ -229,7 +229,6 @@ static int s5pv210_target(struct cpufreq_policy *policy, } freqs.new = s5pv210_freq_table[index].frequency; - freqs.cpu =0 ;if (freqs.new == freqs.old) goto exit;
@@ -256,7 +255,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, goto exit; } -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Check if there need to change PLL */ if ((index ==L0 ) || (priv_index ==L0 ))
@@ -468,7 +467,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, } } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );if (freqs.new < freqs.old) { regulator_set_voltage(int_regulator,
drivers/cpufreq/sc520_freq.c +5 -5
@@ -53,7 +53,8 @@ static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu) } } -static void sc520_freq_set_cpu_state (unsigned int state) +static void sc520_freq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int state) {struct cpufreq_freqs freqs;
@@ -61,9 +62,8 @@ static void sc520_freq_set_cpu_state(unsigned int state) freqs.old =sc520_freq_get_cpu_frequency (0 ); freqs.new = sc520_freq_table[state].frequency; - freqs.cpu =0 ;/* AMD Elan is UP */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );pr_debug ("attempting to set frequency to %i kHz\n" , sc520_freq_table[state].frequency);
@@ -75,7 +75,7 @@ static void sc520_freq_set_cpu_state(unsigned int state)local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };static int sc520_freq_verify (struct cpufreq_policy *policy)
@@ -93,7 +93,7 @@ static int sc520_freq_target(struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; -sc520_freq_set_cpu_state (newstate); +sc520_freq_set_cpu_state (policy, newstate);return 0 ; }
drivers/cpufreq/spear-cpufreq.c +2 -5
@@ -121,7 +121,6 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, target_freq, relation, &index))return -EINVAL ; - freqs.cpu = policy->cpu; freqs.old =spear_cpufreq_get (0 ); newfreq = spear_cpufreq.freq_tbl[index].frequency *1000 ;
@@ -158,8 +157,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, freqs.new = newfreq /1000 ; freqs.new /= mult; -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (mult ==2 ) ret =spear1340_set_cpu_rate (srcclk, newfreq);
@@ -172,8 +170,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, freqs.new =clk_get_rate (spear_cpufreq.clk) /1000 ; } -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
drivers/cpufreq/speedstep-centrino.c +5 -19
@@ -457,7 +457,7 @@ static int centrino_target (struct cpufreq_policy *policy,unsigned int msr, oldmsr =0 , h =0 , cpu = policy->cpu;struct cpufreq_freqs freqs;int retval =0 ; -unsigned int j, k, first_cpu, tmp; +unsigned int j, first_cpu, tmp;cpumask_var_t covered_cpus;if (unlikely (!zalloc_cpumask_var (&covered_cpus,GFP_KERNEL )))
@@ -522,13 +522,8 @@ static int centrino_target (struct cpufreq_policy *policy,pr_debug ("target=%dkHz old=%d new=%d msr=%04x\n" , target_freq, freqs.old, freqs.new, msr); -for_each_cpu (k, policy->cpus) { -if (!cpu_online (k)) -continue ; - freqs.cpu = k; -cpufreq_notify_transition (&freqs, +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); - } first_cpu =0 ;/* all but 16 LSB are reserved, treat them with care */
@@ -544,12 +539,7 @@ static int centrino_target (struct cpufreq_policy *policy,cpumask_set_cpu (j, covered_cpus); } -for_each_cpu (k, policy->cpus) { -if (!cpu_online (k)) -continue ; - freqs.cpu = k; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );if (unlikely (retval)) {/*
@@ -565,12 +555,8 @@ static int centrino_target (struct cpufreq_policy *policy, tmp = freqs.new; freqs.new = freqs.old; freqs.old = tmp; -for_each_cpu (j, policy->cpus) { -if (!cpu_online (j)) -continue ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); } retval =0 ;
drivers/cpufreq/speedstep-ich.c +2 -10
@@ -263,7 +263,6 @@ static int speedstep_target(struct cpufreq_policy *policy, {unsigned int newstate =0 , policy_cpu;struct cpufreq_freqs freqs; -int i;if (cpufreq_frequency_table_target (policy, &speedstep_freqs[0 ], target_freq, relation, &newstate))
@@ -272,7 +271,6 @@ static int speedstep_target(struct cpufreq_policy *policy, policy_cpu =cpumask_any_and (policy->cpus, cpu_online_mask); freqs.old =speedstep_get (policy_cpu); freqs.new = speedstep_freqs[newstate].frequency; - freqs.cpu = policy->cpu;pr_debug ("transiting from %u to %u kHz\n" , freqs.old, freqs.new);
@@ -280,18 +278,12 @@ static int speedstep_target(struct cpufreq_policy *policy,if (freqs.old == freqs.new)return 0 ; -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );smp_call_function_single (policy_cpu, _speedstep_set_state, &newstate, true); -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/speedstep-smi.c +2 -3
@@ -252,14 +252,13 @@ static int speedstep_target(struct cpufreq_policy *policy, freqs.old = speedstep_freqs[speedstep_get_state ()].frequency; freqs.new = speedstep_freqs[newstate].frequency; - freqs.cpu =0 ;/* speedstep.c is UP only driver */ if (freqs.old == freqs.new)return 0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );speedstep_set_state (newstate); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
include/linux/cpufreq.h +2 -2
@@ -278,8 +278,8 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data);int cpufreq_unregister_driver (struct cpufreq_driver *driver_data); -void cpufreq_notify_transition (struct cpufreq_freqs *freqs,unsigned int state); - +void cpufreq_notify_transition (struct cpufreq_policy *policy, +struct cpufreq_freqs *freqs,unsigned int state);static inline void cpufreq_verify_within_limits (struct cpufreq_policy *policy,unsigned int min,unsigned int max) {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 6/9 cpufreq: Don't check if cpu is online/offline for cpufreq callbacks
In reply to Viresh Kumarcpufreq layer doesn't call cpufreq driver's callback for any offline cpu and so checking that isn't useful.
Lets get rid of it.
--- arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 6 ------ arch/sh/kernel/cpufreq.c | 6 ------ arch/sparc/kernel/us2e_cpufreq.c | 6 ------ arch/sparc/kernel/us3_cpufreq.c | 6 ------ drivers/cpufreq/p4-clockmod.c | 3 +-- drivers/cpufreq/powernow-k8.c | 3 --- drivers/cpufreq/speedstep-centrino.c | 4 ---- 7 files changed, 1 insertion(+), 33 deletions(-)
arch/mips/kernel/cpufreq/loongson2_cpufreq.c +0 -6
@@ -61,9 +61,6 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,struct cpufreq_freqs freqs;unsigned int freq; -if (!cpu_online (cpu)) -return -ENODEV ; - cpus_allowed = current->cpus_allowed;set_cpus_allowed_ptr (current,cpumask_of (cpu));
@@ -109,9 +106,6 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)unsigned long rate;int ret; -if (!cpu_online (policy->cpu)) -return -ENODEV ; - cpuclk =clk_get (NULL ,"cpu_clk" );if (IS_ERR (cpuclk)) {printk (KERN_ERR "cpufreq: couldn't get CPU clk\n" );
arch/sh/kernel/cpufreq.c +0 -6
@@ -51,9 +51,6 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy,struct device *dev;long freq; -if (!cpu_online (cpu)) -return -ENODEV ; - cpus_allowed = current->cpus_allowed;set_cpus_allowed_ptr (current,cpumask_of (cpu));
@@ -111,9 +108,6 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)struct cpufreq_frequency_table *freq_table;struct device *dev; -if (!cpu_online (cpu)) -return -ENODEV ; - dev =get_cpu_device (cpu); cpuclk =clk_get (dev,"cpu_clk" );
arch/sparc/kernel/us2e_cpufreq.c +0 -6
@@ -234,9 +234,6 @@ static unsigned int us2e_freq_get(unsigned int cpu)cpumask_t cpus_allowed;unsigned long clock_tick, estar; -if (!cpu_online (cpu)) -return 0 ; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current));set_cpus_allowed_ptr (current,cpumask_of (cpu));
@@ -257,9 +254,6 @@ static void us2e_set_cpu_divider_index(struct cpufreq_policy *policy,cpumask_t cpus_allowed;struct cpufreq_freqs freqs; -if (!cpu_online (cpu)) -return ; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current));set_cpus_allowed_ptr (current,cpumask_of (cpu));
arch/sparc/kernel/us3_cpufreq.c +0 -6
@@ -82,9 +82,6 @@ static unsigned int us3_freq_get(unsigned int cpu)unsigned long reg;unsigned int ret; -if (!cpu_online (cpu)) -return 0 ; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current));set_cpus_allowed_ptr (current,cpumask_of (cpu));
@@ -104,9 +101,6 @@ static void us3_set_cpu_divider_index(struct cpufreq_policy *policy,cpumask_t cpus_allowed;struct cpufreq_freqs freqs; -if (!cpu_online (cpu)) -return ; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current));set_cpus_allowed_ptr (current,cpumask_of (cpu));
drivers/cpufreq/p4-clockmod.c +1 -2
@@ -58,8 +58,7 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate) {u32 l, h; -if (!cpu_online (cpu) || - (newstate >DC_DISABLE ) || (newstate ==DC_RESV )) +if ((newstate >DC_DISABLE ) || (newstate ==DC_RESV ))return -EINVAL ;rdmsr_on_cpu (cpu,MSR_IA32_THERM_STATUS , &l, &h);
drivers/cpufreq/powernow-k8.c +0 -3
@@ -1102,9 +1102,6 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)struct init_on_cpu init_on_cpu;int rc; -if (!cpu_online (pol->cpu)) -return -ENODEV ; -smp_call_function_single (pol->cpu, check_supported_cpu, &rc,1 );if (rc)return -ENODEV ;
drivers/cpufreq/speedstep-centrino.c +0 -4
@@ -481,10 +481,6 @@ static int centrino_target (struct cpufreq_policy *policy,for_each_cpu (j, policy->cpus) {int good_cpu; -/* cpufreq holds the hotplug lock, so we are safe here */ -if (!cpu_online (j)) -continue ; -/* * Support for SMP systems. * Make sure we are running on CPU that wants to change freq
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 7/9 cpufreq: drivers: don't check range of target freq in .target()
In reply to Viresh KumarCpufreq core checks the range of target_freq before calling driver->target() and so we don't need to do it again.
Remove it.
--- arch/arm/mach-davinci/cpufreq.c | 9 --------- drivers/cpufreq/dbx500-cpufreq.c | 6 ------ 2 files changed, 15 deletions(-)
arch/arm/mach-davinci/cpufreq.c +0 -9
@@ -79,15 +79,6 @@ static int davinci_target(struct cpufreq_policy *policy,struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;struct clk *armclk = cpufreq.armclk; -/* -* Ensure desired rate is within allowed range. Some govenors -* (ondemand) will just pass target_freq=0 to get the minimum. -*/ -if (target_freq < policy->cpuinfo.min_freq) - target_freq = policy->cpuinfo.min_freq; -if (target_freq > policy->cpuinfo.max_freq) - target_freq = policy->cpuinfo.max_freq; - freqs.old =davinci_getspeed (0 ); freqs.new =clk_round_rate (armclk, target_freq *1000 ) /1000 ;
drivers/cpufreq/dbx500-cpufreq.c +0 -6
@@ -37,12 +37,6 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,unsigned int idx;int ret; -/* scale the target frequency to one of the extremes supported */ -if (target_freq < policy->cpuinfo.min_freq) - target_freq = policy->cpuinfo.min_freq; -if (target_freq > policy->cpuinfo.max_freq) - target_freq = policy->cpuinfo.max_freq; -/* Lookup the next frequency */ if (cpufreq_frequency_table_target (policy, freq_table, target_freq, relation, &idx))
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 8/9 cpufreq: drivers: Remove unnecessary assignments of policy-> members
In reply to Viresh KumarSome assignments of policy-> min/max/cur/cpuinfo.min_freq/cpuinfo.max_freq aren't required as part of it is done by cpufreq driver or cpufreq core.
Remove them.
At some places we merge multiple lines together too.
--- Documentation/cpu-freq/cpu-drivers.txt | 5 +++-- arch/arm/mach-davinci/cpufreq.c | 21 ++++++++------------- arch/arm/mach-imx/cpufreq.c | 3 --- arch/sh/kernel/cpufreq.c | 9 +++------ drivers/cpufreq/cpufreq-nforce2.c | 6 ++---- drivers/cpufreq/omap-cpufreq.c | 4 +--- 6 files changed, 17 insertions(+), 31 deletions(-)
Documentation/cpu-freq/cpu-drivers.txt +3 -2
@@ -108,8 +108,9 @@ policy->governor must contain the "default policy" for cpufreq_driver.target is called with these values. -For setting some of these values, the frequency table helpers might be -helpful. See the section 2 for more information on them. +For setting some of these values (cpuinfo.min[max]_freq, policy->min[max]), the +frequency table helpers might be helpful. See the section 2 for more information +on them. SMP systems normally have same clock source for a group of cpus. For these the .init() would be called only once for the first online cpu. Here the .init()
arch/arm/mach-davinci/cpufreq.c +8 -13
@@ -137,21 +137,16 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)return result; } - policy->cur = policy->min = policy->max =davinci_getspeed (0 ); - -if (freq_table) { - result =cpufreq_frequency_table_cpuinfo (policy, freq_table); -if (!result) -cpufreq_frequency_table_get_attr (freq_table, - policy->cpu); - }else { - policy->cpuinfo.min_freq = policy->min; - policy->cpuinfo.max_freq = policy->max; + policy->cur =davinci_getspeed (0 ); + + result =cpufreq_frequency_table_cpuinfo (policy, freq_table); +if (result) { +pr_err ("%s: cpufreq_frequency_table_cpuinfo() failed" , + __func__); +return result; } - policy->min = policy->cpuinfo.min_freq; - policy->max = policy->cpuinfo.max_freq; - policy->cur =davinci_getspeed (0 ); +cpufreq_frequency_table_get_attr (freq_table, policy->cpu);/* * Time measurement across the target() function yields ~1500-1800us
arch/arm/mach-imx/cpufreq.c +0 -3
@@ -144,14 +144,11 @@ static int mxc_cpufreq_init(struct cpufreq_policy *policy) imx_freq_table[i].frequency =CPUFREQ_TABLE_END ; policy->cur =clk_get_rate (cpu_clk) /1000 ; - policy->min = policy->cpuinfo.min_freq = cpu_freq_khz_min; - policy->max = policy->cpuinfo.max_freq = cpu_freq_khz_max;/* Manual states, that PLL stabilizes in two CLK32 periods */ policy->cpuinfo.transition_latency =2 *NANOSECOND /CLK32_FREQ ; ret =cpufreq_frequency_table_cpuinfo (policy, imx_freq_table); -if (ret <0 ) {printk (KERN_ERR "%s: failed to register i.MXC CPUfreq with error code %d\n" , __func__, ret);
arch/sh/kernel/cpufreq.c +3 -6
@@ -116,7 +116,7 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)return PTR_ERR (cpuclk); } - policy->cur = policy->min = policy->max =sh_cpufreq_get (cpu); + policy->cur =sh_cpufreq_get (cpu); freq_table = cpuclk->nr_freqs ? cpuclk->freq_table :NULL ;if (freq_table) {
@@ -129,15 +129,12 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)dev_notice (dev,"no frequency table found, falling back " "to rate rounding.\n" ); - policy->cpuinfo.min_freq = + policy->min = policy->cpuinfo.min_freq = (clk_round_rate (cpuclk,1 ) +500 ) /1000 ; - policy->cpuinfo.max_freq = + policy->max = policy->cpuinfo.max_freq = (clk_round_rate (cpuclk, ~0UL ) +500 ) /1000 ; } - policy->min = policy->cpuinfo.min_freq; - policy->max = policy->cpuinfo.max_freq; - policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; dev_info(dev, "CPU Frequencies - Minimum %u.%03u MHz, "
drivers/cpufreq/cpufreq-nforce2.c +2 -4
@@ -359,12 +359,10 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) min_fsb =NFORCE2_MIN_FSB ;/* cpuinfo and default policy values */ - policy->cpuinfo.min_freq = min_fsb * fid *100 ; - policy->cpuinfo.max_freq = max_fsb * fid *100 ; + policy->min = policy->cpuinfo.min_freq = min_fsb * fid *100 ; + policy->max = policy->cpuinfo.max_freq = max_fsb * fid *100 ; policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; policy->cur =nforce2_get (policy->cpu); - policy->min = policy->cpuinfo.min_freq; - policy->max = policy->cpuinfo.max_freq;return 0 ; }
drivers/cpufreq/omap-cpufreq.c +1 -3
@@ -177,7 +177,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) goto fail_ck; } - policy->cur = policy->min = policy->max =omap_getspeed (policy->cpu); + policy->cur =omap_getspeed (policy->cpu);if (!freq_table) result =opp_init_cpufreq_table (mpu_dev, &freq_table);
@@ -196,8 +196,6 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)cpufreq_frequency_table_get_attr (freq_table, policy->cpu); - policy->min = policy->cpuinfo.min_freq; - policy->max = policy->cpuinfo.max_freq; policy->cur =omap_getspeed (policy->cpu);/*
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 9/9 cpufreq: ARM big LITTLE: Add generic cpufreq driver and its DT glue
In reply to Viresh Kumarbig LITTLE is ARM's new Architecture focussing power/performance needs of modern world. More information about big LITTLE can be found here:
http://www.arm.com/products/processors/technologies/biglittleprocessing.php
http://lwn.net/Articles/481055/
In order to keep cpufreq support for all big LITTLE platforms simple/generic, this patch tries to add a generic cpufreq driver layer for all big LITTLE platforms.
The driver is divided into two parts:
- Core driver: Generic and shared across all big LITTLE SoC's
- Glue drivers: Per platform drivers providing ops to the core driver
This patch adds in a generic glue driver which would extract information from Device Tree.
Future SoC's can either reuse the DT glue or write their own depending on the need.
--- .../bindings/cpufreq/arm_big_little_dt.txt | 65 +++++ MAINTAINERS | 11 + drivers/cpufreq/Kconfig.arm | 12 + drivers/cpufreq/Makefile | 5 + drivers/cpufreq/arm_big_little.c | 282 +++++++++++++++++++++ drivers/cpufreq/arm_big_little.h | 40 +++ drivers/cpufreq/arm_big_little_dt.c | 92 +++++++ 7 files changed, 507 insertions(+) create mode 100644 Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt create mode 100644 drivers/cpufreq/arm_big_little.c create mode 100644 drivers/cpufreq/arm_big_little.h create mode 100644 drivers/cpufreq/arm_big_little_dt.c
Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt new file +65 -0
@@ -0,0 +1,65 @@ +Generic ARM big LITTLE cpufreq driver's DT glue +----------------------------------------------- + +This is DT specific glue layer for generic cpufreq driver for big LITTLE +systems. + +Both required and optional properties listed below must be defined +under node /cpus/cpu@x. Where x is the first cpu inside a cluster. + +FIXME: Cpus should boot in the order specified in DT and all cpus for a cluster +must be present contiguously. Generic DT driver will check only node 'x' for +cpu:x. + +Required properties: +- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt + for details + +Optional properties: +- clock-latency: Specify the possible maximum transition latency for clock, + in unit of nanoseconds. + +Examples: + +cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + compatible = "arm,cortex-a15"; + reg = <0>; + next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 792000 1100000 + 396000 950000 + 198000 850000 + >; + clock-latency = <61036>; /* two CLK32 periods */ + }; + + cpu@1 { + compatible = "arm,cortex-a15"; + reg = <1>; + next-level-cache = <&L2>; + }; + + cpu@100 { + compatible = "arm,cortex-a7"; + reg = <100>; + next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 792000 950000 + 396000 750000 + 198000 450000 + >; + clock-latency = <61036>; /* two CLK32 periods */ + }; + + cpu@101 { + compatible = "arm,cortex-a7"; + reg = <101>; + next-level-cache = <&L2>; + }; +};
MAINTAINERS +11 -0
@@ -2206,6 +2206,17 @@ S: Maintained F: drivers/cpufreq/ F: include/linux/cpufreq.h +CPU FREQUENCY DRIVERS - ARM BIG LITTLE +M: Viresh Kumar <[email protected]> +M: Sudeep KarkadaNagesha <[email protected]> +L: [email protected] +L: [email protected] +W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php +S: Maintained +F: drivers/cpufreq/arm_big_little.h +F: drivers/cpufreq/arm_big_little.c +F: drivers/cpufreq/arm_big_little_dt.c + CPUID/MSR DRIVER M: "H. Peter Anvin" <[email protected]> S: Maintained
drivers/cpufreq/Kconfig.arm +12 -0
@@ -2,6 +2,18 @@ # ARM CPU Frequency scaling drivers # +config ARM_BIG_LITTLE_CPUFREQ + tristate + depends on ARM_CPU_TOPOLOGY + +config ARM_DT_BL_CPUFREQ + tristate "Generic ARM big LITTLE CPUfreq driver probed via DT" + select ARM_BIG_LITTLE_CPUFREQ + depends on OF && HAVE_CLK + help + This enables the Generic CPUfreq driver for ARM big.LITTLE platform. + This gets frequency tables from DT. + config ARM_OMAP2PLUS_CPUFREQ bool "TI OMAP2+" depends on ARCH_OMAP2PLUS
drivers/cpufreq/Makefile +5 -0
@@ -44,6 +44,11 @@ obj-$(CONFIG_X86_INTEL_PSTATE) += intel_pstate.o ################################################################################## # ARM SoC drivers +obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ) += arm_big_little.o +# big LITTLE per platform glues. Keep DT_BL_CPUFREQ as the last entry in all big +# LITTLE drivers, so that it is probed last. +obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o + obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o
drivers/cpufreq/arm_big_little.c new file +282 -0
282 lines not on this page · raw message
drivers/cpufreq/arm_big_little.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* ARM big.LITTLE platform's CPUFreq header file +* +* Copyright (C) 2013 ARM Ltd. +* Sudeep KarkadaNagesha <[email protected]> +* +* Copyright (C) 2013 Linaro. +* Viresh Kumar <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ +#ifndef CPUFREQ_ARM_BIG_LITTLE_H +#define CPUFREQ_ARM_BIG_LITTLE_H + +#include <linux/cpufreq.h> +#include <linux/device.h> +#include <linux/types.h> + +struct cpufreq_arm_bL_ops { +char name[CPUFREQ_NAME_LEN ]; +int (*get_transition_latency)(struct device *cpu_dev); + +/* +* This must set opp table for cpu_dev in a similar way as done by +* of_init_opp_table(). +*/ +int (*init_opp_table)(struct device *cpu_dev); +}; + +int bL_cpufreq_register (struct cpufreq_arm_bL_ops *ops); +void bL_cpufreq_unregister (struct cpufreq_arm_bL_ops *ops); + +#endif /* CPUFREQ_ARM_BIG_LITTLE_H */
drivers/cpufreq/arm_big_little_dt.c new file +92 -0
92 lines not on this page · raw message
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 6/9] cpufreq: Don't check if cpu is online/offline for cpufreq callbacks
In reply to Viresh KumarFrom: Viresh Kumar <[email protected]>
Date: Mon, 1 Apr 2013 18:27:46 +0530
Quoted 6 lines
cpufreq layer doesn't call cpufreq driver's callback for any offline cpu and so checking that isn't useful.
Lets get rid of it.
Signed-off-by Viresh Kumar <[email protected]>
For sparc bits:
Quoted 20 lines · Viresh Kumar
Hi Rafael,
These are fixes and updates that are sent and reviewed as separate patchsets earlier. They are all now combined as part of a single patchset for you to apply in your linux-next branch.
All have got reviews earlier and got fixups mailed and applied.
The remaining patches: "Move Cpufreq drivers to
drivers/cpufreq" are awaiting few more Acks before I send them to you.I wanted to have another patch as part of this patchset, but I am awaiting Ack for it:
tools: cpufreq: Fix cpufreq-info print messages for affected[related]_cpusThat can be applied separately once it receives an Ack.
Thanks
Viresh
Quoted 11 lines
Viresh Kumar (9):
cpufreq: cpu0: Fix mistake in Documentation example
cpufreq: Documentation: Fixcpufreq_frequency_tablename
cpufreq: cpufreq-cpu0: No need to check cpu number ininit()
cpufreq: cpufreq-cpu0: CallCPUFREQ_POSTCHANGEnotifier for failure
cases too
cpufreq: Notify allpolicy->cpusincpufreq_notify_transition()
cpufreq: Don't check if cpu is online/offline for cpufreq callbacks
cpufreq: drivers: don't check range of target freq in .target()
cpufreq: drivers: Remove unnecessary assignments of policy-> members
cpufreq: ARM big LITTLE: Add generic cpufreq driver and its DT glue
Thanks!
The [5/9] seems to be missing. Care to send?
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Quoted 1 line · Rafael J. Wysocki
The [5/9] seems to be missing. Care to send?
That shouldn't happen. I received it on my other email id which got it through LKML and you were in to field of that too..
Anyway, if you want i can resend it but don't really want to spam LKML with same patch again. So its attached for you.
--
viresh
From 83bb6100646c7fdfa3ade46430200f5a3593ae03 Mon Sep 17 00:00:00 2001
Message-Id: <83bb6100646c7fdfa3ade46430200f5a3593ae03.1364863316.git.viresh.kumar@linaro.org>
From: Viresh Kumar <[email protected]>
Date: Sun, 24 Mar 2013 11:56:43 +0530
Subject: [PATCH 5/9] cpufreq: Notify all policy->cpus in
cpufreq_notify_transition()
policy->cpus contains all online cpus that have single shared clock line. And their frequencies are always updated together.
Many SMP system's cpufreq drivers take care of this in individual drivers but the best place for this code is in cpufreq core.
This patch modifies cpufreq_notify_transition() to notify frequency change for all cpus in policy->cpus and hence updates all users of this API.
--- arch/arm/mach-davinci/cpufreq.c | 5 +- arch/arm/mach-imx/cpufreq.c | 5 +- arch/arm/mach-integrator/cpu.c | 6 +-- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 5 +- arch/arm/mach-pxa/cpufreq-pxa3xx.c | 5 +- arch/arm/mach-s3c24xx/cpufreq.c | 8 +-- arch/arm/mach-sa1100/cpu-sa1100.c | 5 +- arch/arm/mach-sa1100/cpu-sa1110.c | 5 +- arch/arm/mach-tegra/cpu-tegra.c | 15 +++--- arch/avr32/mach-at32ap/cpufreq.c | 5 +- arch/blackfin/mach-common/cpufreq.c | 79 ++++++++++++---------------- arch/cris/arch-v32/mach-a3/cpufreq.c | 20 +++---- arch/cris/arch-v32/mach-fs/cpufreq.c | 17 +++--- arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 22 ++++---- arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 5 +- arch/powerpc/platforms/cell/cbe_cpufreq.c | 5 +- arch/powerpc/platforms/pasemi/cpufreq.c | 5 +- arch/powerpc/platforms/powermac/cpufreq_32.c | 14 ++--- arch/powerpc/platforms/powermac/cpufreq_64.c | 5 +- arch/sh/kernel/cpufreq.c | 5 +- arch/sparc/kernel/us2e_cpufreq.c | 13 ++--- arch/sparc/kernel/us3_cpufreq.c | 13 ++--- arch/unicore32/kernel/cpu-ucv2.c | 5 +- drivers/cpufreq/acpi-cpufreq.c | 11 +--- drivers/cpufreq/cpufreq-cpu0.c | 12 ++--- drivers/cpufreq/cpufreq-nforce2.c | 5 +- drivers/cpufreq/cpufreq.c | 45 +++++++++------- drivers/cpufreq/dbx500-cpufreq.c | 6 +-- drivers/cpufreq/e_powersaver.c | 11 ++-- drivers/cpufreq/elanfreq.c | 10 ++-- drivers/cpufreq/exynos-cpufreq.c | 7 +-- drivers/cpufreq/gx-suspmod.c | 11 ++-- drivers/cpufreq/imx6q-cpufreq.c | 12 ++--- drivers/cpufreq/kirkwood-cpufreq.c | 10 ++-- drivers/cpufreq/longhaul.c | 18 ++++--- drivers/cpufreq/maple-cpufreq.c | 5 +- drivers/cpufreq/omap-cpufreq.c | 11 +--- drivers/cpufreq/p4-clockmod.c | 10 +--- drivers/cpufreq/pcc-cpufreq.c | 5 +- drivers/cpufreq/powernow-k6.c | 12 ++--- drivers/cpufreq/powernow-k7.c | 10 ++-- drivers/cpufreq/powernow-k8.c | 16 +++--- drivers/cpufreq/s3c2416-cpufreq.c | 5 +- drivers/cpufreq/s3c64xx-cpufreq.c | 7 ++- drivers/cpufreq/s5pv210-cpufreq.c | 5 +- drivers/cpufreq/sc520_freq.c | 10 ++-- drivers/cpufreq/spear-cpufreq.c | 7 +-- drivers/cpufreq/speedstep-centrino.c | 24 ++------- drivers/cpufreq/speedstep-ich.c | 12 +---- drivers/cpufreq/speedstep-smi.c | 5 +- include/linux/cpufreq.h | 4 +- 51 files changed, 238 insertions(+), 340 deletions(-)
arch/arm/mach-davinci/cpufreq.c +2 -3
@@ -90,7 +90,6 @@ static int davinci_target(struct cpufreq_policy *policy, freqs.old =davinci_getspeed (0 ); freqs.new =clk_round_rate (armclk, target_freq *1000 ) /1000 ; - freqs.cpu =0 ;if (freqs.old == freqs.new)return ret;
@@ -102,7 +101,7 @@ static int davinci_target(struct cpufreq_policy *policy,if (ret)return -EINVAL ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* if moving to higher frequency, up the voltage beforehand */ if (pdata->set_voltage && freqs.new > freqs.old) {
@@ -126,7 +125,7 @@ static int davinci_target(struct cpufreq_policy *policy, pdata->set_voltage (idx); out: -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
arch/arm/mach-imx/cpufreq.c +2 -3
@@ -87,13 +87,12 @@ static int mxc_set_target(struct cpufreq_policy *policy, freqs.old =clk_get_rate (cpu_clk) /1000 ; freqs.new = freq_Hz /1000 ; - freqs.cpu =0 ; freqs.flags =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); ret =set_cpu_freq (freq_Hz); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
arch/arm/mach-integrator/cpu.c +2 -4
@@ -123,14 +123,12 @@ static int integrator_set_target(struct cpufreq_policy *policy, vco =icst_hz_to_vco (&cclk_params, target_freq *1000 ); freqs.new =icst_hz (&cclk_params, vco) /1000 ; - freqs.cpu = policy->cpu; -if (freqs.old == freqs.new) {set_cpus_allowed (current, cpus_allowed);return 0 ; } -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); cm_osc =__raw_readl (CM_OSC );
@@ -151,7 +149,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,*/ set_cpus_allowed (current, cpus_allowed); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
arch/arm/mach-pxa/cpufreq-pxa2xx.c +2 -3
@@ -311,7 +311,6 @@ static int pxa_set_target(struct cpufreq_policy *policy, new_freq_mem = pxa_freq_settings[idx].membus; freqs.old = policy->cur; freqs.new = new_freq_cpu; - freqs.cpu = policy->cpu;if (freq_debug) pr_debug("Changing CPU frequency to %d Mhz, (SDRAM %d Mhz)\n",
@@ -327,7 +326,7 @@ static int pxa_set_target(struct cpufreq_policy *policy,* you should add a notify client with any platform specific * Vcc changing capability */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Calculate the next MDREFR. If we're slowing down the SDRAM clock * we need to preset the smaller DRI before the change. If we're
@@ -382,7 +381,7 @@ static int pxa_set_target(struct cpufreq_policy *policy,* you should add a notify client with any platform specific * SDRAM refresh timer adjustments */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );/* * Even if voltage setting fails, we don't report it, as the frequency
arch/arm/mach-pxa/cpufreq-pxa3xx.c +2 -3
@@ -184,7 +184,6 @@ static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy, freqs.old = policy->cur; freqs.new = next->cpufreq_mhz *1000 ; - freqs.cpu = policy->cpu; pr_debug("CPU frequency from %d MHz to %d MHz%s\n", freqs.old / 1000, freqs.new / 1000,
@@ -193,14 +192,14 @@ static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy,if (freqs.old == target_freq)return 0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );local_irq_save (flags);__update_core_freq (next);__update_bus_freq (next);local_irq_restore (flags); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
arch/arm/mach-s3c24xx/cpufreq.c +2 -6
@@ -204,7 +204,6 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy, freqs.old = cpu_cur.freq; freqs.new = cpu_new.freq; - freqs.freqs.cpu =0 ; freqs.freqs.old = cpu_cur.freq.armclk /1000 ; freqs.freqs.new = cpu_new.freq.armclk /1000 ;
@@ -218,9 +217,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,s3c_cpufreq_updateclk (clk_pclk, cpu_new.freq.pclk);/* start the frequency change */ - -if (policy) -cpufreq_notify_transition (&freqs.freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs.freqs,CPUFREQ_PRECHANGE );/* If hclk is staying the same, then we do not need to * re-write the IO or the refresh timings whilst we are changing
@@ -264,8 +261,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,local_irq_restore (flags);/* notify everyone we've done this */ -if (policy) -cpufreq_notify_transition (&freqs.freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs.freqs,CPUFREQ_POSTCHANGE );s3c_freq_dbg ("%s: finished\n" , __func__);return 0 ;
arch/arm/mach-sa1100/cpu-sa1100.c +2 -3
@@ -201,9 +201,8 @@ static int sa1100_target(struct cpufreq_policy *policy, freqs.old = cur; freqs.new =sa11x0_ppcr_to_freq (new_ppcr); - freqs.cpu =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (freqs.new > cur)sa1100_update_dram_timings (cur, freqs.new);
@@ -213,7 +212,7 @@ static int sa1100_target(struct cpufreq_policy *policy,if (freqs.new < cur)sa1100_update_dram_timings (cur, freqs.new); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
arch/arm/mach-sa1100/cpu-sa1110.c +2 -3
@@ -258,7 +258,6 @@ static int sa1110_target(struct cpufreq_policy *policy, freqs.old =sa11x0_getspeed (0 ); freqs.new =sa11x0_ppcr_to_freq (ppcr); - freqs.cpu =0 ;sdram_calculate_timing (&sd, freqs.new, sdram);
@@ -279,7 +278,7 @@ static int sa1110_target(struct cpufreq_policy *policy, sd.mdcas[2 ] =0xaaaaaaaa ;#endif -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* * The clock could be going away for some time. Set the SDRAMs
@@ -327,7 +326,7 @@ static int sa1110_target(struct cpufreq_policy *policy,*/ sdram_update_refresh (freqs.new, sdram); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
arch/arm/mach-tegra/cpu-tegra.c +8 -7
@@ -106,7 +106,8 @@ out:return ret; } -static int tegra_update_cpu_speed (unsigned long rate) +static int tegra_update_cpu_speed (struct cpufreq_policy *policy, +unsigned long rate) {int ret =0 ;struct cpufreq_freqs freqs;
@@ -128,8 +129,7 @@ static int tegra_update_cpu_speed(unsigned long rate)else clk_set_rate (emc_clk,100000000 );/* emc 50Mhz */ -for_each_online_cpu (freqs.cpu) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );#ifdef CONFIG_CPU_FREQ_DEBUG printk(KERN_DEBUG "cpufreq-tegra: transition: %u --> %u\n",
@@ -143,8 +143,7 @@ static int tegra_update_cpu_speed(unsigned long rate)return ret; } -for_each_online_cpu (freqs.cpu) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
@@ -181,7 +180,7 @@ static int tegra_target(struct cpufreq_policy *policy, target_cpu_speed[policy->cpu] = freq; - ret =tegra_update_cpu_speed (tegra_cpu_highest_speed ()); + ret =tegra_update_cpu_speed (policy,tegra_cpu_highest_speed ()); out:mutex_unlock (&tegra_cpu_lock);
@@ -193,10 +192,12 @@ static int tegra_pm_notify(struct notifier_block *nb, unsigned long event, {mutex_lock (&tegra_cpu_lock);if (event ==PM_SUSPEND_PREPARE ) { +struct cpufreq_policy *policy =cpufreq_cpu_get (0 ); 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); +tegra_update_cpu_speed (policy, freq_table[0 ].frequency); +cpufreq_cpu_put (policy); }else if (event ==PM_POST_SUSPEND ) { is_suspended = false; }
arch/avr32/mach-at32ap/cpufreq.c +2 -3
@@ -61,7 +61,6 @@ static int at32_set_target(struct cpufreq_policy *policy, freqs.old =at32_get_speed (0 ); freqs.new = (freq +500 ) /1000 ; - freqs.cpu =0 ; freqs.flags =0 ;if (!ref_freq) {
@@ -69,7 +68,7 @@ static int at32_set_target(struct cpufreq_policy *policy, loops_per_jiffy_ref = boot_cpu_data.loops_per_jiffy; } -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (freqs.old < freqs.new) boot_cpu_data.loops_per_jiffy =cpufreq_scale ( loops_per_jiffy_ref, ref_freq, freqs.new);
@@ -77,7 +76,7 @@ static int at32_set_target(struct cpufreq_policy *policy,if (freqs.new < freqs.old) boot_cpu_data.loops_per_jiffy =cpufreq_scale ( loops_per_jiffy_ref, ref_freq, freqs.new); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );pr_debug ("cpufreq: set frequency %lu Hz\n" , freq);
arch/blackfin/mach-common/cpufreq.c +34 -45
106 lines not on this page · raw message
arch/cris/arch-v32/mach-a3/cpufreq.c +7 -13
@@ -27,23 +27,17 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)return clk_ctrl.pll ?200000 :6000 ; } -static void cris_freq_set_cpu_state (unsigned int state) +static void cris_freq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int state) { -int i =0 ;struct cpufreq_freqs freqs;reg_clkgen_rw_clk_ctrl clk_ctrl; clk_ctrl =REG_RD (clkgen, regi_clkgen, rw_clk_ctrl); -#ifdef CONFIG_SMP - for_each_present_cpu(i) -#endif - { - freqs.old =cris_freq_get_cpu_frequency (i); - freqs.new = cris_freq_table[state].frequency; - freqs.cpu = i; - } + freqs.old =cris_freq_get_cpu_frequency (policy->cpu); + freqs.new = cris_freq_table[state].frequency; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );local_irq_disable ();
@@ -57,7 +51,7 @@ static void cris_freq_set_cpu_state(unsigned int state)local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };static int cris_freq_verify (struct cpufreq_policy *policy)
@@ -75,7 +69,7 @@ static int cris_freq_target(struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; -cris_freq_set_cpu_state (newstate); +cris_freq_set_cpu_state (policy, newstate);return 0 ; }
arch/cris/arch-v32/mach-fs/cpufreq.c +7 -10
@@ -27,20 +27,17 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)return clk_ctrl.pll ?200000 :6000 ; } -static void cris_freq_set_cpu_state (unsigned int state) +static void cris_freq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int state) { -int i;struct cpufreq_freqs freqs;reg_config_rw_clk_ctrl clk_ctrl; clk_ctrl =REG_RD (config, regi_config, rw_clk_ctrl); -for_each_possible_cpu (i) { - freqs.old =cris_freq_get_cpu_frequency (i); - freqs.new = cris_freq_table[state].frequency; - freqs.cpu = i; - } + freqs.old =cris_freq_get_cpu_frequency (policy->cpu); + freqs.new = cris_freq_table[state].frequency; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );local_irq_disable ();
@@ -54,7 +51,7 @@ static void cris_freq_set_cpu_state(unsigned int state)local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };static int cris_freq_verify (struct cpufreq_policy *policy)
@@ -71,7 +68,7 @@ static int cris_freq_target(struct cpufreq_policy *policy, (policy, cris_freq_table, target_freq, relation, &newstate)) return -EINVAL; -cris_freq_set_cpu_state (newstate); +cris_freq_set_cpu_state (policy, newstate);return 0 ; }
arch/ia64/kernel/cpufreq/acpi-cpufreq.c +12 -10
@@ -137,7 +137,7 @@ migrate_end:static int processor_set_freq (struct cpufreq_acpi_io *data, -unsigned int cpu, +struct cpufreq_policy *policy,int state) {int ret =0 ;
@@ -149,8 +149,8 @@ processor_set_freq (pr_debug ("processor_set_freq\n" ); saved_mask = current->cpus_allowed; -set_cpus_allowed_ptr (current,cpumask_of (cpu)); -if (smp_processor_id () != cpu) { +set_cpus_allowed_ptr (current,cpumask_of (policy->cpu)); +if (smp_processor_id () != policy->cpu) { retval = -EAGAIN ; goto migrate_end; }
@@ -170,12 +170,11 @@ processor_set_freq ( data->acpi_data.state, state);/* cpufreq frequency struct */ - cpufreq_freqs.cpu = cpu; cpufreq_freqs.old = data->freq_table[data->acpi_data.state].frequency; cpufreq_freqs.new = data->freq_table[state].frequency;/* notify cpufreq */ -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs,CPUFREQ_PRECHANGE );/* * First we write the target state's 'control' value to the
@@ -189,17 +188,20 @@ processor_set_freq ( ret =processor_set_pstate (value);if (ret) {unsigned int tmp = cpufreq_freqs.new; -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs, +CPUFREQ_POSTCHANGE ); cpufreq_freqs.new = cpufreq_freqs.old; cpufreq_freqs.old = tmp; -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_PRECHANGE ); -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs, +CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs, +CPUFREQ_POSTCHANGE );printk (KERN_WARNING "Transition failed with error %d\n" , ret); retval = -ENODEV ; goto migrate_end; } -cpufreq_notify_transition (&cpufreq_freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &cpufreq_freqs,CPUFREQ_POSTCHANGE ); data->acpi_data.state = state;
@@ -240,7 +242,7 @@ acpi_cpufreq_target (if (result)return (result); - result =processor_set_freq (data, policy->cpu, next_state); + result =processor_set_freq (data, policy, next_state);return (result); }
arch/mips/kernel/cpufreq/loongson2_cpufreq.c +2 -3
@@ -80,7 +80,6 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,pr_debug ("cpufreq: requested frequency %u Hz\n" , target_freq *1000 ); - freqs.cpu = cpu; freqs.old =loongson2_cpufreq_get (cpu); freqs.new = freq; freqs.flags =0 ;
@@ -89,7 +88,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,return 0 ;/* notifiers */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );set_cpus_allowed_ptr (current, &cpus_allowed);
@@ -97,7 +96,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,clk_set_rate (cpuclk, freq);/* notifiers */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );pr_debug ("cpufreq: set frequency %u kHz\n" , freq);
arch/powerpc/platforms/cell/cbe_cpufreq.c +2 -3
@@ -156,10 +156,9 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy, freqs.old = policy->cur; freqs.new = cbe_freqs[cbe_pmode_new].frequency; - freqs.cpu = policy->cpu;mutex_lock (&cbe_switch_mutex); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); pr_debug("setting frequency for cpu %d to %d kHz, " \ "1/%d of max frequency\n",
@@ -169,7 +168,7 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy, rc =set_pmode (policy->cpu, cbe_pmode_new); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&cbe_switch_mutex);return rc;
arch/powerpc/platforms/pasemi/cpufreq.c +2 -3
@@ -273,10 +273,9 @@ static int pas_cpufreq_target(struct cpufreq_policy *policy, freqs.old = policy->cur; freqs.new = pas_freqs[pas_astate_new].frequency; - freqs.cpu = policy->cpu;mutex_lock (&pas_switch_mutex); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); pr_debug("setting frequency for cpu %d to %d kHz, 1/%d of max frequency\n", policy->cpu,
@@ -288,7 +287,7 @@ static int pas_cpufreq_target(struct cpufreq_policy *policy,for_each_online_cpu (i)set_astate (i, pas_astate_new); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&pas_switch_mutex); ppc_proc_freq = freqs.new *1000ul ;
arch/powerpc/platforms/powermac/cpufreq_32.c +7 -7
@@ -335,7 +335,8 @@ static int pmu_set_cpu_speed(int low_speed)return 0 ; } -static int do_set_cpu_speed (int speed_mode,int notify) +static int do_set_cpu_speed (struct cpufreq_policy *policy,int speed_mode, +int notify) {struct cpufreq_freqs freqs;unsigned long l3cr;
@@ -343,13 +344,12 @@ static int do_set_cpu_speed(int speed_mode, int notify) freqs.old = cur_freq; freqs.new = (speed_mode ==CPUFREQ_HIGH ) ? hi_freq : low_freq; - freqs.cpu =smp_processor_id ();if (freqs.old == freqs.new)return 0 ;if (notify) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (speed_mode ==CPUFREQ_LOW &&cpu_has_feature (CPU_FTR_L3CR )) { l3cr =_get_L3CR ();
@@ -366,7 +366,7 @@ static int do_set_cpu_speed(int speed_mode, int notify)_set_L3CR (prev_l3cr); }if (notify) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); cur_freq = (speed_mode ==CPUFREQ_HIGH ) ? hi_freq : low_freq;return 0 ;
@@ -393,7 +393,7 @@ static int pmac_cpufreq_target( struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; - rc =do_set_cpu_speed (newstate,1 ); + rc =do_set_cpu_speed (policy, newstate,1 ); ppc_proc_freq = cur_freq *1000ul ;return rc;
@@ -442,7 +442,7 @@ static int pmac_cpufreq_suspend(struct cpufreq_policy *policy) no_schedule =1 ; sleep_freq = cur_freq;if (cur_freq == low_freq && !is_pmu_based) -do_set_cpu_speed (CPUFREQ_HIGH ,0 ); +do_set_cpu_speed (policy,CPUFREQ_HIGH ,0 );return 0 ; }
@@ -458,7 +458,7 @@ static int pmac_cpufreq_resume(struct cpufreq_policy *policy)* is that we force a switch to whatever it was, which is * probably high speed due to our suspend() routine */ -do_set_cpu_speed (sleep_freq == low_freq ? +do_set_cpu_speed (policy, sleep_freq == low_freq ?CPUFREQ_LOW :CPUFREQ_HIGH ,0 ); ppc_proc_freq = cur_freq *1000ul ;
arch/powerpc/platforms/powermac/cpufreq_64.c +2 -3
@@ -339,11 +339,10 @@ static int g5_cpufreq_target(struct cpufreq_policy *policy, freqs.old = g5_cpu_freqs[g5_pmode_cur].frequency; freqs.new = g5_cpu_freqs[newstate].frequency; - freqs.cpu =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); rc =g5_switch_freq (newstate); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&g5_switch_mutex);
arch/sh/kernel/cpufreq.c +2 -3
@@ -69,15 +69,14 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy,dev_dbg (dev,"requested frequency %u Hz\n" , target_freq *1000 ); - freqs.cpu = cpu; freqs.old =sh_cpufreq_get (cpu); freqs.new = (freq +500 ) /1000 ; freqs.flags =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );set_cpus_allowed_ptr (current, &cpus_allowed);clk_set_rate (cpuclk, freq); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );dev_dbg (dev,"set frequency %lu Hz\n" , freq);
arch/sparc/kernel/us2e_cpufreq.c +7 -6
@@ -248,8 +248,10 @@ static unsigned int us2e_freq_get(unsigned int cpu)return clock_tick /estar_to_divisor (estar); } -static void us2e_set_cpu_divider_index (unsigned int cpu,unsigned int index) +static void us2e_set_cpu_divider_index (struct cpufreq_policy *policy, +unsigned int index) { +unsigned int cpu = policy->cpu;unsigned long new_bits, new_freq;unsigned long clock_tick, divisor, old_divisor, estar;cpumask_t cpus_allowed;
@@ -272,14 +274,13 @@ static void us2e_set_cpu_divider_index(unsigned int cpu, unsigned int index) freqs.old = clock_tick / old_divisor; freqs.new = new_freq; - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (old_divisor != divisor)us2e_transition (estar, new_bits, clock_tick *1000 , old_divisor, divisor); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );set_cpus_allowed_ptr (current, &cpus_allowed); }
@@ -295,7 +296,7 @@ static int us2e_freq_target(struct cpufreq_policy *policy, target_freq, relation, &new_index))return -EINVAL ; -us2e_set_cpu_divider_index (policy->cpu, new_index); +us2e_set_cpu_divider_index (policy, new_index);return 0 ; }
@@ -335,7 +336,7 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)static int us2e_freq_cpu_exit (struct cpufreq_policy *policy) {if (cpufreq_us2e_driver) -us2e_set_cpu_divider_index (policy->cpu,0 ); +us2e_set_cpu_divider_index (policy,0 );return 0 ; }
arch/sparc/kernel/us3_cpufreq.c +7 -6
@@ -96,8 +96,10 @@ static unsigned int us3_freq_get(unsigned int cpu)return ret; } -static void us3_set_cpu_divider_index (unsigned int cpu,unsigned int index) +static void us3_set_cpu_divider_index (struct cpufreq_policy *policy, +unsigned int index) { +unsigned int cpu = policy->cpu;unsigned long new_bits, new_freq, reg;cpumask_t cpus_allowed;struct cpufreq_freqs freqs;
@@ -131,14 +133,13 @@ static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index) freqs.old =get_current_freq (cpu, reg); freqs.new = new_freq; - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); reg &= ~SAFARI_CFG_DIV_MASK ; reg |= new_bits;write_safari_cfg (reg); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );set_cpus_allowed_ptr (current, &cpus_allowed); }
@@ -156,7 +157,7 @@ static int us3_freq_target(struct cpufreq_policy *policy, &new_index))return -EINVAL ; -us3_set_cpu_divider_index (policy->cpu, new_index); +us3_set_cpu_divider_index (policy, new_index);return 0 ; }
@@ -192,7 +193,7 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)static int us3_freq_cpu_exit (struct cpufreq_policy *policy) {if (cpufreq_us3_driver) -us3_set_cpu_divider_index (policy->cpu,0 ); +us3_set_cpu_divider_index (policy,0 );return 0 ; }
arch/unicore32/kernel/cpu-ucv2.c +2 -3
@@ -52,15 +52,14 @@ static int ucv2_target(struct cpufreq_policy *policy,struct cpufreq_freqs freqs;struct clk *mclk =clk_get (NULL ,"MAIN_CLK" ); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (!clk_set_rate (mclk, target_freq *1000 )) { freqs.old = cur; freqs.new = target_freq; - freqs.cpu =0 ; } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/acpi-cpufreq.c +2 -9
@@ -423,7 +423,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,struct drv_cmd cmd;unsigned int next_state =0 ;/* Index into freq_table */ unsigned int next_perf_state =0 ;/* Index into perf table */ -unsigned int i;int result =0 ;pr_debug ("acpi_cpufreq_target %d (%d)\n" , target_freq, policy->cpu);
@@ -486,10 +485,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, freqs.old = perf->states[perf->state].core_frequency *1000 ; freqs.new = data->freq_table[next_state].frequency; -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );drv_write (&cmd);
@@ -502,10 +498,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, } } -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); perf->state = next_perf_state; out:
drivers/cpufreq/cpufreq-cpu0.c +3 -9
@@ -46,7 +46,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy,struct opp *opp;unsigned long volt =0 , volt_old =0 , tol =0 ;long freq_Hz; -unsigned int index, cpu; +unsigned int index;int ret; ret = cpufreq_frequency_table_target(policy, freq_table, target_freq,
@@ -66,10 +66,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy,if (freqs.old == freqs.new)return 0 ; -for_each_online_cpu (cpu) { - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (cpu_reg) {rcu_read_lock ();
@@ -121,10 +118,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy, } post_notify: -for_each_online_cpu (cpu) { - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
drivers/cpufreq/cpufreq-nforce2.c +2 -3
@@ -263,7 +263,6 @@ static int nforce2_target(struct cpufreq_policy *policy, freqs.old =nforce2_get (policy->cpu); freqs.new = target_fsb * fid *100 ; - freqs.cpu =0 ;/* Only one CPU on nForce2 platforms */ if (freqs.old == freqs.new)return 0 ;
@@ -271,7 +270,7 @@ static int nforce2_target(struct cpufreq_policy *policy,pr_debug ("Old CPU frequency %d kHz, new %d kHz\n" , freqs.old, freqs.new); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Disable IRQs */ /* local_irq_save(flags); */
@@ -286,7 +285,7 @@ static int nforce2_target(struct cpufreq_policy *policy,/* Enable IRQs */ /* local_irq_restore(flags); */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/cpufreq.c +26 -19
77 lines not on this page · raw message
drivers/cpufreq/dbx500-cpufreq.c +2 -4
@@ -55,8 +55,7 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,return 0 ;/* pre-change notification */ -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* update armss clk frequency */ ret =clk_set_rate (armss_clk, freqs.new *1000 );
@@ -68,8 +67,7 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy, }/* post change notification */ -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/e_powersaver.c +5 -6
@@ -104,7 +104,7 @@ static unsigned int eps_get(unsigned int cpu) }static int eps_set_state (struct eps_cpu_data *centaur, -unsigned int cpu, +struct cpufreq_policy *policy,u32 dest_state) {struct cpufreq_freqs freqs;
@@ -112,10 +112,9 @@ static int eps_set_state(struct eps_cpu_data *centaur,int err =0 ;int i; - freqs.old =eps_get (cpu); + freqs.old =eps_get (policy->cpu); freqs.new = centaur->fsb * ((dest_state >>8 ) &0xff ); - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Wait while CPU is busy */ rdmsr (MSR_IA32_PERF_STATUS , lo, hi);
@@ -162,7 +161,7 @@ postchange: current_multiplier); }#endif -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return err; }
@@ -190,7 +189,7 @@ static int eps_target(struct cpufreq_policy *policy,/* Make frequency transition */ dest_state = centaur->freq_table[newstate].index &0xffff ; - ret =eps_set_state (centaur, cpu, dest_state); + ret =eps_set_state (centaur, policy, dest_state);if (ret)printk (KERN_ERR "eps: Timeout!\n" );return ret;
drivers/cpufreq/elanfreq.c +5 -5
@@ -117,15 +117,15 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)* There is no return value. */ -static void elanfreq_set_cpu_state (unsigned int state) +static void elanfreq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int state) {struct cpufreq_freqs freqs; freqs.old =elanfreq_get_cpu_frequency (0 ); freqs.new = elan_multiplier[state].clock; - freqs.cpu =0 ;/* elanfreq.c is UP only driver */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );printk (KERN_INFO "elanfreq: attempting to set frequency to %i kHz\n" , elan_multiplier[state].clock);
@@ -161,7 +161,7 @@ static void elanfreq_set_cpu_state(unsigned int state)udelay (10000 );local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };
@@ -188,7 +188,7 @@ static int elanfreq_target(struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; -elanfreq_set_cpu_state (newstate); +elanfreq_set_cpu_state (policy, newstate);return 0 ; }
drivers/cpufreq/exynos-cpufreq.c +2 -5
@@ -70,7 +70,6 @@ static int exynos_cpufreq_scale(unsigned int target_freq) freqs.old = policy->cur; freqs.new = target_freq; - freqs.cpu = policy->cpu;if (freqs.new == freqs.old) goto out;
@@ -105,8 +104,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq) } arm_volt = volt_table[index]; -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* When the new frequency is higher than current frequency */ if ((freqs.new > freqs.old) && !safe_arm_volt) {
@@ -131,8 +129,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq) exynos_info->set_freq (old_index, index); -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );/* When the new frequency is lower than current frequency */ if ((freqs.new < freqs.old) ||
drivers/cpufreq/gx-suspmod.c +4 -7
@@ -251,14 +251,13 @@ static unsigned int gx_validate_speed(unsigned int khz, u8 *on_duration,* set cpu speed in khz. **/ -static void gx_set_cpuspeed (unsigned int khz) +static void gx_set_cpuspeed (struct cpufreq_policy *policy,unsigned int khz) {u8 suscfg, pmer1;unsigned int new_khz;unsigned long flags;struct cpufreq_freqs freqs; - freqs.cpu =0 ; freqs.old =gx_get_cpuspeed (0 ); new_khz = gx_validate_speed(khz, &gx_params->on_duration,
@@ -266,11 +265,9 @@ static void gx_set_cpuspeed(unsigned int khz) freqs.new = new_khz; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );local_irq_save (flags); - -if (new_khz != stock_freq) {/* if new khz == 100% of CPU speed, it is special case */ switch (gx_params->cs55x0->device) {
@@ -317,7 +314,7 @@ static void gx_set_cpuspeed(unsigned int khz) gx_params->pci_suscfg = suscfg; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );pr_debug ("suspend modulation w/ duration of ON:%d us, OFF:%d us\n" , gx_params->on_duration *32 , gx_params->off_duration *32 );
@@ -397,7 +394,7 @@ static int cpufreq_gx_target(struct cpufreq_policy *policy, tmp_freq =gx_validate_speed (tmp_freq, &tmp1, &tmp2); } -gx_set_cpuspeed (tmp_freq); +gx_set_cpuspeed (policy, tmp_freq);return 0 ; }
drivers/cpufreq/imx6q-cpufreq.c +3 -9
@@ -50,7 +50,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,struct cpufreq_freqs freqs;struct opp *opp;unsigned long freq_hz, volt, volt_old; -unsigned int index, cpu; +unsigned int index;int ret; ret = cpufreq_frequency_table_target(policy, freq_table, target_freq,
@@ -68,10 +68,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,if (freqs.old == freqs.new)return 0 ; -for_each_online_cpu (cpu) { - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );rcu_read_lock (); opp =opp_find_freq_ceil (cpu_dev, &freq_hz);
@@ -166,10 +163,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy, } } -for_each_online_cpu (cpu) { - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/kirkwood-cpufreq.c +5 -5
@@ -55,7 +55,8 @@ static unsigned int kirkwood_cpufreq_get_cpu_frequency(unsigned int cpu)return kirkwood_freq_table[0 ].frequency; } -static void kirkwood_cpufreq_set_cpu_state (unsigned int index) +static void kirkwood_cpufreq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int index) {struct cpufreq_freqs freqs;unsigned int state = kirkwood_freq_table[index].index;
@@ -63,9 +64,8 @@ static void kirkwood_cpufreq_set_cpu_state(unsigned int index) freqs.old =kirkwood_cpufreq_get_cpu_frequency (0 ); freqs.new = kirkwood_freq_table[index].frequency; - freqs.cpu =0 ;/* Kirkwood is UP */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );dev_dbg (priv.dev,"Attempting to set frequency to %i KHz\n" , kirkwood_freq_table[index].frequency);
@@ -99,7 +99,7 @@ static void kirkwood_cpufreq_set_cpu_state(unsigned int index)local_irq_enable (); } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };static int kirkwood_cpufreq_verify (struct cpufreq_policy *policy)
@@ -117,7 +117,7 @@ static int kirkwood_cpufreq_target(struct cpufreq_policy *policy, target_freq, relation, &index))return -EINVAL ; -kirkwood_cpufreq_set_cpu_state (index); +kirkwood_cpufreq_set_cpu_state (policy, index);return 0 ; }
drivers/cpufreq/longhaul.c +10 -8
@@ -242,7 +242,8 @@ static void do_powersaver(int cx_address, unsigned int mults_index,* Sets a new clock ratio. */ -static void longhaul_setstate (unsigned int table_index) +static void longhaul_setstate (struct cpufreq_policy *policy, +unsigned int table_index) {unsigned int mults_index;int speed, mult;
@@ -267,9 +268,8 @@ static void longhaul_setstate(unsigned int table_index) freqs.old =calc_speed (longhaul_get_cpu_mult ()); freqs.new = speed; - freqs.cpu =0 ;/* longhaul.c is UP only driver */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );pr_debug ("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n" , fsb, mult/10 , mult%10 ,print_speed (speed/1000 ));
@@ -386,7 +386,7 @@ retry_loop: } }/* Report true CPU frequency */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );if (!bm_timeout) printk(KERN_INFO PFX "Warning: Timeout while waiting for "
@@ -648,7 +648,7 @@ static int longhaul_target(struct cpufreq_policy *policy,return 0 ;if (!can_scale_voltage) -longhaul_setstate (table_index); +longhaul_setstate (policy, table_index);else {/* On test system voltage transitions exceeding single * step up or down were turning motherboard off. Both
@@ -663,7 +663,7 @@ static int longhaul_target(struct cpufreq_policy *policy,while (i != table_index) { vid = (longhaul_table[i].index >>8 ) &0x1f ;if (vid != current_vid) { -longhaul_setstate (i); +longhaul_setstate (policy, i); current_vid = vid;msleep (200 ); }
@@ -672,7 +672,7 @@ static int longhaul_target(struct cpufreq_policy *policy,else i--; } -longhaul_setstate (table_index); +longhaul_setstate (policy, table_index); } longhaul_index = table_index;return 0 ;
@@ -998,15 +998,17 @@ static int __init longhaul_init(void) static void __exit longhaul_exit(void) { +struct cpufreq_policy *policy =cpufreq_cpu_get (0 );int i;for (i =0 ; i < numscales; i++) {if (mults[i] == maxmult) { -longhaul_setstate (i); +longhaul_setstate (policy, i);break ; } } +cpufreq_cpu_put (policy);cpufreq_unregister_driver (&longhaul_driver);kfree (longhaul_table); }
drivers/cpufreq/maple-cpufreq.c +2 -3
@@ -158,11 +158,10 @@ static int maple_cpufreq_target(struct cpufreq_policy *policy, freqs.old = maple_cpu_freqs[maple_pmode_cur].frequency; freqs.new = maple_cpu_freqs[newstate].frequency; - freqs.cpu =0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); rc =maple_scom_switch_freq (newstate); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&maple_switch_mutex);
drivers/cpufreq/omap-cpufreq.c +2 -9
@@ -88,16 +88,12 @@ static int omap_target(struct cpufreq_policy *policy, } freqs.old =omap_getspeed (policy->cpu); - freqs.cpu = policy->cpu;if (freqs.old == freqs.new && policy->cur == freqs.new)return ret;/* notifiers */ -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); freq = freqs.new *1000 ; ret =clk_round_rate (mpu_clk, freq);
@@ -157,10 +153,7 @@ static int omap_target(struct cpufreq_policy *policy, done:/* notifiers */ -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
drivers/cpufreq/p4-clockmod.c +2 -8
@@ -125,10 +125,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,return 0 ;/* notifiers */ -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* run on each logical CPU, * see section 13.15.3 of IA32 Intel Architecture Software
@@ -138,10 +135,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,cpufreq_p4_setdc (i, p4clockmod_table[newstate].index);/* notifiers */ -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/pcc-cpufreq.c +2 -3
@@ -215,8 +215,7 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy, (pcch_virt_addr + pcc_cpu_data->input_offset)); freqs.new = target_freq; - freqs.cpu = cpu; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); input_buffer =0x1 | (((target_freq *100 ) / (ioread32 (&pcch_hdr->nominal) *1000 )) <<8 );
@@ -237,7 +236,7 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy, }iowrite16 (0 , &pcch_hdr->status); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );pr_debug ("target: was SUCCESSFUL for cpu %d\n" , cpu);spin_unlock (&pcc_lock);
drivers/cpufreq/powernow-k6.c +6 -6
@@ -68,7 +68,8 @@ static int powernow_k6_get_cpu_multiplier(void)* * Tries to change the PowerNow! multiplier */ -static void powernow_k6_set_state (unsigned int best_i) +static void powernow_k6_set_state (struct cpufreq_policy *policy, +unsigned int best_i) {unsigned long outvalue =0 , invalue =0 ;unsigned long msrval;
@@ -81,9 +82,8 @@ static void powernow_k6_set_state(unsigned int best_i) freqs.old = busfreq *powernow_k6_get_cpu_multiplier (); freqs.new = busfreq * clock_ratio[best_i].index; - freqs.cpu =0 ;/* powernow-k6.c is UP only driver */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* we now need to transform best_i to the BVC format, see AMD#23446 */
@@ -98,7 +98,7 @@ static void powernow_k6_set_state(unsigned int best_i) msrval =POWERNOW_IOPORT +0x0 ;wrmsr (MSR_K6_EPMR , msrval,0 );/* disable it again */ -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ; }
@@ -136,7 +136,7 @@ static int powernow_k6_target(struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; -powernow_k6_set_state (newstate); +powernow_k6_set_state (policy, newstate);return 0 ; }
@@ -182,7 +182,7 @@ static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)unsigned int i;for (i =0 ; i <8 ; i++) {if (i == max_multiplier) -powernow_k6_set_state (i); +powernow_k6_set_state (policy, i); }cpufreq_frequency_table_put_attr (policy->cpu);return 0 ;
drivers/cpufreq/powernow-k7.c +4 -6
@@ -248,7 +248,7 @@ static void change_VID(int vid) } -static void change_speed (unsigned int index) +static void change_speed (struct cpufreq_policy *policy,unsigned int index) {u8 fid, vid;struct cpufreq_freqs freqs;
@@ -263,15 +263,13 @@ static void change_speed(unsigned int index) fid = powernow_table[index].index &0xFF ; vid = (powernow_table[index].index &0xFF00 ) >>8 ; - freqs.cpu =0 ; -rdmsrl (MSR_K7_FID_VID_STATUS , fidvidstatus.val); cfid = fidvidstatus.bits.CFID; freqs.old = fsb * fid_codes[cfid] /10 ; freqs.new = powernow_table[index].frequency; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Now do the magic poking into the MSRs. */
@@ -292,7 +290,7 @@ static void change_speed(unsigned int index)if (have_a0 ==1 )local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); }
@@ -546,7 +544,7 @@ static int powernow_target(struct cpufreq_policy *policy, relation, &newstate))return -EINVAL ; -change_speed (newstate); +change_speed (policy, newstate);return 0 ; }
drivers/cpufreq/powernow-k8.c +7 -9
@@ -928,9 +928,10 @@ static int get_transition_latency(struct powernow_k8_data *data)static int transition_frequency_fidvid (struct powernow_k8_data *data,unsigned int index) { +struct cpufreq_policy *policy;u32 fid =0 ;u32 vid =0 ; -int res, i; +int res;struct cpufreq_freqs freqs;pr_debug ("cpu %d transition to index %u\n" ,smp_processor_id (), index);
@@ -959,10 +960,10 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data, freqs.old =find_khz_freq_from_fid (data->currfid); freqs.new =find_khz_freq_from_fid (fid); -for_each_cpu (i, data->available_cores) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } + policy =cpufreq_cpu_get (smp_processor_id ()); +cpufreq_cpu_put (policy); + +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); res =transition_fid_vid (data, fid, vid);if (res)
@@ -970,10 +971,7 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data, freqs.new =find_khz_freq_from_fid (data->currfid); -for_each_cpu (i, data->available_cores) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return res; }
drivers/cpufreq/s3c2416-cpufreq.c +2 -3
@@ -256,7 +256,6 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy, goto out; } - freqs.cpu =0 ; freqs.flags =0 ; freqs.old = s3c_freq->is_dvs ?FREQ_DVS :clk_get_rate (s3c_freq->armclk) /1000 ;
@@ -274,7 +273,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy,if (!to_dvs && freqs.old == freqs.new) goto out; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (to_dvs) {pr_debug ("cpufreq: enter dvs\n" );
@@ -287,7 +286,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy, ret =s3c2416_cpufreq_set_armdiv (s3c_freq, freqs.new); } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); out:mutex_unlock (&cpufreq_lock);
drivers/cpufreq/s3c64xx-cpufreq.c +3 -4
@@ -84,7 +84,6 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,if (ret !=0 )return ret; - freqs.cpu =0 ; freqs.old =clk_get_rate (armclk) /1000 ; freqs.new = s3c64xx_freq_table[i].frequency; freqs.flags =0 ;
@@ -95,7 +94,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,pr_debug ("Transition %d-%dkHz\n" , freqs.old, freqs.new); -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );#ifdef CONFIG_REGULATOR if (vddarm && freqs.new > freqs.old) {
@@ -117,7 +116,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy, goto err; } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );#ifdef CONFIG_REGULATOR if (vddarm && freqs.new < freqs.old) {
@@ -141,7 +140,7 @@ err_clk:if (clk_set_rate (armclk, freqs.old *1000 ) <0 )pr_err ("Failed to restore original clock rate\n" ); err: -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
drivers/cpufreq/s5pv210-cpufreq.c +2 -3
@@ -229,7 +229,6 @@ static int s5pv210_target(struct cpufreq_policy *policy, } freqs.new = s5pv210_freq_table[index].frequency; - freqs.cpu =0 ;if (freqs.new == freqs.old) goto exit;
@@ -256,7 +255,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, goto exit; } -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Check if there need to change PLL */ if ((index ==L0 ) || (priv_index ==L0 ))
@@ -468,7 +467,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, } } -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );if (freqs.new < freqs.old) { regulator_set_voltage(int_regulator,
drivers/cpufreq/sc520_freq.c +5 -5
@@ -53,7 +53,8 @@ static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu) } } -static void sc520_freq_set_cpu_state (unsigned int state) +static void sc520_freq_set_cpu_state (struct cpufreq_policy *policy, +unsigned int state) {struct cpufreq_freqs freqs;
@@ -61,9 +62,8 @@ static void sc520_freq_set_cpu_state(unsigned int state) freqs.old =sc520_freq_get_cpu_frequency (0 ); freqs.new = sc520_freq_table[state].frequency; - freqs.cpu =0 ;/* AMD Elan is UP */ -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );pr_debug ("attempting to set frequency to %i kHz\n" , sc520_freq_table[state].frequency);
@@ -75,7 +75,7 @@ static void sc520_freq_set_cpu_state(unsigned int state)local_irq_enable (); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); };static int sc520_freq_verify (struct cpufreq_policy *policy)
@@ -93,7 +93,7 @@ static int sc520_freq_target(struct cpufreq_policy *policy, target_freq, relation, &newstate))return -EINVAL ; -sc520_freq_set_cpu_state (newstate); +sc520_freq_set_cpu_state (policy, newstate);return 0 ; }
drivers/cpufreq/spear-cpufreq.c +2 -5
@@ -121,7 +121,6 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, target_freq, relation, &index))return -EINVAL ; - freqs.cpu = policy->cpu; freqs.old =spear_cpufreq_get (0 ); newfreq = spear_cpufreq.freq_tbl[index].frequency *1000 ;
@@ -158,8 +157,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, freqs.new = newfreq /1000 ; freqs.new /= mult; -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (mult ==2 ) ret =spear1340_set_cpu_rate (srcclk, newfreq);
@@ -172,8 +170,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, freqs.new =clk_get_rate (spear_cpufreq.clk) /1000 ; } -for_each_cpu (freqs.cpu, policy->cpus) -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return ret; }
drivers/cpufreq/speedstep-centrino.c +5 -19
@@ -457,7 +457,7 @@ static int centrino_target (struct cpufreq_policy *policy,unsigned int msr, oldmsr =0 , h =0 , cpu = policy->cpu;struct cpufreq_freqs freqs;int retval =0 ; -unsigned int j, k, first_cpu, tmp; +unsigned int j, first_cpu, tmp;cpumask_var_t covered_cpus;if (unlikely (!zalloc_cpumask_var (&covered_cpus,GFP_KERNEL )))
@@ -522,13 +522,8 @@ static int centrino_target (struct cpufreq_policy *policy,pr_debug ("target=%dkHz old=%d new=%d msr=%04x\n" , target_freq, freqs.old, freqs.new, msr); -for_each_cpu (k, policy->cpus) { -if (!cpu_online (k)) -continue ; - freqs.cpu = k; -cpufreq_notify_transition (&freqs, +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); - } first_cpu =0 ;/* all but 16 LSB are reserved, treat them with care */
@@ -544,12 +539,7 @@ static int centrino_target (struct cpufreq_policy *policy,cpumask_set_cpu (j, covered_cpus); } -for_each_cpu (k, policy->cpus) { -if (!cpu_online (k)) -continue ; - freqs.cpu = k; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );if (unlikely (retval)) {/*
@@ -565,12 +555,8 @@ static int centrino_target (struct cpufreq_policy *policy, tmp = freqs.new; freqs.new = freqs.old; freqs.old = tmp; -for_each_cpu (j, policy->cpus) { -if (!cpu_online (j)) -continue ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); } retval =0 ;
drivers/cpufreq/speedstep-ich.c +2 -10
@@ -263,7 +263,6 @@ static int speedstep_target(struct cpufreq_policy *policy, {unsigned int newstate =0 , policy_cpu;struct cpufreq_freqs freqs; -int i;if (cpufreq_frequency_table_target (policy, &speedstep_freqs[0 ], target_freq, relation, &newstate))
@@ -272,7 +271,6 @@ static int speedstep_target(struct cpufreq_policy *policy, policy_cpu =cpumask_any_and (policy->cpus, cpu_online_mask); freqs.old =speedstep_get (policy_cpu); freqs.new = speedstep_freqs[newstate].frequency; - freqs.cpu = policy->cpu;pr_debug ("transiting from %u to %u kHz\n" , freqs.old, freqs.new);
@@ -280,18 +278,12 @@ static int speedstep_target(struct cpufreq_policy *policy,if (freqs.old == freqs.new)return 0 ; -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );smp_call_function_single (policy_cpu, _speedstep_set_state, &newstate, true); -for_each_cpu (i, policy->cpus) { - freqs.cpu = i; -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); - } +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
drivers/cpufreq/speedstep-smi.c +2 -3
@@ -252,14 +252,13 @@ static int speedstep_target(struct cpufreq_policy *policy, freqs.old = speedstep_freqs[speedstep_get_state ()].frequency; freqs.new = speedstep_freqs[newstate].frequency; - freqs.cpu =0 ;/* speedstep.c is UP only driver */ if (freqs.old == freqs.new)return 0 ; -cpufreq_notify_transition (&freqs,CPUFREQ_PRECHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );speedstep_set_state (newstate); -cpufreq_notify_transition (&freqs,CPUFREQ_POSTCHANGE ); +cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );return 0 ; }
include/linux/cpufreq.h +2 -2
@@ -278,8 +278,8 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data);int cpufreq_unregister_driver (struct cpufreq_driver *driver_data); -void cpufreq_notify_transition (struct cpufreq_freqs *freqs,unsigned int state); - +void cpufreq_notify_transition (struct cpufreq_policy *policy, +struct cpufreq_freqs *freqs,unsigned int state);static inline void cpufreq_verify_within_limits (struct cpufreq_policy *policy,unsigned int min,unsigned int max) {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Quoted 5 lines · Viresh Kumar
Quoted 1 line · Rafael J. Wysocki
The [5/9] seems to be missing. Care to send?
That shouldn't happen. I received it on my other email id which got it through LKML and you were in to field of that too..
Well, if you go to https://patchwork.kernel.org/project/linux-pm/list/,
it's not there. Moreover, it's not in my mailbox, although I'm subscribed to the LKML, linux-pm and cpufreq.
Quoted 2 lines
Anyway, if you want i can resend it but don't really want to spam LKML with same patch again. So its attached for you.
Thanks!
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Viresh Kumar
maintainerQuoted 3 lines · Rafael J. Wysocki
Well, if you go to https://patchwork.kernel.org/project/linux-pm/list/,
it's not there. Moreover, it's not in my mailbox, although I'm subscribed to the LKML, linux-pm and cpufreq.
Hmm.... Something happened probably because of the long cc list that patch had.
Quoted 7 lines · Viresh Kumar
Hi Rafael,
These are fixes and updates that are sent and reviewed as separate patchsets earlier. They are all now combined as part of a single patchset for you to apply in your linux-next branch.
All have got reviews earlier and got fixups mailed and applied.
Whole series applied to linux-pm.git/bleeding-edge.
Thanks,
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.