CPUFreq: cleanup stuff for 3.13
Subsystems (16)
Viresh Kumar
maintainercover CPUFreq: cleanup stuff for 3.13
This is my biggest patchset ever and it might not happen again in my entire career. I hope I haven't screwed up here :)
CPUFreq cleanup patches are ready to hit linux-next (I hope it doesn't turn out into horror stories, where it broke all possible architectures where Linux runs :))
Most of these are build tested only, Also done by: Fengguang Wu's build bot.
All of these were sent separately in smaller patchsets earlier and now merged together as a single set. Some parts are reviewed by platform maintainers and their Acks are included in the patches (Sorry if I missed any)..
These are rebased over today's pm/linux-next:
f74a274 Merge branch 'pm-cpufreq-next' into linux-next
with following patches over it, which I expect to get into Rafael's tree before these:
cpufreq: use correct values of cpus in __cpufreq_remove_dev_finish()
cpufreq: distinguish drivers that do asynchronous notifications
cpufreq: make sure frequency transitions are serialized
cpufreq: Create cpufreq_transition_complete()
cpufreq: powernow-k8: mark freq transition complete on error cases
There are few new patches here which haven't been sent yet and only came out after discussions with Maintainers about their platforms:
cpufreq: loongson2: use cpufreq_generic_init() routine
cpufreq: davinci: use cpufreq_generic_init() routine
cpufreq: cris: use cpufreq_generic_init() routine
cpufreq: omap: use cpufreq_generic_init() routine
As suggested by Rafael earlier, he might not apply all at once and will give people some chance to test sets one by one.. So, first set now, next one after few days. So, I am marking different sets with patch numbers to make it easier for Rafael.
- Patch 1->8: Generic cleanup of cpufreq core (First batch)
- Patch 9->54: Mostly about cpufreq_table_validate_and_show() helper (First batch)
- Patch 55->89: New generic routines for cpufreq drivers (First/Second batch)
- Patch 90->126: About calling cpufreq_driver->get() from core (First/Second batch)
- Patch 127->146: Generic init() routine (First/Second batch)
- Patch 147->180: Light weight ->target() routine (Third batch)
- Patch 181->211: Call notifiers from core instead of target() (Third/Fourth batch)
- Patch 212->228: Generic get() (Fifth batch)
As suggested by Amit here, Linaro may try to test linux-next with these patches on Linaro's board farm (Mostly ARM and X86)..
https://lkml.org/lkml/2013/9/11/346
--
viresh
Hans-Christian Egtvedt (1):
cpufreq: at32ap: add frequency table
Viresh Kumar (227):
cpufreq: Remove extra blank line
cpufreq: don't break string in print statements
cpufreq: remove __cpufreq_remove_dev()
cpufreq: Optimize cpufreq_frequency_table_verify()
cpufreq: rename __cpufreq_set_policy() as cpufreq_set_policy()
cpufreq: rewrite cpufreq_driver->flags using shift operator
cpufreq: use cpufreq_driver->flags to mark
CPUFREQ_HAVE_GOVERNOR_PER_POLICY
cpufreq: add new routine cpufreq_verify_within_cpu_limits()
cpufreq: Add new helper cpufreq_table_validate_and_show()
cpufreq: pxa: call cpufreq_frequency_table_get_attr()
cpufreq: s3cx4xx: call cpufreq_frequency_table_get_attr()
cpufreq: sparc: call cpufreq_frequency_table_get_attr()
cpufreq: acpi-cpufreq: use cpufreq_table_validate_and_show()
cpufreq: arm_big_little: use cpufreq_table_validate_and_show()
cpufreq: blackfin: use cpufreq_table_validate_and_show()
cpufreq: cpufreq-cpu0: use cpufreq_table_validate_and_show()
cpufreq: cris: use cpufreq_table_validate_and_show()
cpufreq: davinci: use cpufreq_table_validate_and_show()
cpufreq: dbx500: use cpufreq_table_validate_and_show()
cpufreq: e_powersaver: use cpufreq_table_validate_and_show()
cpufreq: elanfreq: use cpufreq_table_validate_and_show()
cpufreq: exynos: use cpufreq_table_validate_and_show()
cpufreq: ia64-acpi: use cpufreq_table_validate_and_show()
cpufreq: imx6q: use cpufreq_table_validate_and_show()
cpufreq: kirkwood: use cpufreq_table_validate_and_show()
cpufreq: longhaul: use cpufreq_table_validate_and_show()
cpufreq: loongson2: use cpufreq_table_validate_and_show()
cpufreq: maple: use cpufreq_table_validate_and_show()
cpufreq: omap: use cpufreq_table_validate_and_show()
cpufreq: p4-clockmod: use cpufreq_table_validate_and_show()
cpufreq: pasemi: use cpufreq_table_validate_and_show()
cpufreq: pmac: use cpufreq_table_validate_and_show()
cpufreq: powernow: use cpufreq_table_validate_and_show()
cpufreq: ppc: use cpufreq_table_validate_and_show()
cpufreq: pxa: use cpufreq_table_validate_and_show()
cpufreq: s3cx4xx: use cpufreq_table_validate_and_show()
cpufreq: s5pv210: use cpufreq_table_validate_and_show()
cpufreq: sa11x0: Expose frequency table
cpufreq: sa11x0: let cpufreq core initialize struct policy fields
cpufreq: sc520: use cpufreq_table_validate_and_show()
cpufreq: sh: use cpufreq_table_validate_and_show()
cpufreq: sparc: use cpufreq_table_validate_and_show()
cpufreq: spear: use cpufreq_table_validate_and_show()
cpufreq: speedstep: use cpufreq_table_validate_and_show()
cpufreq: tegra: use cpufreq_table_validate_and_show()
cpufreq: tegra: fix implementation of ->exit()
cpufreq: arm_big_little: call cpufreq_frequency_table_put_attr()
cpufreq: blackfin: call cpufreq_frequency_table_put_attr()
cpufreq: exynos: call cpufreq_frequency_table_put_attr()
cpufreq: loongson2: call cpufreq_frequency_table_put_attr()
cpufreq: omap: call cpufreq_frequency_table_put_attr()
cpufreq: pxa: call cpufreq_frequency_table_put_attr()
cpufreq: sparc: call cpufreq_frequency_table_put_attr()
cpufreq: define generic .attr, .exit() and .verify() routines
cpufreq: acpi: Use generic cpufreq routines
cpufreq: arm_big_little: Use generic cpufreq routines
cpufreq: at32ap: Use generic cpufreq routines
cpufreq: blackfin: Use generic cpufreq routines
cpufreq: cpu0: Use generic cpufreq routines
cpufreq: cris: Use generic cpufreq routines
cpufreq: davinci: Use generic cpufreq routines
cpufreq: dbx500: Use generic cpufreq routines
cpufreq: e_powersaver: Use generic cpufreq routines
cpufreq: elanfreq: Use generic cpufreq routines
cpufreq: exynos: Use generic cpufreq routines
cpufreq: ia64-acpi: Use generic cpufreq routines
cpufreq: imx6q: Use generic cpufreq routines
cpufreq: kirkwood: Use generic cpufreq routines
cpufreq: longhaul: Use generic cpufreq routines
cpufreq: loongson2: Use generic cpufreq routines
cpufreq: maple: Use generic cpufreq routines
cpufreq: omap: Use generic cpufreq routines
cpufreq: p4-clockmod: Use generic cpufreq routines
cpufreq: pasemi: Use generic cpufreq routines
cpufreq: pmac: Use generic cpufreq routines
cpufreq: powernow: Use generic cpufreq routines
cpufreq: ppc-corenet: Use generic cpufreq routines
cpufreq: ppc_cbe: Use generic cpufreq routines
cpufreq: pxa: Use generic cpufreq routines
cpufreq: s3cx4xx: Use generic cpufreq routines
cpufreq: s5pv210: Use generic cpufreq routines
cpufreq: sa11x0: Use generic cpufreq routines
cpufreq: sc520: Use generic cpufreq routines
cpufreq: sh: Use generic cpufreq routines
cpufreq: sparc: Use generic cpufreq routines
cpufreq: spear: Use generic cpufreq routines
cpufreq: speedstep: Use generic cpufreq routines
cpufreq: tegra: Use generic cpufreq routines
cpufreq: call cpufreq_driver->get() after calling ->init()
cpufreq: acpi: don't initialize part of policy that is set by core
too
cpufreq: arm_big_little: don't initialize part of policy that is set
by core too
cpufreq: at32ap: don't initialize part of policy that is set by core
too
cpufreq: blackfin: don't initialize part of policy that is set by
core too
cpufreq: cpu0: don't initialize part of policy that is set by core
too
cpufreq: nforce2: don't initialize part of policy that is set by core
too
cpufreq: cris: don't initialize part of policy that is set by core
too
cpufreq: davinci: don't initialize part of policy that is set by core
too
cpufreq: dbx500: don't initialize part of policy that is set by core
too
cpufreq: e_powersaver: don't initialize part of policy that is set by
core too
cpufreq: elanfreq: don't initialize part of policy that is set by
core too
cpufreq: exynos: don't initialize part of policy that is set by core
too
cpufreq: gx: don't initialize part of policy that is set by core too
cpufreq: ia64-acpi: don't initialize part of policy that is set by
core too
cpufreq: imx6q: don't initialize part of policy that is set by core
too
cpufreq: integrator: don't initialize part of policy that is set by
core too
cpufreq: kirkwood: don't initialize part of policy that is set by
core too
cpufreq: longhaul: don't initialize part of policy that is set by
core too
cpufreq: loongson2: don't initialize part of policy that is set by
core too
cpufreq: maple: don't initialize part of policy that is set by core
too
cpufreq: omap: don't initialize part of policy that is set by core
too
cpufreq: p4: don't initialize part of policy that is set by core too
cpufreq: pcc: don't initialize part of policy that is set by core too
cpufreq: pmac: don't initialize part of policy that is set by core
too
cpufreq: powernow: don't initialize part of policy that is set by
core too
cpufreq: ppc: don't initialize part of policy that is set by core too
cpufreq: pxa: don't initialize part of policy that is set by core too
cpufreq: s3c: don't initialize part of policy that is set by core too
cpufreq: s5pv210: don't initialize part of policy that is set by core
too
cpufreq: sa11x0: don't initialize part of policy that is set by core
too
cpufreq: sc520_freq: don't initialize part of policy that is set by
core too
cpufreq: sh: don't initialize part of policy that is set by core too
cpufreq: spear: don't initialize part of policy that is set by core
too
cpufreq: speedstep: don't initialize part of policy that is set by
core too
cpufreq: tegra: don't initialize part of policy that is set by core
too
cpufreq: unicore2: don't initialize part of policy that is set by
core too
cpufreq: create cpufreq_generic_init() routine
cpufreq: remove CONFIG_CPU_FREQ_TABLE
cpufreq: cpu0: use cpufreq_generic_init() routine
cpufreq: cris: use cpufreq_generic_init() routine
cpufreq: davinci: use cpufreq_generic_init() routine
cpufreq: dbx500: use cpufreq_generic_init() routine
cpufreq: exynos: use cpufreq_generic_init() routine
cpufreq: imx6q: use cpufreq_generic_init() routine
cpufreq: kirkwood: use cpufreq_generic_init() routine
cpufreq: loongson2: use cpufreq_generic_init() routine
cpufreq: maple: use cpufreq_generic_init() routine
cpufreq: omap: use cpufreq_generic_init() routine
cpufreq: pasemi: use cpufreq_generic_init() routine
cpufreq: pmac32: use cpufreq_generic_init() routine
cpufreq: pmac64: use cpufreq_generic_init() routine
cpufreq: s3c: use cpufreq_generic_init() routine
cpufreq: s5pv210: use cpufreq_generic_init() routine
cpufreq: sa11x0: use cpufreq_generic_init() routine
cpufreq: spear: use cpufreq_generic_init() routine
cpufreq: tegra: use cpufreq_generic_init() routine
cpufreq: Implement light weight ->target_index() routine
cpufreq: acpi: Convert to light weight ->target_index() routine
cpufreq: arm_big_little: Convert to light weight ->target_index()
routine
cpufreq: at32ap: Convert to light weight ->target_index() routine
cpufreq: blackfin: Convert to light weight ->target_index() routine
cpufreq: cpu0: Convert to light weight ->target_index() routine
cpufreq: cris: Convert to light weight ->target_index() routine
cpufreq: davinci: Convert to light weight ->target_index() routine
cpufreq: dbx500: Convert to light weight ->target_index() routine
cpufreq: e_powersaver: Convert to light weight ->target_index()
routine
cpufreq: elanfreq: Convert to light weight ->target_index() routine
cpufreq: exynos: Convert to light weight ->target_index() routine
cpufreq: ia64: Convert to light weight ->target_index() routine
cpufreq: imx6q: Convert to light weight ->target_index() routine
cpufreq: kirkwood: Convert to light weight ->target_index() routine
cpufreq: longhaul: Convert to light weight ->target_index() routine
cpufreq: loongson2: Convert to light weight ->target_index() routine
cpufreq: maple: Convert to light weight ->target_index() routine
cpufreq: omap: Convert to light weight ->target_index() routine
cpufreq: p4: Convert to light weight ->target_index() routine
cpufreq: pasemi: Convert to light weight ->target_index() routine
cpufreq: pmac32: Convert to light weight ->target_index() routine
cpufreq: powernow: Convert to light weight ->target_index() routine
cpufreq: ppc: Convert to light weight ->target_index() routine
cpufreq: pxa: Convert to light weight ->target_index() routine
cpufreq: s3c2416: Convert to light weight ->target_index() routine
cpufreq: s3c64xx: Convert to light weight ->target_index() routine
cpufreq: s5pv210: Convert to light weight ->target_index() routine
cpufreq: sa11x0: Convert to light weight ->target_index() routine
cpufreq: sc520: Convert to light weight ->target_index() routine
cpufreq: sparc: Convert to light weight ->target_index() routine
cpufreq: SPEAr: Convert to light weight ->target_index() routine
cpufreq: speedstep: Convert to light weight ->target_index() routine
cpufreq: tegra: Convert to light weight ->target_index() routine
cpufreq: move freq change notifications to cpufreq core
cpufreq: acpi: remove calls to cpufreq_notify_transition()
cpufreq: arm_big_little: remove calls to cpufreq_notify_transition()
cpufreq: at32ap: remove calls to cpufreq_notify_transition()
cpufreq: blackfin: remove calls to cpufreq_notify_transition()
cpufreq: cpu0: remove calls to cpufreq_notify_transition()
cpufreq: cris: remove calls to cpufreq_notify_transition()
cpufreq: davinci: remove calls to cpufreq_notify_transition()
cpufreq: dbx500: remove calls to cpufreq_notify_transition()
cpufreq: e_powersaver: remove calls to cpufreq_notify_transition()
cpufreq: elanfreq: remove calls to cpufreq_notify_transition()
cpufreq: exynos: remove calls to cpufreq_notify_transition()
cpufreq: ia64-acpi: remove calls to cpufreq_notify_transition()
cpufreq: imx6q: remove calls to cpufreq_notify_transition()
cpufreq: kirkwood: remove calls to cpufreq_notify_transition()
cpufreq: loongson2: remove calls to cpufreq_notify_transition()
cpufreq: maple: remove calls to cpufreq_notify_transition()
cpufreq: omap: remove calls to cpufreq_notify_transition()
cpufreq: p4-clockmod: remove calls to cpufreq_notify_transition()
cpufreq: pasemi: remove calls to cpufreq_notify_transition()
cpufreq: pmac: remove calls to cpufreq_notify_transition()
cpufreq: ppc: remove calls to cpufreq_notify_transition()
cpufreq: pxa: remove calls to cpufreq_notify_transition()
cpufreq: s3c: remove calls to cpufreq_notify_transition()
cpufreq: s5pv210: remove calls to cpufreq_notify_transition()
cpufreq: sa11x0: remove calls to cpufreq_notify_transition()
cpufreq: sc520: remove calls to cpufreq_notify_transition()
cpufreq: sparc: remove calls to cpufreq_notify_transition()
cpufreq: SPEAr: remove calls to cpufreq_notify_transition()
cpufreq: speedstep: remove calls to cpufreq_notify_transition()
cpufreq: tegra: remove calls to cpufreq_notify_transition()
cpufreq: tegra: remove target_cpu_speed[] array
cpufreq: create cpufreq_generic_get() routine
cpufreq: arm_big_little: use cpufreq_generic_get() routine
cpufreq: at32ap: use cpufreq_generic_get() routine
cpufreq: cpu0: use cpufreq_generic_get() routine
cpufreq: davinci: use cpufreq_generic_get() routine
cpufreq: dbx500: use cpufreq_generic_get() routine
cpufreq: exynos: use cpufreq_generic_get() routine
cpufreq: imx6q: use cpufreq_generic_get() routine
cpufreq: loongson2: use cpufreq_generic_get() routine
cpufreq: omap: use cpufreq_generic_get() routine
cpufreq: ppc: use cpufreq_generic_get() routine
cpufreq: s3c: use cpufreq_generic_get() routine
cpufreq: s5pv210: use cpufreq_generic_get() routine
cpufreq: spear: use cpufreq_generic_get() routine
cpufreq: tegra: use cpufreq_generic_get() routine
cpufreq: unicore2: use cpufreq_generic_get() routine
Documentation/cpu-freq/cpu-drivers.txt | 27 ++-- Documentation/cpu-freq/governors.txt | 4 +- arch/arm/mach-davinci/Kconfig | 1 - arch/arm/mach-pxa/Kconfig | 3 - arch/arm/mach-sa1100/generic.c | 81 +++--------- arch/arm/mach-sa1100/generic.h | 4 +- arch/arm/mach-ux500/Kconfig | 1 - arch/blackfin/Kconfig | 1 - arch/cris/Kconfig | 2 - drivers/cpufreq/Kconfig | 11 -- drivers/cpufreq/Kconfig.arm | 11 -- drivers/cpufreq/Kconfig.powerpc | 6 - drivers/cpufreq/Kconfig.x86 | 13 -- drivers/cpufreq/Makefile | 5 +- drivers/cpufreq/acpi-cpufreq.c | 45 ++----- drivers/cpufreq/arm_big_little.c | 75 ++---------- drivers/cpufreq/at32ap-cpufreq.c | 119 +++++++++--------- drivers/cpufreq/blackfin-cpufreq.c | 54 ++------ drivers/cpufreq/cpufreq-cpu0.c | 103 +++------------- drivers/cpufreq/cpufreq-nforce2.c | 5 +- drivers/cpufreq/cpufreq.c | 217 +++++++++++++++++++++++++-------- drivers/cpufreq/cpufreq_governor.h | 5 +- drivers/cpufreq/cris-artpec3-cpufreq.c | 64 +--------- drivers/cpufreq/cris-etraxfs-cpufreq.c | 61 +-------- drivers/cpufreq/davinci-cpufreq.c | 87 +++---------- drivers/cpufreq/dbx500-cpufreq.c | 97 ++------------- drivers/cpufreq/e_powersaver.c | 59 ++------- drivers/cpufreq/elanfreq.c | 88 ++----------- drivers/cpufreq/exynos-cpufreq.c | 93 +++----------- drivers/cpufreq/exynos5440-cpufreq.c | 84 ++++--------- drivers/cpufreq/freq_table.c | 59 ++++++--- drivers/cpufreq/gx-suspmod.c | 5 +- drivers/cpufreq/ia64-acpi-cpufreq.c | 71 +---------- drivers/cpufreq/imx6q-cpufreq.c | 99 ++++----------- drivers/cpufreq/integrator-cpufreq.c | 14 +-- drivers/cpufreq/intel_pstate.c | 4 +- drivers/cpufreq/kirkwood-cpufreq.c | 107 ++++------------ drivers/cpufreq/longhaul.c | 45 +------ drivers/cpufreq/longrun.c | 4 +- drivers/cpufreq/loongson2_cpufreq.c | 72 ++--------- drivers/cpufreq/maple-cpufreq.c | 56 +-------- drivers/cpufreq/omap-cpufreq.c | 158 ++++++------------------ drivers/cpufreq/p4-clockmod.c | 53 ++------ drivers/cpufreq/pasemi-cpufreq.c | 51 +------- drivers/cpufreq/pcc-cpufreq.c | 10 +- drivers/cpufreq/pmac32-cpufreq.c | 53 ++------ drivers/cpufreq/pmac64-cpufreq.c | 57 +-------- drivers/cpufreq/powernow-k6.c | 67 ++-------- drivers/cpufreq/powernow-k7.c | 42 ++----- drivers/cpufreq/powernow-k8.c | 53 ++------ drivers/cpufreq/ppc-corenet-cpufreq.c | 69 ++--------- drivers/cpufreq/ppc_cbe_cpufreq.c | 50 +------- drivers/cpufreq/pxa2xx-cpufreq.c | 70 +++-------- drivers/cpufreq/pxa3xx-cpufreq.c | 46 ++----- drivers/cpufreq/s3c2416-cpufreq.c | 67 ++-------- drivers/cpufreq/s3c24xx-cpufreq.c | 37 +----- drivers/cpufreq/s3c64xx-cpufreq.c | 108 +++++----------- drivers/cpufreq/s5pv210-cpufreq.c | 105 ++++------------ drivers/cpufreq/sa1100-cpufreq.c | 49 ++------ drivers/cpufreq/sa1110-cpufreq.c | 46 ++----- drivers/cpufreq/sc520_freq.c | 64 +--------- drivers/cpufreq/sh-cpufreq.c | 22 +--- drivers/cpufreq/sparc-us2e-cpufreq.c | 42 ++----- drivers/cpufreq/sparc-us3-cpufreq.c | 44 ++----- drivers/cpufreq/spear-cpufreq.c | 72 ++--------- drivers/cpufreq/speedstep-centrino.c | 81 ++---------- drivers/cpufreq/speedstep-ich.c | 85 ++----------- drivers/cpufreq/speedstep-smi.c | 76 ++---------- drivers/cpufreq/tegra-cpufreq.c | 114 ++++------------- drivers/cpufreq/unicore2-cpufreq.c | 26 ++-- drivers/thermal/Kconfig | 1 - include/linux/cpufreq.h | 59 ++++++--- 72 files changed, 922 insertions(+), 2917 deletions(-)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 1/228 cpufreq: Remove extra blank line
We don't need a blank line just at start of a block, lets remove it.
--- drivers/cpufreq/cpufreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/cpufreq.c +0 -1
@@ -1240,7 +1240,6 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,if (!frozen)sysfs_remove_link (&dev->kobj,"cpufreq" ); }else if (cpus >1 ) { - new_cpu =cpufreq_nominate_new_policy_cpu (policy, cpu, frozen);if (new_cpu >=0 ) {WARN_ON (lock_policy_rwsem_write (cpu));
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 2/228 cpufreq: don't break string in print statements
In reply to Viresh KumarAs a rule its better not to break string (quoted inside "") in a print statement even if it crosses 80 column boundary as that may introduce unwanted bugs and so this patch rewrites one of the print statements..
--- drivers/cpufreq/cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cpufreq/cpufreq.c +2 -2
@@ -1247,8 +1247,8 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,unlock_policy_rwsem_write (cpu);if (!frozen) { -pr_debug ("%s: policy Kobject moved to cpu: %d " -"from: %d\n" ,__func__, new_cpu, cpu); +pr_debug ("%s: policy Kobject moved to cpu: %d from: %d\n" , + __func__, new_cpu, cpu); } } }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 3/228 cpufreq: remove __cpufreq_remove_dev()
In reply to Viresh KumarNobody except cpufreq_remove_dev() is calling __cpufreq_remove_dev() and so we don't need separate routines here. Lets merge code from __cpufreq_remove_dev() to cpufreq_remove_dev() and get rid of __cpufreq_remove_dev().
--- drivers/cpufreq/cpufreq.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
drivers/cpufreq/cpufreq.c +8 -18
@@ -1343,36 +1343,26 @@ static int __cpufreq_remove_dev_finish(struct device *dev, }/** -* __cpufreq_remove_dev - remove a CPU device +* cpufreq_remove_dev - remove a CPU device * * Removes the cpufreq interface for a CPU device. * Caller should already have policy_rwsem in write mode for this CPU. * This routine frees the rwsem before returning. */ -static inline int __cpufreq_remove_dev (struct device *dev, -struct subsys_interface *sif, -bool frozen) -{ -int ret; - - ret =__cpufreq_remove_dev_prepare (dev, sif, frozen); - -if (!ret) - ret =__cpufreq_remove_dev_finish (dev, sif, frozen); - -return ret; -} -static int cpufreq_remove_dev (struct device *dev,struct subsys_interface *sif) {unsigned int cpu = dev->id; -int retval; +int ret;if (cpu_is_offline (cpu))return 0 ; - retval =__cpufreq_remove_dev (dev, sif, false); -return retval; + ret =__cpufreq_remove_dev_prepare (dev, sif, false); + +if (!ret) + ret =__cpufreq_remove_dev_finish (dev, sif, false); + +return ret; }static void handle_update (struct work_struct *work)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 4/228 cpufreq: Optimize cpufreq_frequency_table_verify()
In reply to Viresh Kumarcpufreq_frequency_table_verify() is a bit rewritten here to make it more logical and optimal.
- merge multiple lines for variable declarations together.
- quit early if any frequency between min/max is found.
- don't call cpufreq_verify_within_limits() in case any valid freq is found as it is of no use.
- count renamed as found and made a boolean.
--- drivers/cpufreq/freq_table.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/cpufreq/freq_table.c +13 -12
@@ -54,9 +54,8 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_cpuinfo);int cpufreq_frequency_table_verify (struct cpufreq_policy *policy,struct cpufreq_frequency_table *table) { -unsigned int next_larger = ~0 ; -unsigned int i; -unsigned int count =0 ; +unsigned int next_larger = ~0 , freq, i =0 ; +bool found = false;pr_debug ("request for verification of policy (%u - %u kHz) for cpu %u\n" , policy->min, policy->max, policy->cpu);
@@ -64,21 +63,23 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq); -for (i =0 ; (table[i].frequency !=CPUFREQ_TABLE_END ); i++) { -unsigned int freq = table[i].frequency; +for (; freq = table[i].frequency, freq !=CPUFREQ_TABLE_END ; i++) {if (freq ==CPUFREQ_ENTRY_INVALID )continue ; -if ((freq >= policy->min) && (freq <= policy->max)) - count++; -else if ((next_larger > freq) && (freq > policy->max)) +if ((freq >= policy->min) && (freq <= policy->max)) { + found = true; +break ; + } + +if ((next_larger > freq) && (freq > policy->max)) next_larger = freq; } -if (!count) +if (!found) { policy->max = next_larger; - -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, + policy->cpuinfo.max_freq); + }pr_debug ("verification lead to (%u - %u kHz) for cpu %u\n" , policy->min, policy->max, policy->cpu);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 5/228 cpufreq: rename __cpufreq_set_policy() as cpufreq_set_policy()
In reply to Viresh KumarEarlier there used to be two functions named __cpufreq_set_policy() and cpufreq_set_policy(), but now we only have a single routine lets name it cpufreq_set_policy() instead of __cpufreq_set_policy().
This also removes some invalid comments or fixes some incorrect comments.
--- drivers/cpufreq/cpufreq.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/cpufreq/cpufreq.c +9 -13
@@ -457,7 +457,7 @@ show_one(scaling_min_freq, min);show_one (scaling_max_freq, max);show_one (scaling_cur_freq, cur); -static int __cpufreq_set_policy (struct cpufreq_policy *policy, +static int cpufreq_set_policy (struct cpufreq_policy *policy,struct cpufreq_policy *new_policy);/**
@@ -478,7 +478,7 @@ static ssize_t store_##file_name \if (ret !=1 ) \return -EINVAL ; \ \ - ret =__cpufreq_set_policy (policy, &new_policy); \ + ret =cpufreq_set_policy (policy, &new_policy); \ policy->user_policy.object = policy->object; \ \return ret ? ret : count; \
@@ -536,11 +536,7 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy, &new_policy.governor))return -EINVAL ; -/* -* Do not use cpufreq_set_policy here or the user_policy.max -* will be wrongly overridden -*/ - ret =__cpufreq_set_policy (policy, &new_policy); + ret =cpufreq_set_policy (policy, &new_policy); policy->user_policy.policy = policy->policy; policy->user_policy.governor = policy->governor;
@@ -887,11 +883,11 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy)int ret =0 ;memcpy (&new_policy, policy,sizeof (*policy)); -/* assure that the starting sequence is run in __cpufreq_set_policy */ +/* assure that the starting sequence is run in cpufreq_set_policy */ policy->governor =NULL ;/* set default policy */ - ret =__cpufreq_set_policy (policy, &new_policy); + ret =cpufreq_set_policy (policy, &new_policy); policy->user_policy.policy = policy->policy; policy->user_policy.governor = policy->governor;
@@ -1932,10 +1928,10 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu)EXPORT_SYMBOL (cpufreq_get_policy);/* -* data : current policy. -* policy : policy to be set. +* policy : current policy. +* new_policy: policy to be set. */ -static int __cpufreq_set_policy (struct cpufreq_policy *policy, +static int cpufreq_set_policy (struct cpufreq_policy *policy,struct cpufreq_policy *new_policy) {int ret =0 , failed =1 ;
@@ -2084,7 +2080,7 @@ int cpufreq_update_policy(unsigned int cpu) } } - ret =__cpufreq_set_policy (policy, &new_policy); + ret =cpufreq_set_policy (policy, &new_policy);unlock_policy_rwsem_write (cpu);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 6/228 cpufreq: rewrite cpufreq_driver->flags using shift operator
In reply to Viresh KumarCurrently cpufreq_driver's flags are defined directly using 0x1, 0x2, 0x4, 0x8, etc.. As the list grows it doesn't stays much readable..
Lets use bitwise shift operator << to generate these numbers for respective positions.
--- include/linux/cpufreq.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
include/linux/cpufreq.h +9 -8
@@ -212,19 +212,20 @@ struct cpufreq_driver { };/* flags */ -#define CPUFREQ_STICKY 0x01/* the driver isn't removed even if -* all ->init() calls failed */ -#define CPUFREQ_CONST_LOOPS 0x02/* loops_per_jiffy or other kernel -* "constants" aren't affected by -* frequency transitions */ -#define CPUFREQ_PM_NO_WARN 0x04/* don't warn on suspend/resume speed -* mismatches */ +#define CPUFREQ_STICKY (1 << 0)/* driver isn't removed even if +all ->init() calls failed */ +#define CPUFREQ_CONST_LOOPS (1 << 1)/* loops_per_jiffy or other +kernel "constants" aren't +affected by frequency +transitions */ +#define CPUFREQ_PM_NO_WARN (1 << 2)/* don't warn on suspend/resume +speed mismatches */ /* * Driver will do POSTCHANGE notifications from outside of their ->target() * routine and so must set cpufreq_driver->flags with this flag, so that core * can handle them specially. */ -#define CPUFREQ_ASYNC_NOTIFICATION 0x08 +#define CPUFREQ_ASYNC_NOTIFICATION (1 << 3)int cpufreq_register_driver (struct cpufreq_driver *driver_data);int cpufreq_unregister_driver (struct cpufreq_driver *driver_data);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 7/228 cpufreq: use cpufreq_driver->flags to mark CPUFREQ_HAVE_GOVERNOR_PER_POLICY
In reply to Viresh KumarLets use cpufreq_driver->flags to mark CPUFREQ_HAVE_GOVERNOR_PER_POLICY instead of a separate field within cpufreq_driver. This will save some bytes for us.
--- drivers/cpufreq/arm_big_little.c | 4 ++-- drivers/cpufreq/cpufreq.c | 2 +- drivers/cpufreq/cpufreq_governor.h | 5 ++++- include/linux/cpufreq.h | 15 ++++++++------- 4 files changed, 15 insertions(+), 11 deletions(-)
drivers/cpufreq/arm_big_little.c +2 -2
@@ -214,13 +214,13 @@ static struct freq_attr *bL_cpufreq_attr[] = {static struct cpufreq_driver bL_cpufreq_driver = { .name ="arm-big-little" , - .flags =CPUFREQ_STICKY , + .flags =CPUFREQ_STICKY | +CPUFREQ_HAVE_GOVERNOR_PER_POLICY , .verify = bL_cpufreq_verify_policy, .target = bL_cpufreq_set_target, .get = bL_cpufreq_get, .init = bL_cpufreq_init, .exit = bL_cpufreq_exit, - .have_governor_per_policy = true, .attr = bL_cpufreq_attr, };
drivers/cpufreq/cpufreq.c +1 -1
@@ -135,7 +135,7 @@ static DEFINE_MUTEX(cpufreq_governor_mutex);bool have_governor_per_policy (void ) { -return cpufreq_driver->have_governor_per_policy; +return !!(cpufreq_driver->flags &CPUFREQ_HAVE_GOVERNOR_PER_POLICY ); }EXPORT_SYMBOL_GPL (have_governor_per_policy);
drivers/cpufreq/cpufreq_governor.h +4 -1
@@ -191,7 +191,10 @@ struct common_dbs_data {struct attribute_group *attr_group_gov_sys;/* one governor - system */ struct attribute_group *attr_group_gov_pol;/* one governor - policy */ -/* Common data for platforms that don't set have_governor_per_policy */ +/* +* Common data for platforms that don't set +* CPUFREQ_HAVE_GOVERNOR_PER_POLICY +*/ struct dbs_data *gdbs_data;struct cpu_dbs_common_info *(*get_cpu_cdbs)(int cpu);
include/linux/cpufreq.h +8 -7
@@ -181,13 +181,6 @@ __ATTR(_name, 0644, show_##_name, store_##_name)struct cpufreq_driver {char name[CPUFREQ_NAME_LEN ];u8 flags; -/* -* This should be set by platforms having multiple clock-domains, i.e. -* supporting multiple policies. With this sysfs directories of governor -* would be created in cpu/cpu<num>/cpufreq/ directory and so they can -* use the same governor with different tunables for different clusters. -*/ -bool have_governor_per_policy;/* needed by all drivers */ int (*init) (struct cpufreq_policy *policy);
@@ -227,6 +220,14 @@ struct cpufreq_driver {*/ #define CPUFREQ_ASYNC_NOTIFICATION (1 << 3) +/* +* This should be set by platforms having multiple clock-domains, i.e. +* supporting multiple policies. With this sysfs directories of governor would +* be created in cpu/cpu<num>/cpufreq/ directory and so they can use the same +* governor with different tunables for different clusters. +*/ +#define CPUFREQ_HAVE_GOVERNOR_PER_POLICY (1 << 4) +int cpufreq_register_driver (struct cpufreq_driver *driver_data);int cpufreq_unregister_driver (struct cpufreq_driver *driver_data);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 8/228 cpufreq: add new routine cpufreq_verify_within_cpu_limits()
In reply to Viresh KumarMost of the users of cpufreq_verify_within_limits() calls it for limiting with min/max from policy->cpuinfo. We can make that code simple by introducing another routine which will do this for them automatically.
This patch adds another routine cpufreq_verify_within_cpu_limits() and updates others to use it.
--- drivers/cpufreq/cpufreq-nforce2.c | 4 +--- drivers/cpufreq/davinci-cpufreq.c | 4 +--- drivers/cpufreq/freq_table.c | 6 ++---- drivers/cpufreq/integrator-cpufreq.c | 9 ++------- drivers/cpufreq/intel_pstate.c | 4 +--- drivers/cpufreq/longrun.c | 4 +--- drivers/cpufreq/pcc-cpufreq.c | 3 +-- drivers/cpufreq/sh-cpufreq.c | 7 ++----- drivers/cpufreq/unicore2-cpufreq.c | 4 +--- include/linux/cpufreq.h | 7 +++++++ 10 files changed, 19 insertions(+), 33 deletions(-)
drivers/cpufreq/cpufreq-nforce2.c +1 -3
@@ -303,9 +303,7 @@ static int nforce2_verify(struct cpufreq_policy *policy)if (policy->min < (fsb_pol_max * fid *100 )) policy->max = (fsb_pol_max +1 ) * fid *100 ; -cpufreq_verify_within_limits (policy, - policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_cpu_limits (policy);return 0 ; }
drivers/cpufreq/davinci-cpufreq.c +1 -3
@@ -50,9 +50,7 @@ static int davinci_verify_speed(struct cpufreq_policy *policy)if (policy->cpu)return -EINVAL ; -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); - +cpufreq_verify_within_cpu_limits (policy); policy->min =clk_round_rate (armclk, policy->min *1000 ) /1000 ; policy->max =clk_round_rate (armclk, policy->max *1000 ) /1000 ; cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
drivers/cpufreq/freq_table.c +2 -4
@@ -60,8 +60,7 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,pr_debug ("request for verification of policy (%u - %u kHz) for cpu %u\n" , policy->min, policy->max, policy->cpu); -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_cpu_limits (policy);for (; freq = table[i].frequency, freq !=CPUFREQ_TABLE_END ; i++) {if (freq ==CPUFREQ_ENTRY_INVALID )
@@ -77,8 +76,7 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,if (!found) { policy->max = next_larger; -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_cpu_limits (policy); } pr_debug("verification lead to (%u - %u kHz) for cpu %u\n",
drivers/cpufreq/integrator-cpufreq.c +2 -7
@@ -59,9 +59,7 @@ static int integrator_verify_policy(struct cpufreq_policy *policy) {struct icst_vco vco; -cpufreq_verify_within_limits (policy, - policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_cpu_limits (policy); vco =icst_hz_to_vco (&cclk_params, policy->max *1000 ); policy->max =icst_hz (&cclk_params, vco) /1000 ;
@@ -69,10 +67,7 @@ static int integrator_verify_policy(struct cpufreq_policy *policy) vco =icst_hz_to_vco (&cclk_params, policy->min *1000 ); policy->min =icst_hz (&cclk_params, vco) /1000 ; -cpufreq_verify_within_limits (policy, - policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); - +cpufreq_verify_within_cpu_limits (policy);return 0 ; }
drivers/cpufreq/intel_pstate.c +1 -3
@@ -611,9 +611,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)static int intel_pstate_verify_policy (struct cpufreq_policy *policy) { -cpufreq_verify_within_limits (policy, - policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_cpu_limits (policy);if ((policy->policy !=CPUFREQ_POLICY_POWERSAVE ) && (policy->policy !=CPUFREQ_POLICY_PERFORMANCE ))
drivers/cpufreq/longrun.c +1 -3
@@ -129,9 +129,7 @@ static int longrun_verify_policy(struct cpufreq_policy *policy)return -EINVAL ; policy->cpu =0 ; -cpufreq_verify_within_limits (policy, - policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_cpu_limits (policy);if ((policy->policy !=CPUFREQ_POLICY_POWERSAVE ) && (policy->policy !=CPUFREQ_POLICY_PERFORMANCE ))
drivers/cpufreq/pcc-cpufreq.c +1 -2
@@ -111,8 +111,7 @@ static struct pcc_cpu __percpu *pcc_cpu_info;static int pcc_cpufreq_verify (struct cpufreq_policy *policy) { -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_cpu_limits (policy);return 0 ; }
drivers/cpufreq/sh-cpufreq.c +2 -5
@@ -87,15 +87,12 @@ static int sh_cpufreq_verify(struct cpufreq_policy *policy)if (freq_table)return cpufreq_frequency_table_verify (policy, freq_table); -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); +cpufreq_verify_within_cpu_limits (policy); policy->min = (clk_round_rate (cpuclk,1 ) +500 ) /1000 ; policy->max = (clk_round_rate (cpuclk, ~0UL ) +500 ) /1000 ; -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); - +cpufreq_verify_within_cpu_limits (policy);return 0 ; }
drivers/cpufreq/unicore2-cpufreq.c +1 -3
@@ -29,9 +29,7 @@ static int ucv2_verify_speed(struct cpufreq_policy *policy)if (policy->cpu)return -EINVAL ; -cpufreq_verify_within_limits (policy, - policy->cpuinfo.min_freq, policy->cpuinfo.max_freq); - +cpufreq_verify_within_cpu_limits (policy);return 0 ; }
include/linux/cpufreq.h +7 -0
@@ -256,6 +256,13 @@ static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy,return ; } +static inline void +cpufreq_verify_within_cpu_limits (struct cpufreq_policy *policy) +{ +cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, + policy->cpuinfo.max_freq); +} +/********************************************************************* * CPUFREQ NOTIFIER INTERFACE * *********************************************************************/
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 9/228 cpufreq: Add new helper cpufreq_table_validate_and_show()
In reply to Viresh KumarAlmost every cpufreq driver is required to validate its frequency table with:cpufreq_frequency_table_cpuinfo() and then expose it to cpufreq core with:cpufreq_frequency_table_get_attr().
This patch creates another helper routine cpufreq_table_validate_and_show() that will do both these steps in a single call and will return 0 for success, error otherwise.
This also fixes potential bugs in cpufreq drivers where people have called cpufreq_frequency_table_get_attr() before calling cpufreq_frequency_table_cpuinfo(), as the later may fail.
--- drivers/cpufreq/freq_table.c | 12 ++++++++++++ include/linux/cpufreq.h | 2 ++ 2 files changed, 14 insertions(+)
drivers/cpufreq/freq_table.c +12 -0
@@ -218,6 +218,18 @@ void cpufreq_frequency_table_put_attr(unsigned int cpu) }EXPORT_SYMBOL_GPL (cpufreq_frequency_table_put_attr); +int cpufreq_table_validate_and_show (struct cpufreq_policy *policy, +struct cpufreq_frequency_table *table) +{ +int ret =cpufreq_frequency_table_cpuinfo (policy, table); + +if (!ret) +cpufreq_frequency_table_get_attr (table, policy->cpu); + +return ret; +} +EXPORT_SYMBOL_GPL (cpufreq_table_validate_and_show); +void cpufreq_frequency_table_update_policy_cpu (struct cpufreq_policy *policy) { pr_debug("Updating show_table for new_cpu %u from last_cpu %u\n",
include/linux/cpufreq.h +2 -0
@@ -433,5 +433,7 @@ extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;void cpufreq_frequency_table_get_attr (struct cpufreq_frequency_table *table,unsigned int cpu);void cpufreq_frequency_table_put_attr (unsigned int cpu); +int cpufreq_table_validate_and_show (struct cpufreq_policy *policy, +struct cpufreq_frequency_table *table);#endif /* _LINUX_CPUFREQ_H */
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 10/228 cpufreq: pxa: call cpufreq_frequency_table_get_attr()
In reply to Viresh KumarThis exposes frequency table of driver to cpufreq core and is required for core to guess what the index for a target frequency is, when it calls cpufreq_frequency_table_target(). And so this driver needs to expose it.
--- drivers/cpufreq/pxa2xx-cpufreq.c | 6 +++++- drivers/cpufreq/pxa3xx-cpufreq.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/cpufreq/pxa2xx-cpufreq.c +5 -1
@@ -453,10 +453,14 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)find_freq_tables (&pxa255_freq_table, &pxa255_freqs);pr_info ("PXA255 cpufreq using %s frequency table\n" , pxa255_turbo_table ?"turbo" :"run" ); +cpufreq_frequency_table_cpuinfo (policy, pxa255_freq_table); +cpufreq_frequency_table_get_attr (pxa255_freq_table, policy->cpu); } -else if (cpu_is_pxa27x ()) +else if (cpu_is_pxa27x ()) {cpufreq_frequency_table_cpuinfo (policy, pxa27x_freq_table); +cpufreq_frequency_table_get_attr (pxa27x_freq_table, policy->cpu); + }printk (KERN_INFO "PXA CPU frequency change support initialized\n" );
drivers/cpufreq/pxa3xx-cpufreq.c +6 -2
@@ -91,7 +91,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy, struct pxa3xx_freq_info *freqs, int num) {struct cpufreq_frequency_table *table; -int i; +int i, ret; table =kzalloc ((num +1 ) *sizeof (*table),GFP_KERNEL );if (table ==NULL )
@@ -108,7 +108,11 @@ static int setup_freqs_table(struct cpufreq_policy *policy, pxa3xx_freqs_num = num; pxa3xx_freqs_table = table; -return cpufreq_frequency_table_cpuinfo (policy, table); + ret =cpufreq_frequency_table_cpuinfo (policy, table); +if (!ret) +cpufreq_frequency_table_get_attr (table, policy->cpu); + +return ret; }static void __update_core_freq (struct pxa3xx_freq_info *info)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 11/228 cpufreq: s3cx4xx: call cpufreq_frequency_table_get_attr()
In reply to Viresh KumarThis exposes frequency table of driver to cpufreq core and is required for core to guess what the index for a target frequency is, when it calls cpufreq_frequency_table_target(). And so this driver needs to expose it.
--- drivers/cpufreq/s3c24xx-cpufreq.c | 4 +++- drivers/cpufreq/s3c64xx-cpufreq.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/cpufreq/s3c24xx-cpufreq.c +3 -1
@@ -386,8 +386,10 @@ static int s3c_cpufreq_init(struct cpufreq_policy *policy)/* feed the latency information from the cpu driver */ policy->cpuinfo.transition_latency = cpu_cur.info->latency; -if (ftab) +if (ftab) {cpufreq_frequency_table_cpuinfo (policy, ftab); +cpufreq_frequency_table_get_attr (ftab, policy->cpu); + }return 0 ; }
drivers/cpufreq/s3c64xx-cpufreq.c +3 -0
@@ -257,6 +257,9 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy) ret);regulator_put (vddarm);clk_put (armclk); + }else { +cpufreq_frequency_table_get_attr (s3c64xx_freq_table, + policy->cpu); }return ret;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 12/228 cpufreq: sparc: call cpufreq_frequency_table_get_attr()
In reply to Viresh KumarThis exposes frequency table of driver to cpufreq core and is required for core to guess what the index for a target frequency is, when it calls cpufreq_frequency_table_target(). And so this driver needs to expose it.
--- drivers/cpufreq/sparc-us2e-cpufreq.c | 6 +++++- drivers/cpufreq/sparc-us3-cpufreq.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/cpufreq/sparc-us2e-cpufreq.c +5 -1
@@ -307,6 +307,7 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)unsigned long clock_tick =sparc64_get_clock_tick (cpu) /1000 ;struct cpufreq_frequency_table *table = &us2e_freq_table[cpu].table[0 ]; +int ret; table[0 ].driver_data =0 ; table[0 ].frequency = clock_tick /1 ;
@@ -324,7 +325,10 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =0 ; policy->cur = clock_tick; -return cpufreq_frequency_table_cpuinfo (policy, table); + ret =cpufreq_frequency_table_cpuinfo (policy, table); +if (!ret) +cpufreq_frequency_table_get_attr (table, policy->cpu); +return ret; }static int us2e_freq_cpu_exit (struct cpufreq_policy *policy)
drivers/cpufreq/sparc-us3-cpufreq.c +6 -1
@@ -168,6 +168,7 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)unsigned long clock_tick =sparc64_get_clock_tick (cpu) /1000 ;struct cpufreq_frequency_table *table = &us3_freq_table[cpu].table[0 ]; +int ret; table[0 ].driver_data =0 ; table[0 ].frequency = clock_tick /1 ;
@@ -181,7 +182,11 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =0 ; policy->cur = clock_tick; -return cpufreq_frequency_table_cpuinfo (policy, table); + ret =cpufreq_frequency_table_cpuinfo (policy, table); +if (!ret) +cpufreq_frequency_table_get_attr (table, policy->cpu); + +return ret; }static int us3_freq_cpu_exit (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 012/228] cpufreq: sparc: call cpufreq_frequency_table_get_attr()
From: Viresh Kumar <[email protected]>
Date: Fri, 13 Sep 2013 18:29:18 +0530
Quoted 7 lines
This exposes frequency table of driver to cpufreq core and is required for core to guess what the index for a target frequency is, when it calls
cpufreq_frequency_table_target(). And so this driver needs to expose it.Cc David S. Miller <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
Wait a second, later in this series you add the put_attr() call claiming it's a fix.
But you're the one adding the "bug" here.
So if you are going to add a get_attr() call you should be adding the necessary put_attr() call in the same patch. Otherwise this patch introduces a bug.
Viresh Kumar
maintainerRe: [PATCH 012/228] cpufreq: sparc: call cpufreq_frequency_table_get_attr()
Quoted 11 lines · David Miller
From: Viresh Kumar <[email protected]>
Date: Fri, 13 Sep 2013 18:29:18 +0530Quoted 7 lines
This exposes frequency table of driver to cpufreq core and is required for core to guess what the index for a target frequency is, when it calls
cpufreq_frequency_table_target(). And so this driver needs to expose it.Cc David S. Miller <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
Quoted 8 lines
Wait a second, later in this series you add the
put_attr()call claiming it's a fix.But you're the one adding the "bug" here.
So if you are going to add a
get_attr()call you should be adding the necessaryput_attr()call in the same patch. Otherwise this patch introduces a bug.
Yeah, my mistake.. It was required to be added at both places for very few drivers and so made this mistake..
I will merge both of those patches together..
Viresh Kumar
maintainerPATCH 13/228 cpufreq: acpi-cpufreq: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/acpi-cpufreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +1 -3
@@ -837,7 +837,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) data->freq_table[valid_states].frequency =CPUFREQ_TABLE_END ; perf->state =0 ; - result =cpufreq_frequency_table_cpuinfo (policy, data->freq_table); + result =cpufreq_table_validate_and_show (policy, data->freq_table);if (result) goto err_freqfree;
@@ -868,8 +868,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) (u32 ) perf->states[i].power, (u32) perf->states[i].transition_latency); -cpufreq_frequency_table_get_attr (data->freq_table, policy->cpu); -/* * the first call to ->target() should result in us actually * writing something to the appropriate registers.
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 14/228 cpufreq: arm_big_little: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/arm_big_little.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/arm_big_little.c +1 -3
@@ -165,7 +165,7 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy)if (ret)return ret; - ret =cpufreq_frequency_table_cpuinfo (policy, freq_table[cur_cluster]); + ret =cpufreq_table_validate_and_show (policy, freq_table[cur_cluster]);if (ret) {dev_err (cpu_dev,"CPU %d, cluster: %d invalid freq table\n" , policy->cpu, cur_cluster);
@@ -173,8 +173,6 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy)return ret; } -cpufreq_frequency_table_get_attr (freq_table[cur_cluster], policy->cpu); -if (arm_bL_ops->get_transition_latency) policy->cpuinfo.transition_latency = arm_bL_ops->get_transition_latency (cpu_dev);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 15/228 cpufreq: blackfin: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/blackfin-cpufreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/blackfin-cpufreq.c +1 -2
@@ -210,8 +210,7 @@ static int __bfin_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =50000 ;/* 50us assumed */ policy->cur = cclk; -cpufreq_frequency_table_get_attr (bfin_freq_table, policy->cpu); -return cpufreq_frequency_table_cpuinfo (policy, bfin_freq_table); +return cpufreq_table_validate_and_show (policy, bfin_freq_table); }static struct freq_attr *bfin_freq_attr[] = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 16/228 cpufreq: cpufreq-cpu0: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/cpufreq-cpu0.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/cpufreq-cpu0.c +1 -3
@@ -128,7 +128,7 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy) {int ret; - ret =cpufreq_frequency_table_cpuinfo (policy, freq_table); + ret =cpufreq_table_validate_and_show (policy, freq_table);if (ret) {pr_err ("invalid frequency table: %d\n" , ret);return ret;
@@ -144,8 +144,6 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy)*/ cpumask_setall (policy->cpus); -cpufreq_frequency_table_get_attr (freq_table, policy->cpu); -return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 17/228 cpufreq: cris: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/cris-artpec3-cpufreq.c | 10 +--------- drivers/cpufreq/cris-etraxfs-cpufreq.c | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-)
drivers/cpufreq/cris-artpec3-cpufreq.c +1 -9
@@ -76,19 +76,11 @@ static int cris_freq_target(struct cpufreq_policy *policy,static int cris_freq_cpu_init (struct cpufreq_policy *policy) { -int result; -/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =1000000 ;/* 1ms */ policy->cur =cris_freq_get_cpu_frequency (0 ); - result =cpufreq_frequency_table_cpuinfo (policy, cris_freq_table); -if (result) -return (result); - -cpufreq_frequency_table_get_attr (cris_freq_table, policy->cpu); - -return 0 ; +return cpufreq_table_validate_and_show (policy, cris_freq_table); }
drivers/cpufreq/cris-etraxfs-cpufreq.c +1 -9
@@ -75,19 +75,11 @@ static int cris_freq_target(struct cpufreq_policy *policy,static int cris_freq_cpu_init (struct cpufreq_policy *policy) { -int result; -/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =1000000 ;/* 1ms */ policy->cur =cris_freq_get_cpu_frequency (0 ); - result =cpufreq_frequency_table_cpuinfo (policy, cris_freq_table); -if (result) -return (result); - -cpufreq_frequency_table_get_attr (cris_freq_table, policy->cpu); - -return 0 ; +return cpufreq_table_validate_and_show (policy, cris_freq_table); }static int cris_freq_cpu_exit (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 017/228] cpufreq: cris: use cpufreq_table_validate_and_show()
Quoted 2 lines · Viresh Kumar
Lets use
cpufreq_table_validate_and_show()instead of callingcpufreq_frequency_table_cpuinfo()andcpufreq_frequency_table_get_attr().
Quoted 3 lines
Cc Mikael Starvik <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Viresh Kumar
maintainerPATCH 18/228 cpufreq: davinci: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/davinci-cpufreq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/cpufreq/davinci-cpufreq.c +2 -4
@@ -138,15 +138,13 @@ static int davinci_cpu_init(struct cpufreq_policy *policy) policy->cur =davinci_getspeed (0 ); - result =cpufreq_frequency_table_cpuinfo (policy, freq_table); + result =cpufreq_table_validate_and_show (policy, freq_table);if (result) { -pr_err ("%s: cpufreq_frequency_table_cpuinfo() failed" , +pr_err ("%s: cpufreq_table_validate_and_show() failed" , __func__);return result; } -cpufreq_frequency_table_get_attr (freq_table, policy->cpu); -/* * Time measurement across the target() function yields ~1500-1800us * time taken with no drivers on notification list.
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 19/228 cpufreq: dbx500: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/dbx500-cpufreq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/cpufreq/dbx500-cpufreq.c +2 -4
@@ -87,10 +87,8 @@ static int dbx500_cpufreq_init(struct cpufreq_policy *policy)int res;/* get policy fields based on the table */ - res =cpufreq_frequency_table_cpuinfo (policy, freq_table); -if (!res) -cpufreq_frequency_table_get_attr (freq_table, policy->cpu); -else { + res =cpufreq_table_validate_and_show (policy, freq_table); +if (res) {pr_err ("dbx500-cpufreq: Failed to read policy table\n" );return res; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 20/228 cpufreq: e_powersaver: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/e_powersaver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/e_powersaver.c +1 -2
@@ -403,13 +403,12 @@ static int eps_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =140000 ;/* 844mV -> 700mV in ns */ policy->cur = fsb * current_multiplier; - ret =cpufreq_frequency_table_cpuinfo (policy, ¢aur->freq_table[0 ]); + ret =cpufreq_table_validate_and_show (policy, ¢aur->freq_table[0 ]);if (ret) {kfree (centaur);return ret; } -cpufreq_frequency_table_get_attr (¢aur->freq_table[0 ], policy->cpu);return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 21/228 cpufreq: elanfreq: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/elanfreq.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/cpufreq/elanfreq.c +1 -7
@@ -202,7 +202,6 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy) {struct cpuinfo_x86 *c = &cpu_data (0 );unsigned int i; -int result;/* capability check */ if ((c->x86_vendor != X86_VENDOR_AMD) ||
@@ -223,12 +222,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; policy->cur =elanfreq_get_cpu_frequency (0 ); - result =cpufreq_frequency_table_cpuinfo (policy, elanfreq_table); -if (result) -return result; - -cpufreq_frequency_table_get_attr (elanfreq_table, policy->cpu); -return 0 ; +return cpufreq_table_validate_and_show (policy, elanfreq_table); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 22/228 cpufreq: exynos: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/exynos-cpufreq.c | 4 +--- drivers/cpufreq/exynos5440-cpufreq.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/cpufreq/exynos-cpufreq.c +1 -3
@@ -249,14 +249,12 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy) { policy->cur = policy->min = policy->max =exynos_getspeed (policy->cpu); -cpufreq_frequency_table_get_attr (exynos_info->freq_table, policy->cpu); -/* set the transition latency value */ policy->cpuinfo.transition_latency =100000 ;cpumask_setall (policy->cpus); -return cpufreq_frequency_table_cpuinfo (policy, exynos_info->freq_table); +return cpufreq_table_validate_and_show (policy, exynos_info->freq_table); }static int exynos_cpufreq_cpu_exit (struct cpufreq_policy *policy)
drivers/cpufreq/exynos5440-cpufreq.c +1 -3
@@ -329,7 +329,7 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy) {int ret; - ret =cpufreq_frequency_table_cpuinfo (policy, dvfs_info->freq_table); + ret =cpufreq_table_validate_and_show (policy, dvfs_info->freq_table);if (ret) {dev_err (dvfs_info->dev,"Invalid frequency table: %d\n" , ret);return ret;
@@ -339,8 +339,6 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = dvfs_info->latency;cpumask_setall (policy->cpus); -cpufreq_frequency_table_get_attr (dvfs_info->freq_table, policy->cpu); -return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 23/228 cpufreq: ia64-acpi: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/ia64-acpi-cpufreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/ia64-acpi-cpufreq.c +1 -3
@@ -335,7 +335,7 @@ acpi_cpufreq_cpu_init ( } } - result =cpufreq_frequency_table_cpuinfo (policy, data->freq_table); + result =cpufreq_table_validate_and_show (policy, data->freq_table);if (result) { goto err_freqfree; }
@@ -356,8 +356,6 @@ acpi_cpufreq_cpu_init ( (u32 ) data->acpi_data.states[i].status, (u32) data->acpi_data.states[i].control); -cpufreq_frequency_table_get_attr (data->freq_table, policy->cpu); -/* the first call to ->target() should result in us actually * writing something to the appropriate registers. */ data->resume =1 ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 24/228 cpufreq: imx6q: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/imx6q-cpufreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/imx6q-cpufreq.c +1 -2
@@ -160,7 +160,7 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy) {int ret; - ret =cpufreq_frequency_table_cpuinfo (policy, freq_table); + ret =cpufreq_table_validate_and_show (policy, freq_table);if (ret) {dev_err (cpu_dev,"invalid frequency table: %d\n" , ret);return ret;
@@ -169,7 +169,6 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = transition_latency; policy->cur =clk_get_rate (arm_clk) /1000 ;cpumask_setall (policy->cpus); -cpufreq_frequency_table_get_attr (freq_table, policy->cpu);return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 25/228 cpufreq: kirkwood: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/kirkwood-cpufreq.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/cpufreq/kirkwood-cpufreq.c +1 -9
@@ -125,19 +125,11 @@ static int kirkwood_cpufreq_target(struct cpufreq_policy *policy,/* Module init and exit code */ static int kirkwood_cpufreq_cpu_init (struct cpufreq_policy *policy) { -int result; -/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =5000 ;/* 5uS */ policy->cur =kirkwood_cpufreq_get_cpu_frequency (0 ); - result =cpufreq_frequency_table_cpuinfo (policy, kirkwood_freq_table); -if (result) -return result; - -cpufreq_frequency_table_get_attr (kirkwood_freq_table, policy->cpu); - -return 0 ; +return cpufreq_table_validate_and_show (policy, kirkwood_freq_table); }static int kirkwood_cpufreq_cpu_exit (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 26/228 cpufreq: longhaul: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/longhaul.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/cpufreq/longhaul.c +1 -7
@@ -921,13 +921,7 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =200000 ;/* nsec */ policy->cur =calc_speed (longhaul_get_cpu_mult ()); - ret =cpufreq_frequency_table_cpuinfo (policy, longhaul_table); -if (ret) -return ret; - -cpufreq_frequency_table_get_attr (longhaul_table, policy->cpu); - -return 0 ; +return cpufreq_table_validate_and_show (policy, longhaul_table); }static int longhaul_cpu_exit (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 27/228 cpufreq: loongson2: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/loongson2_cpufreq.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/cpufreq/loongson2_cpufreq.c +1 -4
@@ -133,10 +133,7 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->cur =loongson2_cpufreq_get (policy->cpu); -cpufreq_frequency_table_get_attr (&loongson2_clockmod_table[0 ], - policy->cpu); - -return cpufreq_frequency_table_cpuinfo (policy, +return cpufreq_table_validate_and_show (policy, &loongson2_clockmod_table[0 ]); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 28/228 cpufreq: maple: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/maple-cpufreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/maple-cpufreq.c +1 -3
@@ -181,10 +181,8 @@ static int maple_cpufreq_cpu_init(struct cpufreq_policy *policy)* cpufreq core if in the secondary policy we tell it that * it actually must be one policy together with all others. */ cpumask_setall (policy->cpus); -cpufreq_frequency_table_get_attr (maple_cpu_freqs, policy->cpu); -return cpufreq_frequency_table_cpuinfo (policy, - maple_cpu_freqs); +return cpufreq_table_validate_and_show (policy, maple_cpu_freqs); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 29/228 cpufreq: omap: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/omap-cpufreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/omap-cpufreq.c +1 -3
@@ -191,12 +191,10 @@ static int omap_cpu_init(struct cpufreq_policy *policy)atomic_inc_return (&freq_table_users); - result =cpufreq_frequency_table_cpuinfo (policy, freq_table); + result =cpufreq_table_validate_and_show (policy, freq_table);if (result) goto fail_table; -cpufreq_frequency_table_get_attr (freq_table, policy->cpu); - policy->cur =omap_getspeed (policy->cpu);/*
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 30/228 cpufreq: p4-clockmod: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/p4-clockmod.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/p4-clockmod.c +1 -2
@@ -230,7 +230,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)else p4clockmod_table[i].frequency = (stock_freq * i)/8 ; } -cpufreq_frequency_table_get_attr (p4clockmod_table, policy->cpu);/* cpuinfo and default policy values */
@@ -239,7 +238,7 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =10000001 ; policy->cur = stock_freq; -return cpufreq_frequency_table_cpuinfo (policy, &p4clockmod_table[0 ]); +return cpufreq_table_validate_and_show (policy, &p4clockmod_table[0 ]); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 31/228 cpufreq: pasemi: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/pasemi-cpufreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/pasemi-cpufreq.c +1 -3
@@ -219,12 +219,10 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) ppc_proc_freq = policy->cur *1000ul ; -cpufreq_frequency_table_get_attr (pas_freqs, policy->cpu); -/* this ensures that policy->cpuinfo_min and policy->cpuinfo_max * are set correctly */ -return cpufreq_frequency_table_cpuinfo (policy, pas_freqs); +return cpufreq_table_validate_and_show (policy, pas_freqs); out_unmap_sdcpwr:iounmap (sdcpwr_mapbase);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 32/228 cpufreq: pmac: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/pmac32-cpufreq.c | 3 +-- drivers/cpufreq/pmac64-cpufreq.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/cpufreq/pmac32-cpufreq.c +1 -2
@@ -408,8 +408,7 @@ static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = transition_latency; policy->cur = cur_freq; -cpufreq_frequency_table_get_attr (pmac_cpu_freqs, policy->cpu); -return cpufreq_frequency_table_cpuinfo (policy, pmac_cpu_freqs); +return cpufreq_table_validate_and_show (policy, pmac_cpu_freqs); }static u32 read_gpio (struct device_node *np)
drivers/cpufreq/pmac64-cpufreq.c +1 -3
@@ -363,10 +363,8 @@ static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)* cpufreq core if in the secondary policy we tell it that * it actually must be one policy together with all others. */ cpumask_copy (policy->cpus, cpu_online_mask); -cpufreq_frequency_table_get_attr (g5_cpu_freqs, policy->cpu); -return cpufreq_frequency_table_cpuinfo (policy, - g5_cpu_freqs); +return cpufreq_table_validate_and_show (policy, g5_cpu_freqs); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 33/228 cpufreq: powernow: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/powernow-k6.c | 9 +-------- drivers/cpufreq/powernow-k7.c | 4 +--- drivers/cpufreq/powernow-k8.c | 4 +--- 3 files changed, 3 insertions(+), 14 deletions(-)
drivers/cpufreq/powernow-k6.c +1 -8
@@ -145,7 +145,6 @@ static int powernow_k6_target(struct cpufreq_policy *policy,static int powernow_k6_cpu_init (struct cpufreq_policy *policy) {unsigned int i, f; -int result;if (policy->cpu !=0 )return -ENODEV ;
@@ -167,13 +166,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =200000 ; policy->cur = busfreq * max_multiplier; - result =cpufreq_frequency_table_cpuinfo (policy, clock_ratio); -if (result) -return result; - -cpufreq_frequency_table_get_attr (clock_ratio, policy->cpu); - -return 0 ; +return cpufreq_table_validate_and_show (policy, clock_ratio); }
drivers/cpufreq/powernow-k7.c +1 -3
@@ -680,9 +680,7 @@ static int powernow_cpu_init(struct cpufreq_policy *policy) policy->cur =powernow_get (0 ); -cpufreq_frequency_table_get_attr (powernow_table, policy->cpu); - -return cpufreq_frequency_table_cpuinfo (policy, powernow_table); +return cpufreq_table_validate_and_show (policy, powernow_table); }static int powernow_cpu_exit (struct cpufreq_policy *policy)
drivers/cpufreq/powernow-k8.c +1 -3
@@ -1176,7 +1176,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)pr_debug ("policy current frequency %d kHz\n" , pol->cur);/* min/max the cpu is capable of */ -if (cpufreq_frequency_table_cpuinfo (pol, data->powernow_table)) { +if (cpufreq_table_validate_and_show (pol, data->powernow_table)) { printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n");powernow_k8_cpu_exit_acpi (data);kfree (data->powernow_table);
@@ -1184,8 +1184,6 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)return -EINVAL ; } -cpufreq_frequency_table_get_attr (data->powernow_table, pol->cpu); -pr_debug ("cpu_init done, current fid 0x%x, vid 0x%x\n" , data->currfid, data->currvid);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 34/228 cpufreq: ppc: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/ppc-corenet-cpufreq.c | 3 +-- drivers/cpufreq/ppc_cbe_cpufreq.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/cpufreq/ppc-corenet-cpufreq.c +1 -2
@@ -202,7 +202,7 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy) table[i].frequency =CPUFREQ_TABLE_END ;/* set the min and max frequency properly */ - ret =cpufreq_frequency_table_cpuinfo (policy, table); + ret =cpufreq_table_validate_and_show (policy, table);if (ret) {pr_err ("invalid frequency table: %d\n" , ret); goto err_nomem1;
@@ -219,7 +219,6 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; policy->cur =corenet_cpufreq_get_speed (policy->cpu); -cpufreq_frequency_table_get_attr (table, cpu);of_node_put (np);return 0 ;
drivers/cpufreq/ppc_cbe_cpufreq.c +1 -3
@@ -123,11 +123,9 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)cpumask_copy (policy->cpus,cpu_sibling_mask (policy->cpu));#endif -cpufreq_frequency_table_get_attr (cbe_freqs, policy->cpu); -/* this ensures that policy->cpuinfo_min * and policy->cpuinfo_max are set correctly */ -return cpufreq_frequency_table_cpuinfo (policy, cbe_freqs); +return cpufreq_table_validate_and_show (policy, cbe_freqs); }static int cbe_cpufreq_cpu_exit (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 35/228 cpufreq: pxa: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/pxa2xx-cpufreq.c | 6 ++---- drivers/cpufreq/pxa3xx-cpufreq.c | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-)
drivers/cpufreq/pxa2xx-cpufreq.c +2 -4
@@ -454,12 +454,10 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)pr_info ("PXA255 cpufreq using %s frequency table\n" , pxa255_turbo_table ?"turbo" :"run" ); -cpufreq_frequency_table_cpuinfo (policy, pxa255_freq_table); -cpufreq_frequency_table_get_attr (pxa255_freq_table, policy->cpu); +cpufreq_table_validate_and_show (policy, pxa255_freq_table); }else if (cpu_is_pxa27x ()) { -cpufreq_frequency_table_cpuinfo (policy, pxa27x_freq_table); -cpufreq_frequency_table_get_attr (pxa27x_freq_table, policy->cpu); +cpufreq_table_validate_and_show (policy, pxa27x_freq_table); }printk (KERN_INFO "PXA CPU frequency change support initialized\n" );
drivers/cpufreq/pxa3xx-cpufreq.c +2 -6
@@ -91,7 +91,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy, struct pxa3xx_freq_info *freqs, int num) {struct cpufreq_frequency_table *table; -int i, ret; +int i; table =kzalloc ((num +1 ) *sizeof (*table),GFP_KERNEL );if (table ==NULL )
@@ -108,11 +108,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy, pxa3xx_freqs_num = num; pxa3xx_freqs_table = table; - ret =cpufreq_frequency_table_cpuinfo (policy, table); -if (!ret) -cpufreq_frequency_table_get_attr (table, policy->cpu); - -return ret; +return cpufreq_table_validate_and_show (policy, table); }static void __update_core_freq (struct pxa3xx_freq_info *info)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 36/228 cpufreq: s3cx4xx: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/s3c2416-cpufreq.c | 4 +--- drivers/cpufreq/s3c24xx-cpufreq.c | 6 ++---- drivers/cpufreq/s3c64xx-cpufreq.c | 5 +---- 3 files changed, 4 insertions(+), 11 deletions(-)
drivers/cpufreq/s3c2416-cpufreq.c +1 -3
@@ -494,12 +494,10 @@ static int __init s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = (500 *1000 ) + s3c_freq->regulator_latency; - ret =cpufreq_frequency_table_cpuinfo (policy, s3c_freq->freq_table); + ret =cpufreq_table_validate_and_show (policy, s3c_freq->freq_table);if (ret) goto err_freq_table; -cpufreq_frequency_table_get_attr (s3c_freq->freq_table,0 ); -register_reboot_notifier (&s3c2416_cpufreq_reboot_notifier);return 0 ;
drivers/cpufreq/s3c24xx-cpufreq.c +2 -4
@@ -386,10 +386,8 @@ static int s3c_cpufreq_init(struct cpufreq_policy *policy)/* feed the latency information from the cpu driver */ policy->cpuinfo.transition_latency = cpu_cur.info->latency; -if (ftab) { -cpufreq_frequency_table_cpuinfo (policy, ftab); -cpufreq_frequency_table_get_attr (ftab, policy->cpu); - } +if (ftab) +return cpufreq_table_validate_and_show (policy, ftab);return 0 ; }
drivers/cpufreq/s3c64xx-cpufreq.c +1 -4
@@ -251,15 +251,12 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)*/ policy->cpuinfo.transition_latency = (500 *1000 ) + regulator_latency; - ret =cpufreq_frequency_table_cpuinfo (policy, s3c64xx_freq_table); + ret =cpufreq_table_validate_and_show (policy, s3c64xx_freq_table);if (ret !=0 ) {pr_err ("Failed to configure frequency table: %d\n" , ret);regulator_put (vddarm);clk_put (armclk); - }else { -cpufreq_frequency_table_get_attr (s3c64xx_freq_table, - policy->cpu); }return ret;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 37/228 cpufreq: s5pv210: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/s5pv210-cpufreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/s5pv210-cpufreq.c +1 -3
@@ -553,11 +553,9 @@ static int __init s5pv210_cpu_init(struct cpufreq_policy *policy) policy->cur = policy->min = policy->max =s5pv210_getspeed (0 ); -cpufreq_frequency_table_get_attr (s5pv210_freq_table, policy->cpu); - policy->cpuinfo.transition_latency =40000 ; -return cpufreq_frequency_table_cpuinfo (policy, s5pv210_freq_table); +return cpufreq_table_validate_and_show (policy, s5pv210_freq_table); out_dmc1:clk_put (dmc0_clk);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 38/228 cpufreq: sa11x0: Expose frequency table
In reply to Viresh KumarThis patch exposes sa11x0's frequency table to cpufreq core. It always existed but not as an array frequencies and not in the format cpufreq core wants it to. Also it was present in the unit of 100kHz earlier which is made consistent with cpufreq core now, i.e. kHz.
--- arch/arm/mach-sa1100/generic.c | 45 ++++++++++++++++++++-------------------- arch/arm/mach-sa1100/generic.h | 1 + drivers/cpufreq/sa1100-cpufreq.c | 3 ++- drivers/cpufreq/sa1110-cpufreq.c | 3 ++- 4 files changed, 27 insertions(+), 25 deletions(-)
arch/arm/mach-sa1100/generic.c +22 -23
@@ -42,23 +42,24 @@ EXPORT_SYMBOL(reset_status);/* * This table is setup for a 3.6864MHz Crystal. */ -static const unsigned short cclk_frequency_100khz[NR_FREQS ] = { -590 ,/* 59.0 MHz */ -737 ,/* 73.7 MHz */ -885 ,/* 88.5 MHz */ -1032 ,/* 103.2 MHz */ -1180 ,/* 118.0 MHz */ -1327 ,/* 132.7 MHz */ -1475 ,/* 147.5 MHz */ -1622 ,/* 162.2 MHz */ -1769 ,/* 176.9 MHz */ -1917 ,/* 191.7 MHz */ -2064 ,/* 206.4 MHz */ -2212 ,/* 221.2 MHz */ -2359 ,/* 235.9 MHz */ -2507 ,/* 250.7 MHz */ -2654 ,/* 265.4 MHz */ -2802 /* 280.2 MHz */ +struct cpufreq_frequency_table sa11x0_freq_table[NR_FREQS +1 ] = { + { .frequency =59000 ,/* 59.0 MHz */ }, + { .frequency =73700 ,/* 73.7 MHz */ }, + { .frequency =88500 ,/* 88.5 MHz */ }, + { .frequency =103200 ,/* 103.2 MHz */ }, + { .frequency =118000 ,/* 118.0 MHz */ }, + { .frequency =132700 ,/* 132.7 MHz */ }, + { .frequency =147500 ,/* 147.5 MHz */ }, + { .frequency =162200 ,/* 162.2 MHz */ }, + { .frequency =176900 ,/* 176.9 MHz */ }, + { .frequency =191700 ,/* 191.7 MHz */ }, + { .frequency =206400 ,/* 206.4 MHz */ }, + { .frequency =221200 ,/* 221.2 MHz */ }, + { .frequency =235900 ,/* 235.9 MHz */ }, + { .frequency =250700 ,/* 250.7 MHz */ }, + { .frequency =265400 ,/* 265.4 MHz */ }, + { .frequency =280200 ,/* 280.2 MHz */ }, + { .frequency =CPUFREQ_TABLE_END , }, };/* rounds up(!) */
@@ -66,10 +67,8 @@ unsigned int sa11x0_freq_to_ppcr(unsigned int khz) {int i; - khz /=100 ; -for (i =0 ; i <NR_FREQS ; i++) -if (cclk_frequency_100khz[i] >= khz) +if (sa11x0_freq_table[i].frequency >= khz)break ;return i;
@@ -79,7 +78,7 @@ unsigned int sa11x0_ppcr_to_freq(unsigned int idx) {unsigned int freq =0 ;if (idx <NR_FREQS ) - freq = cclk_frequency_100khz[idx] *100 ; + freq = sa11x0_freq_table[idx].frequency;return freq; }
@@ -96,7 +95,7 @@ int sa11x0_verify_speed(struct cpufreq_policy *policy)cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);/* make sure that at least one frequency is within the policy */ - tmp = cclk_frequency_100khz[sa11x0_freq_to_ppcr (policy->min)] *100 ; + tmp = sa11x0_freq_table[sa11x0_freq_to_ppcr (policy->min)].frequency;if (tmp > policy->max) policy->max = tmp;
@@ -109,7 +108,7 @@ unsigned int sa11x0_getspeed(unsigned int cpu) {if (cpu)return 0 ; -return cclk_frequency_100khz[PPCR &0xf ] *100 ; +return sa11x0_freq_table[PPCR &0xf ].frequency; }/*
arch/arm/mach-sa1100/generic.h +1 -0
@@ -21,6 +21,7 @@ extern void sa1110_mb_disable(void);struct cpufreq_policy ; +extern struct cpufreq_frequency_table sa11x0_freq_table[];extern unsigned int sa11x0_freq_to_ppcr (unsigned int khz);extern int sa11x0_verify_speed (struct cpufreq_policy *policy);extern unsigned int sa11x0_getspeed (unsigned int cpu);
drivers/cpufreq/sa1100-cpufreq.c +2 -1
@@ -224,7 +224,8 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.min_freq =59000 ; policy->cpuinfo.max_freq =287000 ; policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; -return 0 ; + +return cpufreq_table_validate_and_show (policy, sa11x0_freq_table); }static struct cpufreq_driver sa1100_driver__refdata = {
drivers/cpufreq/sa1110-cpufreq.c +2 -1
@@ -338,7 +338,8 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.min_freq =59000 ; policy->cpuinfo.max_freq =287000 ; policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; -return 0 ; + +return cpufreq_table_validate_and_show (policy, sa11x0_freq_table); }/* sa1110_driver needs __refdata because it must remain after init registers
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 038/228] cpufreq: sa11x0: Expose frequency table
Quoted 6 lines · Viresh Kumar
This patch exposes sa11x0's frequency table to cpufreq core. It always existed but not as an array frequencies and not in the format cpufreq core wants it to. Also it was present in the unit of 100kHz earlier which is made consistent with cpufreq core now, i.e. kHz.
Signed-off-by Viresh Kumar <[email protected]>
Re: [PATCH 038/228] cpufreq: sa11x0: Expose frequency table
In reply to Viresh KumarQuoted 6 lines · Viresh Kumar
This patch exposes sa11x0's frequency table to cpufreq core. It always existed but not as an array frequencies and not in the format cpufreq core wants it to. Also it was present in the unit of 100kHz earlier which is made consistent with cpufreq core now, i.e. kHz.
Signed-off-by Viresh Kumar <[email protected]>
This causes breakage in linux-next for any SA1100 target:
In file included from ../../arch/arm/mach-sa1100/irq.c:24:0:../../arch/arm/mach-sa1100/generic.h:24:39: error: array type has incomplete element type
extern struct cpufreq_frequency_table sa11x0_freq_table[];
-Olof
Viresh Kumar
maintainerRe: [PATCH 038/228] cpufreq: sa11x0: Expose frequency table
Quoted 6 lines · Olof Johansson
This causes breakage in linux-next for any SA1100 target:
In file included from
../../arch/arm/mach-sa1100/irq.c:24:0:../../arch/arm/mach-sa1100/generic.h:24:39: error: array type has incomplete element type
extern structcpufreq_frequency_tablesa11x0_freq_table[];
Ahh... sorry!! Below diff fixes it..
@Rafael: Please merge the attached fixup patch with $SUBJECT patch.
------x--------------x-----------
commit d2e1eb969ebdb66e3cc199fbbbe2e2a1a8e2960b
Author: Viresh Kumar <[email protected]> Date: Fri Oct 4 10:48:16 2013 +0530
fixup! cpufreq: sa11x0: Expose frequency table
--- arch/arm/mach-sa1100/generic.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-sa1100/generic.h +1 -2
@@ -3,6 +3,7 @@* * Author: Nicolas Pitre */ +#include <linux/cpufreq.h> #include <linux/reboot.h> extern void sa1100_timer_init (void );
@@ -19,8 +20,6 @@ extern void sa11x0_init_late(void);extern void sa1110_mb_enable (void );extern void sa1110_mb_disable (void ); -struct cpufreq_policy ; -extern struct cpufreq_frequency_table sa11x0_freq_table[];extern unsigned int sa11x0_freq_to_ppcr (unsigned int khz);extern int sa11x0_verify_speed (struct cpufreq_policy *policy);
From d2e1eb969ebdb66e3cc199fbbbe2e2a1a8e2960b Mon Sep 17 00:00:00 2001
Message-Id: <d2e1eb969ebdb66e3cc199fbbbe2e2a1a8e2960b.1380863979.git.viresh.kumar@linaro.org>
From: Viresh Kumar <[email protected]>
Date: Fri, 4 Oct 2013 10:48:16 +0530
Subject: [PATCH] fixup! cpufreq: sa11x0: Expose frequency table
--- arch/arm/mach-sa1100/generic.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-sa1100/generic.h +1 -2
@@ -3,6 +3,7 @@* * Author: Nicolas Pitre */ +#include <linux/cpufreq.h> #include <linux/reboot.h> extern void sa1100_timer_init (void );
@@ -19,8 +20,6 @@ extern void sa11x0_init_late(void);extern void sa1110_mb_enable (void );extern void sa1110_mb_disable (void ); -struct cpufreq_policy ; -extern struct cpufreq_frequency_table sa11x0_freq_table[];extern unsigned int sa11x0_freq_to_ppcr (unsigned int khz);extern int sa11x0_verify_speed (struct cpufreq_policy *policy);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 39/228 cpufreq: sa11x0: let cpufreq core initialize struct policy fields
In reply to Viresh KumarMany fields of struct policy are filled by cpufreq core when we call cpufreq_table_validate_and_show() and so cpufreq driver doesn't need to set them anymore.
--- drivers/cpufreq/sa1100-cpufreq.c | 4 +--- drivers/cpufreq/sa1110-cpufreq.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/cpufreq/sa1100-cpufreq.c +1 -3
@@ -220,9 +220,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy) {if (policy->cpu !=0 )return -EINVAL ; - policy->cur = policy->min = policy->max =sa11x0_getspeed (0 ); - policy->cpuinfo.min_freq =59000 ; - policy->cpuinfo.max_freq =287000 ; + policy->cur =sa11x0_getspeed (0 ); policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ;return cpufreq_table_validate_and_show (policy, sa11x0_freq_table);
drivers/cpufreq/sa1110-cpufreq.c +1 -3
@@ -334,9 +334,7 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy) {if (policy->cpu !=0 )return -EINVAL ; - policy->cur = policy->min = policy->max =sa11x0_getspeed (0 ); - policy->cpuinfo.min_freq =59000 ; - policy->cpuinfo.max_freq =287000 ; + policy->cur =sa11x0_getspeed (0 ); policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ;return cpufreq_table_validate_and_show (policy, sa11x0_freq_table);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 039/228] cpufreq: sa11x0: let cpufreq core initialize struct policy fields
Quoted 5 lines · Viresh Kumar
Many fields of struct policy are filled by cpufreq core when we call
cpufreq_table_validate_and_show()and so cpufreq driver doesn't need to set them anymore.Signed-off-by Viresh Kumar <[email protected]>
Viresh Kumar
maintainerPATCH 40/228 cpufreq: sc520: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/sc520_freq.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/cpufreq/sc520_freq.c +1 -8
@@ -106,7 +106,6 @@ static int sc520_freq_target(struct cpufreq_policy *policy,static int sc520_freq_cpu_init (struct cpufreq_policy *policy) {struct cpuinfo_x86 *c = &cpu_data (0 ); -int result;/* capability check */ if (c->x86_vendor != X86_VENDOR_AMD ||
@@ -117,13 +116,7 @@ static int sc520_freq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =1000000 ;/* 1ms */ policy->cur =sc520_freq_get_cpu_frequency (0 ); - result =cpufreq_frequency_table_cpuinfo (policy, sc520_freq_table); -if (result) -return result; - -cpufreq_frequency_table_get_attr (sc520_freq_table, policy->cpu); - -return 0 ; +return cpufreq_table_validate_and_show (policy, sc520_freq_table); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 41/228 cpufreq: sh: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/sh-cpufreq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/cpufreq/sh-cpufreq.c +3 -3
@@ -117,9 +117,9 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)if (freq_table) {int result; - result =cpufreq_frequency_table_cpuinfo (policy, freq_table); -if (!result) -cpufreq_frequency_table_get_attr (freq_table, cpu); + result =cpufreq_table_validate_and_show (policy, freq_table); +if (result) +return result; }else {dev_notice (dev,"no frequency table found, falling back " "to rate rounding.\n" );
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 42/228 cpufreq: sparc: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/sparc-us2e-cpufreq.c | 6 +----- drivers/cpufreq/sparc-us3-cpufreq.c | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-)
drivers/cpufreq/sparc-us2e-cpufreq.c +1 -5
@@ -307,7 +307,6 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)unsigned long clock_tick =sparc64_get_clock_tick (cpu) /1000 ;struct cpufreq_frequency_table *table = &us2e_freq_table[cpu].table[0 ]; -int ret; table[0 ].driver_data =0 ; table[0 ].frequency = clock_tick /1 ;
@@ -325,10 +324,7 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =0 ; policy->cur = clock_tick; - ret =cpufreq_frequency_table_cpuinfo (policy, table); -if (!ret) -cpufreq_frequency_table_get_attr (table, policy->cpu); -return ret; +return cpufreq_table_validate_and_show (policy, table); }static int us2e_freq_cpu_exit (struct cpufreq_policy *policy)
drivers/cpufreq/sparc-us3-cpufreq.c +1 -6
@@ -168,7 +168,6 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)unsigned long clock_tick =sparc64_get_clock_tick (cpu) /1000 ;struct cpufreq_frequency_table *table = &us3_freq_table[cpu].table[0 ]; -int ret; table[0 ].driver_data =0 ; table[0 ].frequency = clock_tick /1 ;
@@ -182,11 +181,7 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =0 ; policy->cur = clock_tick; - ret =cpufreq_frequency_table_cpuinfo (policy, table); -if (!ret) -cpufreq_frequency_table_get_attr (table, policy->cpu); - -return ret; +return cpufreq_table_validate_and_show (policy, table); }static int us3_freq_cpu_exit (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 042/228] cpufreq: sparc: use cpufreq_table_validate_and_show()
From: Viresh Kumar <[email protected]>
Date: Fri, 13 Sep 2013 18:29:48 +0530
Quoted 6 lines
Lets use
cpufreq_table_validate_and_show()instead of callingcpufreq_frequency_table_cpuinfo()andcpufreq_frequency_table_get_attr().Cc David S. Miller <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
Viresh Kumar
maintainerPATCH 43/228 cpufreq: spear: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/spear-cpufreq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/cpufreq/spear-cpufreq.c +2 -3
@@ -178,13 +178,12 @@ static int spear_cpufreq_init(struct cpufreq_policy *policy) {int ret; - ret =cpufreq_frequency_table_cpuinfo (policy, spear_cpufreq.freq_tbl); + ret =cpufreq_table_validate_and_show (policy, spear_cpufreq.freq_tbl);if (ret) { -pr_err ("cpufreq_frequency_table_cpuinfo() failed" ); +pr_err ("cpufreq_table_validate_and_show() failed" );return ret; } -cpufreq_frequency_table_get_attr (spear_cpufreq.freq_tbl, policy->cpu); policy->cpuinfo.transition_latency = spear_cpufreq.transition_latency; policy->cur =spear_cpufreq_get (0 );
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 44/228 cpufreq: speedstep: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/speedstep-centrino.c | 10 +--------- drivers/cpufreq/speedstep-ich.c | 9 +-------- drivers/cpufreq/speedstep-smi.c | 8 +------- 3 files changed, 3 insertions(+), 24 deletions(-)
drivers/cpufreq/speedstep-centrino.c +1 -9
@@ -345,7 +345,6 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)struct cpuinfo_x86 *cpu = &cpu_data (policy->cpu);unsigned freq;unsigned l, h; -int ret;int i;/* Only Intel makes Enhanced Speedstep-capable CPUs */
@@ -402,15 +401,8 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)pr_debug ("centrino_cpu_init: cur=%dkHz\n" , policy->cur); - ret =cpufreq_frequency_table_cpuinfo (policy, +return cpufreq_table_validate_and_show (policy,per_cpu (centrino_model, policy->cpu)->op_points); -if (ret) -return (ret); - -cpufreq_frequency_table_get_attr ( -per_cpu (centrino_model, policy->cpu)->op_points, policy->cpu); - -return 0 ; }static int centrino_cpu_exit (struct cpufreq_policy *policy)
drivers/cpufreq/speedstep-ich.c +1 -8
@@ -320,7 +320,6 @@ static void get_freqs_on_cpu(void *_get_freqs)static int speedstep_cpu_init (struct cpufreq_policy *policy) { -int result;unsigned int policy_cpu, speed;struct get_freqs gf;
@@ -349,13 +348,7 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)/* cpuinfo and default policy values */ policy->cur = speed; - result =cpufreq_frequency_table_cpuinfo (policy, speedstep_freqs); -if (result) -return result; - -cpufreq_frequency_table_get_attr (speedstep_freqs, policy->cpu); - -return 0 ; +return cpufreq_table_validate_and_show (policy, speedstep_freqs); }
drivers/cpufreq/speedstep-smi.c +1 -7
@@ -329,13 +329,7 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; policy->cur = speed; - result =cpufreq_frequency_table_cpuinfo (policy, speedstep_freqs); -if (result) -return result; - -cpufreq_frequency_table_get_attr (speedstep_freqs, policy->cpu); - -return 0 ; +return cpufreq_table_validate_and_show (policy, speedstep_freqs); }static int speedstep_cpu_exit (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 45/228 cpufreq: tegra: use cpufreq_table_validate_and_show()
In reply to Viresh KumarLets use cpufreq_table_validate_and_show() instead of calling cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().
--- drivers/cpufreq/tegra-cpufreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/tegra-cpufreq.c +1 -2
@@ -215,8 +215,7 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)clk_prepare_enable (emc_clk);clk_prepare_enable (cpu_clk); -cpufreq_frequency_table_cpuinfo (policy, freq_table); -cpufreq_frequency_table_get_attr (freq_table, policy->cpu); +cpufreq_table_validate_and_show (policy, freq_table); policy->cur =tegra_getspeed (policy->cpu); target_cpu_speed[policy->cpu] = policy->cur;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 46/228 cpufreq: tegra: fix implementation of ->exit()
In reply to Viresh Kumar->exit() of drivers should call cpufreq_frequency_table_put_attr() if they have called cpufreq_frequency_table_get_attr() earlier in init() and they aren't required to validate their cpufreq table in exit by calling cpufreq_frequency_table_cpuinfo(). Tegra's driver wasn't calling cpufreq_frequency_table_put_attr() and was calling cpufreq_frequency_table_cpuinfo() in exit.
Fix both these issues in it.
--- drivers/cpufreq/tegra-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/tegra-cpufreq.c +1 -1
@@ -232,7 +232,7 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)static int tegra_cpu_exit (struct cpufreq_policy *policy) { -cpufreq_frequency_table_cpuinfo (policy, freq_table); +cpufreq_frequency_table_put_attr (policy->cpu);clk_disable_unprepare (emc_clk);return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 47/228 cpufreq: at32ap: add frequency table
In reply to Viresh KumarFrom: Hans-Christian Egtvedt <[email protected]>
This patch adds a dynamically calculated frequency table to the at32ap driver. In short the architecture can scale in power of two between a maximum and minimum frequency. Min, max, and the steps in between are added to the table.
--- drivers/cpufreq/at32ap-cpufreq.c | 49 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-)
drivers/cpufreq/at32ap-cpufreq.c +46 -3
@@ -19,8 +19,10 @@#include <linux/clk.h> #include <linux/err.h> #include <linux/export.h> +#include <linux/slab.h> static struct clk *cpuclk; +static struct cpufreq_frequency_table *freq_table;static int at32_verify_speed (struct cpufreq_policy *policy) {
@@ -85,13 +87,17 @@ static int at32_set_target(struct cpufreq_policy *policy,static int __init at32_cpufreq_driver_init (struct cpufreq_policy *policy) { +unsigned int frequency, rate; +int retval, steps, i; +if (policy->cpu !=0 )return -EINVAL ; cpuclk =clk_get (NULL ,"cpu" );if (IS_ERR (cpuclk)) {pr_debug ("cpufreq: could not get CPU clk\n" ); -return PTR_ERR (cpuclk); + retval =PTR_ERR (cpuclk); + goto out_err; } policy->cpuinfo.min_freq = (clk_round_rate (cpuclk,1 ) +500 ) /1000 ;
@@ -101,9 +107,46 @@ static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy) policy->min = policy->cpuinfo.min_freq; policy->max = policy->cpuinfo.max_freq; -printk ("cpufreq: AT32AP CPU frequency driver\n" ); +/* +* AVR32 CPU frequency rate scales in power of two between maximum and +* minimum, also add space for the table end marker. +* +* Further validate that the frequency is usable, and append it to the +* frequency table. +*/ + steps =fls (policy->cpuinfo.max_freq / policy->cpuinfo.min_freq) +1 ; + freq_table =kzalloc (steps *sizeof (struct cpufreq_frequency_table ), +GFP_KERNEL ); +if (!freq_table) { + retval = -ENOMEM ; + goto out_err_put_clk; + } -return 0 ; + frequency = policy->cpuinfo.max_freq; +for (i =0 ; i < (steps -1 ); i++) { + rate =clk_round_rate (cpuclk, frequency *1000 ) /1000 ; + +if (rate != frequency) + freq_table[i].frequency =CPUFREQ_ENTRY_INVALID ; +else + freq_table[i].frequency = frequency; + + frequency /=2 ; + } + + freq_table[steps -1 ].frequency =CPUFREQ_TABLE_END ; + + retval =cpufreq_table_validate_and_show (policy, freq_table); +if (!retval) { +printk ("cpufreq: AT32AP CPU frequency driver\n" ); +return 0 ; + } + +kfree (freq_table); +out_err_put_clk: +clk_put (cpuclk); +out_err: +return retval; }static struct cpufreq_driver at32_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 48/228 cpufreq: arm_big_little: call cpufreq_frequency_table_put_attr()
In reply to Viresh KumarDrivers which have an exit path must call cpufreq_frequency_table_put_attr() if they have called cpufreq_frequency_table_get_attr() in their init path.
This driver was missing this part and is fixed with this patch.
--- drivers/cpufreq/arm_big_little.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/arm_big_little.c +1 -0
@@ -198,6 +198,7 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy)return -ENODEV ; } +cpufreq_frequency_table_put_attr (policy->cpu);put_cluster_clk_and_freq_table (cpu_dev);dev_dbg (cpu_dev,"%s: Exited, cpu: %d\n" , __func__, policy->cpu);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 49/228 cpufreq: blackfin: call cpufreq_frequency_table_put_attr()
In reply to Viresh KumarDrivers which have an exit path must call cpufreq_frequency_table_put_attr() if they have called cpufreq_frequency_table_get_attr() in their init path.
This driver was missing this part and is fixed with this patch.
--- drivers/cpufreq/blackfin-cpufreq.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/cpufreq/blackfin-cpufreq.c +7 -0
@@ -213,6 +213,12 @@ static int __bfin_cpu_init(struct cpufreq_policy *policy)return cpufreq_table_validate_and_show (policy, bfin_freq_table); } +static int __bfin_cpu_exit (struct cpufreq_policy *policy) +{ + +cpufreq_frequency_table_put_attr (policy->cpu); +} +static struct freq_attr *bfin_freq_attr[] = { &cpufreq_freq_attr_scaling_available_freqs,NULL ,
@@ -223,6 +229,7 @@ static struct cpufreq_driver bfin_driver = { .target = bfin_target, .get = bfin_getfreq_khz, .init = __bfin_cpu_init, + .exit = __bfin_cpu_exit, .name = "bfin cpufreq", .attr = bfin_freq_attr, };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 50/228 cpufreq: exynos: call cpufreq_frequency_table_put_attr()
In reply to Viresh KumarDrivers which have an exit path must call cpufreq_frequency_table_put_attr() if they have called cpufreq_frequency_table_get_attr() in their init path.
This driver was missing this part and is fixed with this patch.
--- drivers/cpufreq/exynos5440-cpufreq.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/cpufreq/exynos5440-cpufreq.c +6 -0
@@ -342,12 +342,18 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)return 0 ; } +static int exynos_cpufreq_cpu_exit (struct cpufreq_policy *policy) +{ +cpufreq_frequency_table_put_attr (policy->cpu); +} +static struct cpufreq_driver exynos_driver = { .flags =CPUFREQ_STICKY |CPUFREQ_ASYNC_NOTIFICATION , .verify = exynos_verify_speed, .target = exynos_target, .get = exynos_getspeed, .init = exynos_cpufreq_cpu_init, + .exit = exynos_cpufreq_cpu_exit, .name =CPUFREQ_NAME , };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 51/228 cpufreq: loongson2: call cpufreq_frequency_table_put_attr()
In reply to Viresh KumarDrivers which have an exit path must call cpufreq_frequency_table_put_attr() if they have called cpufreq_frequency_table_get_attr() in their init path.
This driver was missing this part and is fixed with this patch.
--- drivers/cpufreq/loongson2_cpufreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/loongson2_cpufreq.c +1 -0
@@ -145,6 +145,7 @@ static int loongson2_cpufreq_verify(struct cpufreq_policy *policy)static int loongson2_cpufreq_exit (struct cpufreq_policy *policy) { +cpufreq_frequency_table_put_attr (policy->cpu);clk_put (cpuclk);return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 52/228 cpufreq: omap: call cpufreq_frequency_table_put_attr()
In reply to Viresh KumarDrivers which have an exit path must call cpufreq_frequency_table_put_attr() if they have called cpufreq_frequency_table_get_attr() in their init path.
This driver was missing this part and is fixed with this patch.
--- drivers/cpufreq/omap-cpufreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/omap-cpufreq.c +1 -0
@@ -221,6 +221,7 @@ fail_ck:static int omap_cpu_exit (struct cpufreq_policy *policy) { +cpufreq_frequency_table_put_attr (policy->cpu);freq_table_free ();clk_put (mpu_clk);return 0 ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 53/228 cpufreq: pxa: call cpufreq_frequency_table_put_attr()
In reply to Viresh KumarDrivers which have an exit path must call cpufreq_frequency_table_put_attr() if they have called cpufreq_frequency_table_get_attr() in their init path.
This driver was missing this part and is fixed with this patch.
--- drivers/cpufreq/pxa2xx-cpufreq.c | 6 ++++++ drivers/cpufreq/pxa3xx-cpufreq.c | 6 ++++++ 2 files changed, 12 insertions(+)
drivers/cpufreq/pxa2xx-cpufreq.c +6 -0
@@ -465,10 +465,16 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)return 0 ; } +static int pxa_cpufreq_exit (struct cpufreq_policy *policy) +{ +cpufreq_frequency_table_put_attr (policy->cpu); +} +static struct cpufreq_driver pxa_cpufreq_driver = { .verify = pxa_verify_policy, .target = pxa_set_target, .init = pxa_cpufreq_init, + .exit = pxa_cpufreq_exit, .get = pxa_cpufreq_get, .name ="PXA2xx" , };
drivers/cpufreq/pxa3xx-cpufreq.c +6 -0
@@ -229,10 +229,16 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)return 0 ; } +static int pxa3xx_cpufreq_exit (struct cpufreq_policy *policy) +{ +cpufreq_frequency_table_put_attr (policy->cpu); +} +static struct cpufreq_driver pxa3xx_cpufreq_driver = { .verify = pxa3xx_cpufreq_verify, .target = pxa3xx_cpufreq_set, .init = pxa3xx_cpufreq_init, + .exit = pxa3xx_cpufreq_exit, .get = pxa3xx_cpufreq_get, .name ="pxa3xx-cpufreq" , };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 54/228 cpufreq: sparc: call cpufreq_frequency_table_put_attr()
In reply to Viresh KumarDrivers which have an exit path must call cpufreq_frequency_table_put_attr() if they have called cpufreq_frequency_table_get_attr() in their init path.
This driver was missing this part and is fixed with this patch.
--- drivers/cpufreq/sparc-us2e-cpufreq.c | 4 +++- drivers/cpufreq/sparc-us3-cpufreq.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/cpufreq/sparc-us2e-cpufreq.c +3 -1
@@ -329,8 +329,10 @@ 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) +if (cpufreq_us2e_driver) { +cpufreq_frequency_table_put_attr (policy->cpu);us2e_set_cpu_divider_index (policy,0 ); + }return 0 ; }
drivers/cpufreq/sparc-us3-cpufreq.c +3 -1
@@ -186,8 +186,10 @@ 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) +if (cpufreq_us3_driver) { +cpufreq_frequency_table_put_attr (policy->cpu);us3_set_cpu_divider_index (policy,0 ); + }return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 054/228] cpufreq: sparc: call cpufreq_frequency_table_put_attr()
From: Viresh Kumar <[email protected]>
Date: Fri, 13 Sep 2013 18:30:00 +0530
Quoted 8 lines
Drivers which have an exit path must call
cpufreq_frequency_table_put_attr()if they have calledcpufreq_frequency_table_get_attr()in their init path.This driver was missing this part and is fixed with this patch.
Cc David S. Miller <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
Viresh Kumar
maintainerPATCH 55/228 cpufreq: define generic .attr, .exit() and .verify() routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch introduces generic .attr, .exit() and .verify() cpufreq drivers.
--- drivers/cpufreq/freq_table.c | 20 ++++++++++++++++++++ include/linux/cpufreq.h | 8 ++++++++ 2 files changed, 28 insertions(+)
drivers/cpufreq/freq_table.c +20 -0
@@ -86,6 +86,20 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, }EXPORT_SYMBOL_GPL (cpufreq_frequency_table_verify); +/* +* Generic routine to verify policy & frequency table, requires driver to call +* cpufreq_frequency_table_get_attr() prior to it. +*/ +int cpufreq_generic_frequency_table_verify (struct cpufreq_policy *policy) +{ +struct cpufreq_frequency_table *table = +cpufreq_frequency_get_table (policy->cpu); +if (!table) +return -ENODEV ; + +return cpufreq_frequency_table_verify (policy, table); +} +EXPORT_SYMBOL_GPL (cpufreq_generic_frequency_table_verify); int cpufreq_frequency_table_target(struct cpufreq_policy *policy, struct cpufreq_frequency_table *table,
@@ -199,6 +213,12 @@ struct freq_attr cpufreq_freq_attr_scaling_available_freqs = { };EXPORT_SYMBOL_GPL (cpufreq_freq_attr_scaling_available_freqs); +struct freq_attr *cpufreq_generic_attr[] = { + &cpufreq_freq_attr_scaling_available_freqs, +NULL , +}; +EXPORT_SYMBOL_GPL (cpufreq_generic_attr); +/* * if you use these, you must assure that the frequency table is valid * all the time between get_attr and put_attr!
include/linux/cpufreq.h +8 -0
@@ -415,6 +415,7 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,int cpufreq_frequency_table_verify (struct cpufreq_policy *policy,struct cpufreq_frequency_table *table); +int cpufreq_generic_frequency_table_verify (struct cpufreq_policy *policy); int cpufreq_frequency_table_target(struct cpufreq_policy *policy, struct cpufreq_frequency_table *table,
@@ -430,10 +431,17 @@ struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu);/* the following are really really optional */ extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs; +extern struct freq_attr *cpufreq_generic_attr[];void cpufreq_frequency_table_get_attr (struct cpufreq_frequency_table *table,unsigned int cpu);void cpufreq_frequency_table_put_attr (unsigned int cpu);int cpufreq_table_validate_and_show (struct cpufreq_policy *policy,struct cpufreq_frequency_table *table); +static inline int cpufreq_generic_exit (struct cpufreq_policy *policy) +{ +cpufreq_frequency_table_put_attr (policy->cpu); +return 0 ; +} +#endif /* _LINUX_CPUFREQ_H */
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 56/228 cpufreq: acpi: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/acpi-cpufreq.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +1 -10
@@ -516,15 +516,6 @@ out:return result; } -static int acpi_cpufreq_verify (struct cpufreq_policy *policy) -{ -struct acpi_cpufreq_data *data =per_cpu (acfreq_data, policy->cpu); - -pr_debug ("acpi_cpufreq_verify\n" ); - -return cpufreq_frequency_table_verify (policy, data->freq_table); -} -static unsigned long acpi_cpufreq_guess_freq (struct acpi_cpufreq_data *data,unsigned int cpu) {
@@ -927,7 +918,7 @@ static struct freq_attr *acpi_cpufreq_attr[] = { };static struct cpufreq_driver acpi_cpufreq_driver = { - .verify = acpi_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = acpi_cpufreq_target, .bios_limit = acpi_processor_get_bios_limit, .init = acpi_cpufreq_cpu_init,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 57/228 cpufreq: arm_big_little: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/arm_big_little.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/cpufreq/arm_big_little.c +2 -16
@@ -47,14 +47,6 @@ static unsigned int bL_cpufreq_get(unsigned int cpu)return clk_get_rate (clk[cur_cluster]) /1000 ; } -/* Validate policy frequency range */ -static int bL_cpufreq_verify_policy (struct cpufreq_policy *policy) -{ -u32 cur_cluster =cpu_to_cluster (policy->cpu); - -return cpufreq_frequency_table_verify (policy, freq_table[cur_cluster]); -} -/* Set clock frequency */ static int bL_cpufreq_set_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -205,22 +197,16 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy)return 0 ; } -/* Export freq_table to sysfs */ -static struct freq_attr *bL_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver bL_cpufreq_driver = { .name ="arm-big-little" , .flags =CPUFREQ_STICKY |CPUFREQ_HAVE_GOVERNOR_PER_POLICY , - .verify = bL_cpufreq_verify_policy, + .verify = cpufreq_generic_frequency_table_verify, .target = bL_cpufreq_set_target, .get = bL_cpufreq_get, .init = bL_cpufreq_init, .exit = bL_cpufreq_exit, - .attr = bL_cpufreq_attr, + .attr = cpufreq_generic_attr, };int bL_cpufreq_register (struct cpufreq_arm_bL_ops *ops)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 58/228 cpufreq: at32ap: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/at32ap-cpufreq.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/cpufreq/at32ap-cpufreq.c +1 -11
@@ -24,16 +24,6 @@static struct clk *cpuclk;static struct cpufreq_frequency_table *freq_table; -static int at32_verify_speed (struct cpufreq_policy *policy) -{ -if (policy->cpu !=0 ) -return -EINVAL ; - -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, - policy->cpuinfo.max_freq); -return 0 ; -} -static unsigned int at32_get_speed (unsigned int cpu) {/* No SMP support */
@@ -152,7 +142,7 @@ out_err:static struct cpufreq_driver at32_driver = { .name ="at32ap" , .init = at32_cpufreq_driver_init, - .verify = at32_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = at32_set_target, .get = at32_get_speed, .flags =CPUFREQ_STICKY ,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 59/228 cpufreq: blackfin: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/blackfin-cpufreq.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-)
drivers/cpufreq/blackfin-cpufreq.c +3 -19
@@ -191,11 +191,6 @@ static int bfin_target(struct cpufreq_policy *policy,return ret; } -static int bfin_verify_speed (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, bfin_freq_table); -} -static int __bfin_cpu_init (struct cpufreq_policy *policy) {
@@ -213,25 +208,14 @@ static int __bfin_cpu_init(struct cpufreq_policy *policy)return cpufreq_table_validate_and_show (policy, bfin_freq_table); } -static int __bfin_cpu_exit (struct cpufreq_policy *policy) -{ - -cpufreq_frequency_table_put_attr (policy->cpu); -} - -static struct freq_attr *bfin_freq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver bfin_driver = { - .verify = bfin_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = bfin_target, .get = bfin_getfreq_khz, .init = __bfin_cpu_init, - .exit = __bfin_cpu_exit, + .exit = cpufreq_generic_exit, .name ="bfin cpufreq" , - .attr = bfin_freq_attr, + .attr = cpufreq_generic_attr, };static int __init bfin_cpu_init (void )
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 60/228 cpufreq: cpu0: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/cpufreq-cpu0.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-)
drivers/cpufreq/cpufreq-cpu0.c +3 -20
@@ -29,11 +29,6 @@ static struct clk *cpu_clk;static struct regulator *cpu_reg;static struct cpufreq_frequency_table *freq_table; -static int cpu0_verify_speed (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, freq_table); -} -static unsigned int cpu0_get_speed (unsigned int cpu) {return clk_get_rate (cpu_clk) /1000 ;
@@ -147,27 +142,15 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy)return 0 ; } -static int cpu0_cpufreq_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); - -return 0 ; -} - -static struct freq_attr *cpu0_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver cpu0_cpufreq_driver = { .flags =CPUFREQ_STICKY , - .verify = cpu0_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = cpu0_set_target, .get = cpu0_get_speed, .init = cpu0_cpufreq_init, - .exit = cpu0_cpufreq_exit, + .exit = cpufreq_generic_exit, .name ="generic_cpu0" , - .attr = cpu0_cpufreq_attr, + .attr = cpufreq_generic_attr, };static int cpu0_cpufreq_probe (struct platform_device *pdev)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 61/228 cpufreq: cris: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/cris-artpec3-cpufreq.c | 23 +++-------------------- drivers/cpufreq/cris-etraxfs-cpufreq.c | 22 +++------------------- 2 files changed, 6 insertions(+), 39 deletions(-)
drivers/cpufreq/cris-artpec3-cpufreq.c +3 -20
@@ -54,11 +54,6 @@ static void cris_freq_set_cpu_state(struct cpufreq_policy *policy,cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); }; -static int cris_freq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, &cris_freq_table[0 ]); -} -static int cris_freq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -84,26 +79,14 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy) } -static int cris_freq_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - - -static struct freq_attr *cris_freq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver cris_freq_driver = { .get = cris_freq_get_cpu_frequency, - .verify = cris_freq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = cris_freq_target, .init = cris_freq_cpu_init, - .exit = cris_freq_cpu_exit, + .exit = cpufreq_generic_exit, .name ="cris_freq" , - .attr = cris_freq_attr, + .attr = cpufreq_generic_attr, };static int __init cris_freq_init (void )
drivers/cpufreq/cris-etraxfs-cpufreq.c +3 -19
@@ -54,11 +54,6 @@ static void cris_freq_set_cpu_state(struct cpufreq_policy *policy,cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); }; -static int cris_freq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, &cris_freq_table[0 ]); -} -static int cris_freq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation) {
@@ -82,25 +77,14 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy)return cpufreq_table_validate_and_show (policy, cris_freq_table); } -static int cris_freq_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static struct freq_attr *cris_freq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver cris_freq_driver = { .get = cris_freq_get_cpu_frequency, - .verify = cris_freq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = cris_freq_target, .init = cris_freq_cpu_init, - .exit = cris_freq_cpu_exit, + .exit = cpufreq_generic_exit, .name ="cris_freq" , - .attr = cris_freq_attr, + .attr = cpufreq_generic_attr, };static int __init cris_freq_init (void )
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 061/228] cpufreq: cris: Use generic cpufreq routines
Quoted 5 lines · Viresh Kumar
Most of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
Quoted 3 lines
Cc Mikael Starvik <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Viresh Kumar
maintainerPATCH 62/228 cpufreq: davinci: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/davinci-cpufreq.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/cpufreq/davinci-cpufreq.c +2 -13
@@ -155,26 +155,15 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)return 0 ; } -static int davinci_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static struct freq_attr *davinci_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver davinci_driver = { .flags =CPUFREQ_STICKY , .verify = davinci_verify_speed, .target = davinci_target, .get = davinci_getspeed, .init = davinci_cpu_init, - .exit = davinci_cpu_exit, + .exit = cpufreq_generic_exit, .name ="davinci" , - .attr = davinci_cpufreq_attr, + .attr = cpufreq_generic_attr, };static int __init davinci_cpufreq_probe (struct platform_device *pdev)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 63/228 cpufreq: dbx500: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/dbx500-cpufreq.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/cpufreq/dbx500-cpufreq.c +2 -12
@@ -19,16 +19,6 @@static struct cpufreq_frequency_table *freq_table;static struct clk *armss_clk; -static struct freq_attr *dbx500_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; - -static int dbx500_cpufreq_verify_speed (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, freq_table); -} -static int dbx500_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -113,12 +103,12 @@ static int dbx500_cpufreq_init(struct cpufreq_policy *policy)static struct cpufreq_driver dbx500_cpufreq_driver = { .flags =CPUFREQ_STICKY |CPUFREQ_CONST_LOOPS , - .verify = dbx500_cpufreq_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = dbx500_cpufreq_target, .get = dbx500_cpufreq_getspeed, .init = dbx500_cpufreq_init, .name ="DBX500" , - .attr = dbx500_cpufreq_attr, + .attr = cpufreq_generic_attr, };static int dbx500_cpufreq_probe (struct platform_device *pdev)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 063/228] cpufreq: dbx500: Use generic cpufreq routines
Quoted 8 lines · Viresh Kumar
Most of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
Cc Linus Walleij <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
Acked-by. It feels like I acked this before...
Yours,
Linus Walleij
Viresh Kumar
maintainerRe: [PATCH 063/228] cpufreq: dbx500: Use generic cpufreq routines
Quoted 6 lines · Linus Walleij
Quoted 4 lines · Viresh Kumar
Most of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
Quoted 6 lines
Quoted 4 lines
This patch uses these generic routines for this driver.
Cc Linus Walleij <[email protected]>Signed-off-by Viresh Kumar <[email protected]>Acked-by. It feels like I acked this before...
Nah, I checked it again :)
Btw, for a second I had my heart in my mouth.. I thought its Torvalds and he will blast me off :)
Thank god, its you :)
Viresh Kumar
maintainerPATCH 64/228 cpufreq: e_powersaver: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/e_powersaver.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/cpufreq/e_powersaver.c +2 -13
@@ -198,12 +198,6 @@ static int eps_target(struct cpufreq_policy *policy,return ret; } -static int eps_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, - &eps_cpu[policy->cpu]->freq_table[0 ]); -} -static int eps_cpu_init (struct cpufreq_policy *policy) {unsigned int i;
@@ -423,19 +417,14 @@ static int eps_cpu_exit(struct cpufreq_policy *policy)return 0 ; } -static struct freq_attr *eps_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver eps_driver = { - .verify = eps_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = eps_target, .init = eps_cpu_init, .exit = eps_cpu_exit, .get = eps_get, .name ="e_powersaver" , - .attr = eps_attr, + .attr = cpufreq_generic_attr, };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 65/228 cpufreq: elanfreq: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/elanfreq.c | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-)
drivers/cpufreq/elanfreq.c +3 -29
@@ -165,19 +165,6 @@ static void elanfreq_set_cpu_state(struct cpufreq_policy *policy, }; -/** -* elanfreq_validatespeed: test if frequency range is valid -* @policy: the policy to validate -* -* This function checks if a given frequency range in kHz is valid -* for the hardware supported by the driver. -*/ - -static int elanfreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, &elanfreq_table[0 ]); -} -static int elanfreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -226,13 +213,6 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy) } -static int elanfreq_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -#ifndef MODULE /** * elanfreq_setup - elanfreq command line parameter parsing
@@ -255,20 +235,14 @@ __setup("elanfreq=", elanfreq_setup);#endif -static struct freq_attr *elanfreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; - -static struct cpufreq_driver elanfreq_driver = { .get = elanfreq_get_cpu_frequency, - .verify = elanfreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = elanfreq_target, .init = elanfreq_cpu_init, - .exit = elanfreq_cpu_exit, + .exit = cpufreq_generic_exit, .name ="elanfreq" , - .attr = elanfreq_attr, + .attr = cpufreq_generic_attr, };static const struct x86_cpu_id elan_id[] = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 66/228 cpufreq: exynos: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/exynos-cpufreq.c | 23 +++-------------------- drivers/cpufreq/exynos5440-cpufreq.c | 15 ++------------- 2 files changed, 5 insertions(+), 33 deletions(-)
drivers/cpufreq/exynos-cpufreq.c +3 -20
@@ -31,12 +31,6 @@ static unsigned int locking_frequency;static bool frequency_locked;static DEFINE_MUTEX (cpufreq_lock); -static int exynos_verify_speed (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, - exynos_info->freq_table); -} -static unsigned int exynos_getspeed (unsigned int cpu) {return clk_get_rate (exynos_info->cpu_clk) /1000 ;
@@ -257,26 +251,15 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)return cpufreq_table_validate_and_show (policy, exynos_info->freq_table); } -static int exynos_cpufreq_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static struct freq_attr *exynos_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver exynos_driver = { .flags =CPUFREQ_STICKY , - .verify = exynos_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = exynos_target, .get = exynos_getspeed, .init = exynos_cpufreq_cpu_init, - .exit = exynos_cpufreq_cpu_exit, + .exit = cpufreq_generic_exit, .name ="exynos_cpufreq" , - .attr = exynos_cpufreq_attr, + .attr = cpufreq_generic_attr, #ifdef CONFIG_PM .suspend = exynos_cpufreq_suspend, .resume = exynos_cpufreq_resume,
drivers/cpufreq/exynos5440-cpufreq.c +2 -13
@@ -209,12 +209,6 @@ static void exynos_enable_dvfs(void) dvfs_info->base + XMU_DVFS_CTRL); } -static int exynos_verify_speed (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, - dvfs_info->freq_table); -} -static unsigned int exynos_getspeed (unsigned int cpu) {return dvfs_info->cur_frequency;
@@ -342,18 +336,13 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)return 0 ; } -static int exynos_cpufreq_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -} -static struct cpufreq_driver exynos_driver = { .flags =CPUFREQ_STICKY |CPUFREQ_ASYNC_NOTIFICATION , - .verify = exynos_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = exynos_target, .get = exynos_getspeed, .init = exynos_cpufreq_cpu_init, - .exit = exynos_cpufreq_cpu_exit, + .exit = cpufreq_generic_exit, .name =CPUFREQ_NAME , };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 67/228 cpufreq: ia64-acpi: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/ia64-acpi-cpufreq.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-)
drivers/cpufreq/ia64-acpi-cpufreq.c +2 -24
@@ -248,22 +248,6 @@ acpi_cpufreq_target (static int -acpi_cpufreq_verify ( -struct cpufreq_policy *policy) -{ -unsigned int result =0 ; -struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu]; - -pr_debug ("acpi_cpufreq_verify\n" ); - - result =cpufreq_frequency_table_verify (policy, - data->freq_table); - -return (result); -} - - -static int acpi_cpufreq_cpu_init (struct cpufreq_policy *policy) {
@@ -394,20 +378,14 @@ acpi_cpufreq_cpu_exit ( } -static struct freq_attr * acpi_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; - -static struct cpufreq_driver acpi_cpufreq_driver = { - .verify = acpi_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = acpi_cpufreq_target, .get = acpi_cpufreq_get, .init = acpi_cpufreq_cpu_init, .exit = acpi_cpufreq_cpu_exit, .name ="acpi-cpufreq" , - .attr = acpi_cpufreq_attr, + .attr = cpufreq_generic_attr, };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 68/228 cpufreq: imx6q: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/imx6q-cpufreq.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-)
drivers/cpufreq/imx6q-cpufreq.c +3 -19
@@ -34,11 +34,6 @@ static struct device *cpu_dev;static struct cpufreq_frequency_table *freq_table;static unsigned int transition_latency; -static int imx6q_verify_speed (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, freq_table); -} -static unsigned int imx6q_get_speed (unsigned int cpu) {return clk_get_rate (arm_clk) /1000 ;
@@ -173,25 +168,14 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy)return 0 ; } -static int imx6q_cpufreq_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static struct freq_attr *imx6q_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver imx6q_cpufreq_driver = { - .verify = imx6q_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = imx6q_set_target, .get = imx6q_get_speed, .init = imx6q_cpufreq_init, - .exit = imx6q_cpufreq_exit, + .exit = cpufreq_generic_exit, .name ="imx6q-cpufreq" , - .attr = imx6q_cpufreq_attr, + .attr = cpufreq_generic_attr, };static int imx6q_cpufreq_probe (struct platform_device *pdev)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 69/228 cpufreq: kirkwood: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/kirkwood-cpufreq.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-)
drivers/cpufreq/kirkwood-cpufreq.c +3 -19
@@ -102,11 +102,6 @@ static void kirkwood_cpufreq_set_cpu_state(struct cpufreq_policy *policy,cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); }; -static int kirkwood_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, kirkwood_freq_table); -} -static int kirkwood_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -132,25 +127,14 @@ static int kirkwood_cpufreq_cpu_init(struct cpufreq_policy *policy)return cpufreq_table_validate_and_show (policy, kirkwood_freq_table); } -static int kirkwood_cpufreq_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static struct freq_attr *kirkwood_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver kirkwood_cpufreq_driver = { .get = kirkwood_cpufreq_get_cpu_frequency, - .verify = kirkwood_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = kirkwood_cpufreq_target, .init = kirkwood_cpufreq_cpu_init, - .exit = kirkwood_cpufreq_cpu_exit, + .exit = cpufreq_generic_exit, .name ="kirkwood-cpufreq" , - .attr = kirkwood_cpufreq_attr, + .attr = cpufreq_generic_attr, };static int kirkwood_cpufreq_probe (struct platform_device *pdev)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 069/228] cpufreq: kirkwood: Use generic cpufreq routines
Quoted 11 lines · Viresh Kumar
Most of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
Cc Andrew Lunn <[email protected]>Signed-off-by Viresh Kumar <[email protected]>--- drivers/cpufreq/kirkwood-cpufreq.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-)
Hi Viresh
You can add:
to
[PATCH 069/228] cpufreq: kirkwood: Use generic cpufreq routines
[PATCH 107/228] cpufreq: kirkwood: don't initialize part of policy that is set by core [PATCH 161/228] cpufreq: kirkwood: Convert to light weight ->target_index() routine [PATCH 195/228] cpufreq: kirkwood: remove calls to cpufreq_notify_transition()
It does however require the patch:
http://www.spinics.net/lists/arm-kernel/msg273378.html
but this is not because of this patch series, it was already broken.
Thanks
Andrew
Viresh Kumar
maintainerPATCH 70/228 cpufreq: longhaul: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/longhaul.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-)
drivers/cpufreq/longhaul.c +3 -20
@@ -625,12 +625,6 @@ static void longhaul_setup_voltagescaling(void) } -static int longhaul_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, longhaul_table); -} - -static int longhaul_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation) {
@@ -924,25 +918,14 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy)return cpufreq_table_validate_and_show (policy, longhaul_table); } -static int longhaul_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static struct freq_attr *longhaul_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver longhaul_driver = { - .verify = longhaul_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = longhaul_target, .get = longhaul_get, .init = longhaul_cpu_init, - .exit = longhaul_cpu_exit, + .exit = cpufreq_generic_exit, .name ="longhaul" , - .attr = longhaul_attr, + .attr = cpufreq_generic_attr, };static const struct x86_cpu_id longhaul_id[] = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 71/228 cpufreq: loongson2: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/loongson2_cpufreq.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/cpufreq/loongson2_cpufreq.c +2 -13
@@ -137,12 +137,6 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) &loongson2_clockmod_table[0]); } -static int loongson2_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, - &loongson2_clockmod_table[0 ]); -} -static int loongson2_cpufreq_exit (struct cpufreq_policy *policy) {cpufreq_frequency_table_put_attr (policy->cpu);
@@ -150,19 +144,14 @@ static int loongson2_cpufreq_exit(struct cpufreq_policy *policy)return 0 ; } -static struct freq_attr *loongson2_table_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver loongson2_cpufreq_driver = { .name ="loongson2" , .init = loongson2_cpufreq_cpu_init, - .verify = loongson2_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = loongson2_cpufreq_target, .get = loongson2_cpufreq_get, .exit = loongson2_cpufreq_exit, - .attr = loongson2_table_attr, + .attr = cpufreq_generic_attr, };static struct platform_device_id platform_device_ids[] = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 72/228 cpufreq: maple: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/maple-cpufreq.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/cpufreq/maple-cpufreq.c +2 -12
@@ -64,11 +64,6 @@ static struct cpufreq_frequency_table maple_cpu_freqs[] = { {0, CPUFREQ_TABLE_END}, }; -static struct freq_attr *maple_cpu_freqs_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -/* Power mode data is an array of the 32 bits PCR values to use for * the various frequencies, retrieved from the device-tree */
@@ -135,11 +130,6 @@ static int maple_scom_query_freq(void)* Common interface to the cpufreq core */ -static int maple_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, maple_cpu_freqs); -} -static int maple_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation) {
@@ -190,10 +180,10 @@ static struct cpufreq_driver maple_cpufreq_driver = { .name = "maple", .flags = CPUFREQ_CONST_LOOPS, .init = maple_cpufreq_cpu_init, - .verify = maple_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = maple_cpufreq_target, .get = maple_cpufreq_get_speed, - .attr = maple_cpu_freqs_attr, + .attr = cpufreq_generic_attr, };static int __init maple_cpufreq_init (void )
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 73/228 cpufreq: omap: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/omap-cpufreq.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/cpufreq/omap-cpufreq.c +2 -14
@@ -40,13 +40,6 @@ static struct clk *mpu_clk;static struct device *mpu_dev;static struct regulator *mpu_reg; -static int omap_verify_speed (struct cpufreq_policy *policy) -{ -if (!freq_table) -return -EINVAL ; -return cpufreq_frequency_table_verify (policy, freq_table); -} -static unsigned int omap_getspeed (unsigned int cpu) {unsigned long rate;
@@ -227,20 +220,15 @@ static int omap_cpu_exit(struct cpufreq_policy *policy)return 0 ; } -static struct freq_attr *omap_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver omap_driver = { .flags =CPUFREQ_STICKY , - .verify = omap_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = omap_target, .get = omap_getspeed, .init = omap_cpu_init, .exit = omap_cpu_exit, .name ="omap" , - .attr = omap_cpufreq_attr, + .attr = cpufreq_generic_attr, };static int omap_cpufreq_probe (struct platform_device *pdev)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 74/228 cpufreq: p4-clockmod: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/p4-clockmod.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-)
drivers/cpufreq/p4-clockmod.c +3 -20
@@ -140,12 +140,6 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy, } -static int cpufreq_p4_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, &p4clockmod_table[0 ]); -} - -static unsigned int cpufreq_p4_get_frequency (struct cpuinfo_x86 *c) {if (c->x86 ==0x06 ) {
@@ -242,12 +236,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy) } -static int cpufreq_p4_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} -static unsigned int cpufreq_p4_get (unsigned int cpu) {u32 l, h;
@@ -266,19 +254,14 @@ static unsigned int cpufreq_p4_get(unsigned int cpu)return stock_freq; } -static struct freq_attr *p4clockmod_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver p4clockmod_driver = { - .verify = cpufreq_p4_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = cpufreq_p4_target, .init = cpufreq_p4_cpu_init, - .exit = cpufreq_p4_cpu_exit, + .exit = cpufreq_generic_exit, .get = cpufreq_p4_get, .name ="p4-clockmod" , - .attr = p4clockmod_attr, + .attr = cpufreq_generic_attr, };static const struct x86_cpu_id cpufreq_p4_id[] = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 75/228 cpufreq: pasemi: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/pasemi-cpufreq.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/cpufreq/pasemi-cpufreq.c +2 -12
@@ -69,11 +69,6 @@ static struct cpufreq_frequency_table pas_freqs[] = { {0, CPUFREQ_TABLE_END}, }; -static struct freq_attr *pas_cpu_freqs_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -/* * hardware specific functions */
@@ -251,11 +246,6 @@ static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy)return 0 ; } -static int pas_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, pas_freqs); -} -static int pas_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -298,9 +288,9 @@ static struct cpufreq_driver pas_cpufreq_driver = { .flags = CPUFREQ_CONST_LOOPS, .init = pas_cpufreq_cpu_init, .exit = pas_cpufreq_cpu_exit, - .verify = pas_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = pas_cpufreq_target, - .attr = pas_cpu_freqs_attr, + .attr = cpufreq_generic_attr, };/*
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 76/228 cpufreq: pmac: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/pmac32-cpufreq.c | 14 ++------------ drivers/cpufreq/pmac64-cpufreq.c | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-)
drivers/cpufreq/pmac32-cpufreq.c +2 -12
@@ -86,11 +86,6 @@ static struct cpufreq_frequency_table pmac_cpu_freqs[] = { {0, CPUFREQ_TABLE_END}, }; -static struct freq_attr * pmac_cpu_freqs_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static inline void local_delay (unsigned long ms) {if (no_schedule)
@@ -378,11 +373,6 @@ static unsigned int pmac_cpufreq_get_speed(unsigned int cpu)return cur_freq; } -static int pmac_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, pmac_cpu_freqs); -} -static int pmac_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -468,14 +458,14 @@ static int pmac_cpufreq_resume(struct cpufreq_policy *policy) }static struct cpufreq_driver pmac_cpufreq_driver = { - .verify = pmac_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = pmac_cpufreq_target, .get = pmac_cpufreq_get_speed, .init = pmac_cpufreq_cpu_init, .suspend = pmac_cpufreq_suspend, .resume = pmac_cpufreq_resume, .flags =CPUFREQ_PM_NO_WARN , - .attr = pmac_cpu_freqs_attr, + .attr = cpufreq_generic_attr, .name ="powermac" , };
drivers/cpufreq/pmac64-cpufreq.c +2 -12
@@ -70,11 +70,6 @@ static struct cpufreq_frequency_table g5_cpu_freqs[] = { {0, CPUFREQ_TABLE_END}, }; -static struct freq_attr * g5_cpu_freqs_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -/* Power mode data is an array of the 32 bits PCR values to use for * the various frequencies, retrieved from the device-tree */
@@ -317,11 +312,6 @@ static int g5_pfunc_query_freq(void)* Common interface to the cpufreq core */ -static int g5_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, g5_cpu_freqs); -} -static int g5_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation) {
@@ -372,10 +362,10 @@ static struct cpufreq_driver g5_cpufreq_driver = { .name = "powermac", .flags = CPUFREQ_CONST_LOOPS, .init = g5_cpufreq_cpu_init, - .verify = g5_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = g5_cpufreq_target, .get = g5_cpufreq_get_speed, - .attr = g5_cpu_freqs_attr, + .attr = cpufreq_generic_attr, };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 77/228 cpufreq: powernow: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/powernow-k6.c | 22 ++-------------------- drivers/cpufreq/powernow-k7.c | 14 ++------------ drivers/cpufreq/powernow-k8.c | 20 ++------------------ 3 files changed, 6 insertions(+), 50 deletions(-)
drivers/cpufreq/powernow-k6.c +2 -20
@@ -105,19 +105,6 @@ static void powernow_k6_set_state(struct cpufreq_policy *policy,/** -* powernow_k6_verify - verifies a new CPUfreq policy -* @policy: new policy -* -* Policy must be within lowest and highest possible CPU Frequency, -* and at least one possible state must be within min and max. -*/ -static int powernow_k6_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, &clock_ratio[0 ]); -} - - -/** * powernow_k6_setpolicy - sets a new CPUFreq policy * @policy: new policy * @target_freq: the target frequency
@@ -188,19 +175,14 @@ static unsigned int powernow_k6_get(unsigned int cpu)return ret; } -static struct freq_attr *powernow_k6_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver powernow_k6_driver = { - .verify = powernow_k6_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = powernow_k6_target, .init = powernow_k6_cpu_init, .exit = powernow_k6_cpu_exit, .get = powernow_k6_get, .name ="powernow-k6" , - .attr = powernow_k6_attr, + .attr = cpufreq_generic_attr, };static const struct x86_cpu_id powernow_k6_ids[] = {
drivers/cpufreq/powernow-k7.c +2 -12
@@ -549,11 +549,6 @@ static int powernow_target(struct cpufreq_policy *policy, } -static int powernow_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, powernow_table); -} -/* * We use the fact that the bus frequency is somehow * a multiple of 100000/3 khz, then we compute sgtc according
@@ -699,13 +694,8 @@ static int powernow_cpu_exit(struct cpufreq_policy *policy)return 0 ; } -static struct freq_attr *powernow_table_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver powernow_driver = { - .verify = powernow_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = powernow_target, .get = powernow_get, #ifdef CONFIG_X86_POWERNOW_K7_ACPI
@@ -714,7 +704,7 @@ static struct cpufreq_driver powernow_driver = { .init = powernow_cpu_init, .exit = powernow_cpu_exit, .name = "powernow-k7", - .attr = powernow_table_attr, + .attr = cpufreq_generic_attr, };static int __init powernow_init (void )
drivers/cpufreq/powernow-k8.c +2 -18
@@ -1073,17 +1073,6 @@ static int powernowk8_target(struct cpufreq_policy *pol,return ret; } -/* Driver entry point to verify the policy and range of frequencies */ -static int powernowk8_verify (struct cpufreq_policy *pol) -{ -struct powernow_k8_data *data =per_cpu (powernow_data, pol->cpu); - -if (!data) -return -EINVAL ; - -return cpufreq_frequency_table_verify (pol, data->powernow_table); -} -struct init_on_cpu {struct powernow_k8_data *data;int rc;
@@ -1245,21 +1234,16 @@ out:return khz; } -static struct freq_attr *powernow_k8_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver cpufreq_amd64_driver = { .flags =CPUFREQ_ASYNC_NOTIFICATION , - .verify = powernowk8_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = powernowk8_target, .bios_limit = acpi_processor_get_bios_limit, .init = powernowk8_cpu_init, .exit = powernowk8_cpu_exit, .get = powernowk8_get, .name ="powernow-k8" , - .attr = powernow_k8_attr, + .attr = cpufreq_generic_attr, };static void __request_acpi_cpufreq (void )
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 78/228 cpufreq: ppc-corenet: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/ppc-corenet-cpufreq.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/cpufreq/ppc-corenet-cpufreq.c +2 -15
@@ -252,14 +252,6 @@ static int __exit corenet_cpufreq_cpu_exit(struct cpufreq_policy *policy)return 0 ; } -static int corenet_cpufreq_verify (struct cpufreq_policy *policy) -{ -struct cpufreq_frequency_table *table = -per_cpu (cpu_data, policy->cpu)->table; - -return cpufreq_frequency_table_verify (policy, table); -} -static int corenet_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation) {
@@ -292,20 +284,15 @@ static int corenet_cpufreq_target(struct cpufreq_policy *policy,return ret; } -static struct freq_attr *corenet_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver ppc_corenet_cpufreq_driver = { .name ="ppc_cpufreq" , .flags =CPUFREQ_CONST_LOOPS , .init = corenet_cpufreq_cpu_init, .exit =__exit_p (corenet_cpufreq_cpu_exit), - .verify = corenet_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = corenet_cpufreq_target, .get = corenet_cpufreq_get_speed, - .attr = corenet_cpufreq_attr, + .attr = cpufreq_generic_attr, };static const struct of_device_id node_matches[]__initdata = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 79/228 cpufreq: ppc_cbe: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/ppc_cbe_cpufreq.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/cpufreq/ppc_cbe_cpufreq.c +2 -13
@@ -128,17 +128,6 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)return cpufreq_table_validate_and_show (policy, cbe_freqs); } -static int cbe_cpufreq_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static int cbe_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, cbe_freqs); -} -static int cbe_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -174,10 +163,10 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy, }static struct cpufreq_driver cbe_cpufreq_driver = { - .verify = cbe_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = cbe_cpufreq_target, .init = cbe_cpufreq_cpu_init, - .exit = cbe_cpufreq_cpu_exit, + .exit = cpufreq_generic_exit, .name ="cbe-cpufreq" , .flags =CPUFREQ_CONST_LOOPS , };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 80/228 cpufreq: pxa: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/pxa2xx-cpufreq.c | 26 ++------------------------ drivers/cpufreq/pxa3xx-cpufreq.c | 14 ++------------ 2 files changed, 4 insertions(+), 36 deletions(-)
drivers/cpufreq/pxa2xx-cpufreq.c +2 -24
@@ -262,23 +262,6 @@ static u32 mdrefr_dri(unsigned int freq)return (interval - (cpu_is_pxa27x () ?31 :0 )) /32 ; } -/* find a valid frequency point */ -static int pxa_verify_policy (struct cpufreq_policy *policy) -{ -struct cpufreq_frequency_table *pxa_freqs_table; -pxa_freqs_t *pxa_freqs; -int ret; - -find_freq_tables (&pxa_freqs_table, &pxa_freqs); - ret =cpufreq_frequency_table_verify (policy, pxa_freqs_table); - -if (freq_debug) -pr_debug ("Verified CPU policy: %dKhz min to %dKhz max\n" , - policy->min, policy->max); - -return ret; -} -static unsigned int pxa_cpufreq_get (unsigned int cpu) {return get_clk_frequency_khz (0 );
@@ -465,16 +448,11 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)return 0 ; } -static int pxa_cpufreq_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -} -static struct cpufreq_driver pxa_cpufreq_driver = { - .verify = pxa_verify_policy, + .verify = cpufreq_generic_frequency_table_verify, .target = pxa_set_target, .init = pxa_cpufreq_init, - .exit = pxa_cpufreq_exit, + .exit = cpufreq_generic_exit, .get = pxa_cpufreq_get, .name ="PXA2xx" , };
drivers/cpufreq/pxa3xx-cpufreq.c +2 -12
@@ -150,11 +150,6 @@ static void __update_bus_freq(struct pxa3xx_freq_info *info)cpu_relax (); } -static int pxa3xx_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, pxa3xx_freqs_table); -} -static unsigned int pxa3xx_cpufreq_get (unsigned int cpu) {return pxa3xx_get_clk_frequency_khz (0 );
@@ -229,16 +224,11 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)return 0 ; } -static int pxa3xx_cpufreq_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -} -static struct cpufreq_driver pxa3xx_cpufreq_driver = { - .verify = pxa3xx_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = pxa3xx_cpufreq_set, .init = pxa3xx_cpufreq_init, - .exit = pxa3xx_cpufreq_exit, + .exit = cpufreq_generic_exit, .get = pxa3xx_cpufreq_get, .name ="pxa3xx-cpufreq" , };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 81/228 cpufreq: s3cx4xx: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/s3c2416-cpufreq.c | 19 ++----------------- drivers/cpufreq/s3c24xx-cpufreq.c | 9 --------- drivers/cpufreq/s3c64xx-cpufreq.c | 10 +--------- 3 files changed, 3 insertions(+), 35 deletions(-)
drivers/cpufreq/s3c2416-cpufreq.c +2 -17
@@ -87,16 +87,6 @@ static struct cpufreq_frequency_table s3c2450_freq_table[] = { { 0, CPUFREQ_TABLE_END }, }; -static int s3c2416_cpufreq_verify_speed (struct cpufreq_policy *policy) -{ -struct s3c2416_data *s3c_freq = &s3c2416_cpufreq; - -if (policy->cpu !=0 ) -return -EINVAL ; - -return cpufreq_frequency_table_verify (policy, s3c_freq->freq_table); -} -static unsigned int s3c2416_cpufreq_get_speed (unsigned int cpu) {struct s3c2416_data *s3c_freq = &s3c2416_cpufreq;
@@ -516,19 +506,14 @@ err_hclk:return ret; } -static struct freq_attr *s3c2416_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver s3c2416_cpufreq_driver = { .flags =0 , - .verify = s3c2416_cpufreq_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = s3c2416_cpufreq_set_target, .get = s3c2416_cpufreq_get_speed, .init = s3c2416_cpufreq_driver_init, .name ="s3c2416" , - .attr = s3c2416_cpufreq_attr, + .attr = cpufreq_generic_attr, };static int __init s3c2416_cpufreq_init (void )
drivers/cpufreq/s3c24xx-cpufreq.c +0 -9
@@ -416,14 +416,6 @@ static int __init s3c_cpufreq_initclks(void)return 0 ; } -static int s3c_cpufreq_verify (struct cpufreq_policy *policy) -{ -if (policy->cpu !=0 ) -return -EINVAL ; - -return 0 ; -} -#ifdef CONFIG_PM static struct cpufreq_frequency_table suspend_pll;static unsigned int suspend_freq;
@@ -473,7 +465,6 @@ static int s3c_cpufreq_resume(struct cpufreq_policy *policy)static struct cpufreq_driver s3c24xx_driver = { .flags =CPUFREQ_STICKY , - .verify = s3c_cpufreq_verify, .target = s3c_cpufreq_target, .get = s3c_cpufreq_get, .init = s3c_cpufreq_init,
drivers/cpufreq/s3c64xx-cpufreq.c +1 -9
@@ -54,14 +54,6 @@ static struct cpufreq_frequency_table s3c64xx_freq_table[] = { };#endif -static int s3c64xx_cpufreq_verify_speed (struct cpufreq_policy *policy) -{ -if (policy->cpu !=0 ) -return -EINVAL ; - -return cpufreq_frequency_table_verify (policy, s3c64xx_freq_table); -} -static unsigned int s3c64xx_cpufreq_get_speed (unsigned int cpu) {if (cpu !=0 )
@@ -264,7 +256,7 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)static struct cpufreq_driver s3c64xx_cpufreq_driver = { .flags =0 , - .verify = s3c64xx_cpufreq_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = s3c64xx_cpufreq_set_target, .get = s3c64xx_cpufreq_get_speed, .init = s3c64xx_cpufreq_driver_init,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 82/228 cpufreq: s5pv210: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/s5pv210-cpufreq.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/cpufreq/s5pv210-cpufreq.c +1 -9
@@ -174,14 +174,6 @@ static void s5pv210_set_refresh(enum s5pv210_dmc_port ch, unsigned long freq)__raw_writel (tmp1, reg); } -static int s5pv210_verify_speed (struct cpufreq_policy *policy) -{ -if (policy->cpu) -return -EINVAL ; - -return cpufreq_frequency_table_verify (policy, s5pv210_freq_table); -} -static unsigned int s5pv210_getspeed (unsigned int cpu) {if (cpu)
@@ -603,7 +595,7 @@ static int s5pv210_cpufreq_reboot_notifier_event(struct notifier_block *this,static struct cpufreq_driver s5pv210_driver = { .flags =CPUFREQ_STICKY , - .verify = s5pv210_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = s5pv210_target, .get = s5pv210_getspeed, .init = s5pv210_cpu_init,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 83/228 cpufreq: sa11x0: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- arch/arm/mach-sa1100/generic.c | 22 ---------------------- arch/arm/mach-sa1100/generic.h | 1 - drivers/cpufreq/sa1100-cpufreq.c | 2 +- drivers/cpufreq/sa1110-cpufreq.c | 2 +- 4 files changed, 2 insertions(+), 25 deletions(-)
arch/arm/mach-sa1100/generic.c +0 -22
@@ -82,28 +82,6 @@ unsigned int sa11x0_ppcr_to_freq(unsigned int idx)return freq; } - -/* make sure that only the "userspace" governor is run -- anything else wouldn't make sense on -* this platform, anyway. -*/ -int sa11x0_verify_speed (struct cpufreq_policy *policy) -{ -unsigned int tmp; -if (policy->cpu) -return -EINVAL ; - -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq); - -/* make sure that at least one frequency is within the policy */ - tmp = sa11x0_freq_table[sa11x0_freq_to_ppcr (policy->min)].frequency; -if (tmp > policy->max) - policy->max = tmp; - -cpufreq_verify_within_limits (policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq); - -return 0 ; -} -unsigned int sa11x0_getspeed (unsigned int cpu) {if (cpu)
arch/arm/mach-sa1100/generic.h +0 -1
@@ -23,7 +23,6 @@ struct cpufreq_policy;extern struct cpufreq_frequency_table sa11x0_freq_table[];extern unsigned int sa11x0_freq_to_ppcr (unsigned int khz); -extern int sa11x0_verify_speed (struct cpufreq_policy *policy);extern unsigned int sa11x0_getspeed (unsigned int cpu);extern unsigned int sa11x0_ppcr_to_freq (unsigned int idx);
drivers/cpufreq/sa1100-cpufreq.c +1 -1
@@ -228,7 +228,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver sa1100_driver__refdata = { .flags =CPUFREQ_STICKY , - .verify = sa11x0_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = sa1100_target, .get = sa11x0_getspeed, .init = sa1100_cpu_init,
drivers/cpufreq/sa1110-cpufreq.c +1 -1
@@ -344,7 +344,7 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy)* it with cpufreq_register_driver() */ static struct cpufreq_driver sa1110_driver__refdata = { .flags =CPUFREQ_STICKY , - .verify = sa11x0_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = sa1110_target, .get = sa11x0_getspeed, .init = sa1110_cpu_init,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 083/228] cpufreq: sa11x0: Use generic cpufreq routines
Quoted 7 lines · Viresh Kumar
Most of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
Signed-off-by Viresh Kumar <[email protected]>
Viresh Kumar
maintainerPATCH 84/228 cpufreq: sc520: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/sc520_freq.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-)
drivers/cpufreq/sc520_freq.c +3 -21
@@ -78,11 +78,6 @@ static void sc520_freq_set_cpu_state(struct cpufreq_policy *policy,cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); }; -static int sc520_freq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, &sc520_freq_table[0 ]); -} -static int sc520_freq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -120,27 +115,14 @@ static int sc520_freq_cpu_init(struct cpufreq_policy *policy) } -static int sc520_freq_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - - -static struct freq_attr *sc520_freq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; - -static struct cpufreq_driver sc520_freq_driver = { .get = sc520_freq_get_cpu_frequency, - .verify = sc520_freq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = sc520_freq_target, .init = sc520_freq_cpu_init, - .exit = sc520_freq_cpu_exit, + .exit = cpufreq_generic_exit, .name ="sc520_freq" , - .attr = sc520_freq_attr, + .attr = cpufreq_generic_attr, };static const struct x86_cpu_id sc520_ids[] = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 85/228 cpufreq: sh: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/sh-cpufreq.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/cpufreq/sh-cpufreq.c +1 -6
@@ -151,11 +151,6 @@ static int sh_cpufreq_cpu_exit(struct cpufreq_policy *policy)return 0 ; } -static struct freq_attr *sh_freq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver sh_cpufreq_driver = { .name ="sh" , .get = sh_cpufreq_get,
@@ -163,7 +158,7 @@ static struct cpufreq_driver sh_cpufreq_driver = { .verify = sh_cpufreq_verify, .init = sh_cpufreq_cpu_init, .exit = sh_cpufreq_cpu_exit, - .attr = sh_freq_attr, + .attr = cpufreq_generic_attr, };static int __init sh_cpufreq_module_init (void )
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 86/228 cpufreq: sparc: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/sparc-us2e-cpufreq.c | 8 +------- drivers/cpufreq/sparc-us3-cpufreq.c | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-)
drivers/cpufreq/sparc-us2e-cpufreq.c +1 -7
@@ -295,12 +295,6 @@ static int us2e_freq_target(struct cpufreq_policy *policy,return 0 ; } -static int us2e_freq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, - &us2e_freq_table[policy->cpu].table[0 ]); -} -static int __init us2e_freq_cpu_init (struct cpufreq_policy *policy) {unsigned int cpu = policy->cpu;
@@ -363,7 +357,7 @@ static int __init us2e_freq_init(void) goto err_out; driver->init = us2e_freq_cpu_init; - driver->verify = us2e_freq_verify; + driver->verify = cpufreq_generic_frequency_table_verify; driver->target = us2e_freq_target; driver->get = us2e_freq_get; driver->exit = us2e_freq_cpu_exit;
drivers/cpufreq/sparc-us3-cpufreq.c +1 -7
@@ -156,12 +156,6 @@ static int us3_freq_target(struct cpufreq_policy *policy,return 0 ; } -static int us3_freq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, - &us3_freq_table[policy->cpu].table[0 ]); -} -static int __init us3_freq_cpu_init (struct cpufreq_policy *policy) {unsigned int cpu = policy->cpu;
@@ -224,7 +218,7 @@ static int __init us3_freq_init(void) goto err_out; driver->init = us3_freq_cpu_init; - driver->verify = us3_freq_verify; + driver->verify = cpufreq_generic_frequency_table_verify; driver->target = us3_freq_target; driver->get = us3_freq_get; driver->exit = us3_freq_cpu_exit;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 87/228 cpufreq: spear: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/spear-cpufreq.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-)
drivers/cpufreq/spear-cpufreq.c +3 -19
@@ -30,11 +30,6 @@ static struct {u32 cnt; } spear_cpufreq; -static int spear_cpufreq_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, spear_cpufreq.freq_tbl); -} -static unsigned int spear_cpufreq_get (unsigned int cpu) {return clk_get_rate (spear_cpufreq.clk) /1000 ;
@@ -192,26 +187,15 @@ static int spear_cpufreq_init(struct cpufreq_policy *policy)return 0 ; } -static int spear_cpufreq_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static struct freq_attr *spear_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver spear_cpufreq_driver = { .name ="cpufreq-spear" , .flags =CPUFREQ_STICKY , - .verify = spear_cpufreq_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = spear_cpufreq_target, .get = spear_cpufreq_get, .init = spear_cpufreq_init, - .exit = spear_cpufreq_exit, - .attr = spear_cpufreq_attr, + .exit = cpufreq_generic_exit, + .attr = cpufreq_generic_attr, };static int spear_cpufreq_driver_init (void )
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 88/228 cpufreq: speedstep: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/speedstep-centrino.c | 22 ++-------------------- drivers/cpufreq/speedstep-ich.c | 30 +++--------------------------- drivers/cpufreq/speedstep-smi.c | 30 +++--------------------------- 3 files changed, 8 insertions(+), 74 deletions(-)
drivers/cpufreq/speedstep-centrino.c +2 -20
@@ -420,19 +420,6 @@ static int centrino_cpu_exit(struct cpufreq_policy *policy) }/** -* centrino_verify - verifies a new CPUFreq policy -* @policy: new policy -* -* Limit must be within this model's frequency range at least one -* border included. -*/ -static int centrino_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, -per_cpu (centrino_model, policy->cpu)->op_points); -} - -/** * centrino_setpolicy - set a new CPUFreq policy * @policy: new policy * @target_freq: the target frequency
@@ -553,20 +540,15 @@ out:return retval; } -static struct freq_attr * centrino_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver centrino_driver = { .name ="centrino" ,/* should be speedstep-centrino, but there's a 16 char limit */ .init = centrino_cpu_init, .exit = centrino_cpu_exit, - .verify = centrino_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = centrino_target, .get = get_cur_freq, - .attr = centrino_attr, + .attr = cpufreq_generic_attr, };/*
drivers/cpufreq/speedstep-ich.c +3 -27
@@ -289,18 +289,6 @@ static int speedstep_target(struct cpufreq_policy *policy, } -/** -* speedstep_verify - verifies a new CPUFreq policy -* @policy: new policy -* -* Limit must be within speedstep_low_freq and speedstep_high_freq, with -* at least one border included. -*/ -static int speedstep_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, &speedstep_freqs[0 ]); -} -struct get_freqs {struct cpufreq_policy *policy;int ret;
@@ -352,26 +340,14 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy) } -static int speedstep_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} - -static struct freq_attr *speedstep_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; - -static struct cpufreq_driver speedstep_driver = { .name ="speedstep-ich" , - .verify = speedstep_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = speedstep_target, .init = speedstep_cpu_init, - .exit = speedstep_cpu_exit, + .exit = cpufreq_generic_exit, .get = speedstep_get, - .attr = speedstep_attr, + .attr = cpufreq_generic_attr, };static const struct x86_cpu_id ss_smi_ids[] = {
drivers/cpufreq/speedstep-smi.c +3 -27
@@ -264,19 +264,6 @@ static int speedstep_target(struct cpufreq_policy *policy, } -/** -* speedstep_verify - verifies a new CPUFreq policy -* @policy: new policy -* -* Limit must be within speedstep_low_freq and speedstep_high_freq, with -* at least one border included. -*/ -static int speedstep_verify (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, &speedstep_freqs[0 ]); -} - -static int speedstep_cpu_init (struct cpufreq_policy *policy) {int result;
@@ -332,12 +319,6 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)return cpufreq_table_validate_and_show (policy, speedstep_freqs); } -static int speedstep_cpu_exit (struct cpufreq_policy *policy) -{ -cpufreq_frequency_table_put_attr (policy->cpu); -return 0 ; -} -static unsigned int speedstep_get (unsigned int cpu) {if (cpu)
@@ -356,20 +337,15 @@ static int speedstep_resume(struct cpufreq_policy *policy)return result; } -static struct freq_attr *speedstep_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver speedstep_driver = { .name ="speedstep-smi" , - .verify = speedstep_verify, + .verify = cpufreq_generic_frequency_table_verify, .target = speedstep_target, .init = speedstep_cpu_init, - .exit = speedstep_cpu_exit, + .exit = cpufreq_generic_exit, .get = speedstep_get, .resume = speedstep_resume, - .attr = speedstep_attr, + .attr = cpufreq_generic_attr, };static const struct x86_cpu_id ss_smi_ids[] = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 89/228 cpufreq: tegra: Use generic cpufreq routines
In reply to Viresh KumarMost of the CPUFreq drivers do similar things in .exit() and .verify() routines and .attr. So its better if we have generic routines for them which can be used by cpufreq drivers then.
This patch uses these generic routines for this driver.
--- drivers/cpufreq/tegra-cpufreq.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/cpufreq/tegra-cpufreq.c +2 -12
@@ -51,11 +51,6 @@ static unsigned long target_cpu_speed[NUM_CPUS];static DEFINE_MUTEX (tegra_cpu_lock);static bool is_suspended; -static int tegra_verify_speed (struct cpufreq_policy *policy) -{ -return cpufreq_frequency_table_verify (policy, freq_table); -} -static unsigned int tegra_getspeed (unsigned int cpu) {unsigned long rate;
@@ -237,19 +232,14 @@ static int tegra_cpu_exit(struct cpufreq_policy *policy)return 0 ; } -static struct freq_attr *tegra_cpufreq_attr[] = { - &cpufreq_freq_attr_scaling_available_freqs, -NULL , -}; -static struct cpufreq_driver tegra_cpufreq_driver = { - .verify = tegra_verify_speed, + .verify = cpufreq_generic_frequency_table_verify, .target = tegra_target, .get = tegra_getspeed, .init = tegra_cpu_init, .exit = tegra_cpu_exit, .name ="tegra" , - .attr = tegra_cpufreq_attr, + .attr = cpufreq_generic_attr, };static int __init tegra_cpufreq_init (void )
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 90/228 cpufreq: call cpufreq_driver->get() after calling ->init()
In reply to Viresh KumarAlmost all drivers set policy->cur with current cpu frequency in their ->init() part. This can be done for all of them at core level and so they wouldn't need to do it.
This patch adds supporting code in cpufreq core for calling get() after we have called init() for a policy.
--- drivers/cpufreq/cpufreq.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/cpufreq/cpufreq.c +11 -0
@@ -1081,6 +1081,14 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, goto err_set_policy_cpu; } +if (cpufreq_driver->get) { + policy->cur = cpufreq_driver->get (policy->cpu); +if (!policy->cur) { +pr_err ("%s: ->get() failed\n" , __func__); + goto err_get_freq; + } + } +/* related cpus should atleast have policy->cpus */ cpumask_or (policy->related_cpus, policy->related_cpus, policy->cpus);
@@ -1135,6 +1143,9 @@ err_out_unregister:per_cpu (cpufreq_cpu_data, j) =NULL ;write_unlock_irqrestore (&cpufreq_driver_lock, flags); +err_get_freq: +if (cpufreq_driver->exit) + cpufreq_driver->exit (policy); err_set_policy_cpu:cpufreq_policy_free (policy); nomem_out:
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 91/228 cpufreq: acpi: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/acpi-cpufreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/acpi-cpufreq.c +0 -1
@@ -842,7 +842,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)break ;case ACPI_ADR_SPACE_FIXED_HARDWARE : acpi_cpufreq_driver.get = get_cur_freq_on_cpu; - policy->cur =get_cur_freq_on_cpu (cpu);break ;default :break ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 92/228 cpufreq: arm_big_little: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/arm_big_little.c | 2 -- 1 file changed, 2 deletions(-)
drivers/cpufreq/arm_big_little.c +0 -2
@@ -171,8 +171,6 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy)else policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; - policy->cur =bL_cpufreq_get (policy->cpu); -cpumask_copy (policy->cpus,topology_core_cpumask (policy->cpu));dev_info (cpu_dev,"%s: CPU %d initialized\n" , __func__, policy->cpu);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 93/228 cpufreq: at32ap: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/at32ap-cpufreq.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/cpufreq/at32ap-cpufreq.c +4 -8
@@ -77,7 +77,7 @@ static int at32_set_target(struct cpufreq_policy *policy,static int __init at32_cpufreq_driver_init (struct cpufreq_policy *policy) { -unsigned int frequency, rate; +unsigned int frequency, rate, min_freq;int retval, steps, i;if (policy->cpu !=0 )
@@ -90,12 +90,9 @@ static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy) goto out_err; } - policy->cpuinfo.min_freq = (clk_round_rate (cpuclk,1 ) +500 ) /1000 ; - policy->cpuinfo.max_freq = (clk_round_rate (cpuclk, ~0UL ) +500 ) /1000 ; + min_freq = (clk_round_rate (cpuclk,1 ) +500 ) /1000 ; + frequency = (clk_round_rate (cpuclk, ~0UL ) +500 ) /1000 ; policy->cpuinfo.transition_latency =0 ; - policy->cur =at32_get_speed (0 ); - policy->min = policy->cpuinfo.min_freq; - policy->max = policy->cpuinfo.max_freq;/* * AVR32 CPU frequency rate scales in power of two between maximum and
@@ -104,7 +101,7 @@ static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy)* Further validate that the frequency is usable, and append it to the * frequency table. */ - steps =fls (policy->cpuinfo.max_freq / policy->cpuinfo.min_freq) +1 ; + steps =fls (frequency / min_freq) +1 ; freq_table =kzalloc (steps *sizeof (struct cpufreq_frequency_table ),GFP_KERNEL );if (!freq_table) {
@@ -112,7 +109,6 @@ static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy) goto out_err_put_clk; } - frequency = policy->cpuinfo.max_freq;for (i =0 ; i < (steps -1 ); i++) { rate =clk_round_rate (cpuclk, frequency *1000 ) /1000 ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 94/228 cpufreq: blackfin: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/blackfin-cpufreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/blackfin-cpufreq.c +0 -1
@@ -204,7 +204,6 @@ static int __bfin_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =50000 ;/* 50us assumed */ - policy->cur = cclk;return cpufreq_table_validate_and_show (policy, bfin_freq_table); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 95/228 cpufreq: cpu0: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/cpufreq-cpu0.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/cpufreq-cpu0.c +0 -1
@@ -130,7 +130,6 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy) } policy->cpuinfo.transition_latency = transition_latency; - policy->cur =clk_get_rate (cpu_clk) /1000 ;/* * The driver only supports the SMP configuartion where all processors
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 96/228 cpufreq: nforce2: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/cpufreq-nforce2.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/cpufreq-nforce2.c +0 -1
@@ -360,7 +360,6 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) 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);return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 97/228 cpufreq: cris: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/cris-artpec3-cpufreq.c | 1 - drivers/cpufreq/cris-etraxfs-cpufreq.c | 1 - 2 files changed, 2 deletions(-)
drivers/cpufreq/cris-artpec3-cpufreq.c +0 -1
@@ -73,7 +73,6 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy) {/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =1000000 ;/* 1ms */ - policy->cur =cris_freq_get_cpu_frequency (0 );return cpufreq_table_validate_and_show (policy, cris_freq_table); }
drivers/cpufreq/cris-etraxfs-cpufreq.c +0 -1
@@ -72,7 +72,6 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy) {/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =1000000 ;/* 1ms */ - policy->cur =cris_freq_get_cpu_frequency (0 );return cpufreq_table_validate_and_show (policy, cris_freq_table); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 097/228] cpufreq: cris: don't initialize part of policy that is set by core too
Quoted 5 lines · Viresh Kumar
Many common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
Quoted 3 lines
Cc Mikael Starvik <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Viresh Kumar
maintainerPATCH 98/228 cpufreq: davinci: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/davinci-cpufreq.c | 2 -- 1 file changed, 2 deletions(-)
drivers/cpufreq/davinci-cpufreq.c +0 -2
@@ -136,8 +136,6 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)return result; } - policy->cur =davinci_getspeed (0 ); - result =cpufreq_table_validate_and_show (policy, freq_table);if (result) { pr_err("%s: cpufreq_table_validate_and_show() failed",
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 99/228 cpufreq: dbx500: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/dbx500-cpufreq.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/cpufreq/dbx500-cpufreq.c +0 -5
@@ -83,11 +83,6 @@ static int dbx500_cpufreq_init(struct cpufreq_policy *policy)return res; } - policy->min = policy->cpuinfo.min_freq; - policy->max = policy->cpuinfo.max_freq; - policy->cur =dbx500_cpufreq_getspeed (policy->cpu); - policy->governor =CPUFREQ_DEFAULT_GOVERNOR ; -/* * FIXME : Need to take time measurement across the target() * function with no/some/all drivers in the notification
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 099/228] cpufreq: dbx500: don't initialize part of policy that is set by core too
Quoted 8 lines · Viresh Kumar
Many common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
Cc Linus Walleij <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
Yours,
Linus Walleij
Viresh Kumar
maintainerPATCH 100/228 cpufreq: e_powersaver: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/e_powersaver.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/e_powersaver.c +0 -1
@@ -395,7 +395,6 @@ static int eps_cpu_init(struct cpufreq_policy *policy) } policy->cpuinfo.transition_latency =140000 ;/* 844mV -> 700mV in ns */ - policy->cur = fsb * current_multiplier; ret =cpufreq_table_validate_and_show (policy, ¢aur->freq_table[0 ]);if (ret) {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 101/228 cpufreq: elanfreq: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/elanfreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/elanfreq.c +0 -1
@@ -207,7 +207,6 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; - policy->cur =elanfreq_get_cpu_frequency (0 );return cpufreq_table_validate_and_show (policy, elanfreq_table); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 102/228 cpufreq: exynos: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/exynos-cpufreq.c | 2 -- drivers/cpufreq/exynos5440-cpufreq.c | 1 - 2 files changed, 3 deletions(-)
drivers/cpufreq/exynos-cpufreq.c +0 -2
@@ -241,8 +241,6 @@ static struct notifier_block exynos_cpufreq_nb = {static int exynos_cpufreq_cpu_init (struct cpufreq_policy *policy) { - policy->cur = policy->min = policy->max =exynos_getspeed (policy->cpu); -/* set the transition latency value */ policy->cpuinfo.transition_latency =100000 ;
drivers/cpufreq/exynos5440-cpufreq.c +0 -1
@@ -329,7 +329,6 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)return ret; } - policy->cur = dvfs_info->cur_frequency; policy->cpuinfo.transition_latency = dvfs_info->latency;cpumask_setall (policy->cpus);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 103/228 cpufreq: gx: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/gx-suspmod.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/cpufreq/gx-suspmod.c +1 -4
@@ -401,7 +401,7 @@ static int cpufreq_gx_target(struct cpufreq_policy *policy,static int cpufreq_gx_cpu_init (struct cpufreq_policy *policy) { -unsigned int maxfreq, curfreq; +unsigned int maxfreq;if (!policy || policy->cpu !=0 )return -ENODEV ;
@@ -415,10 +415,8 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy) maxfreq =30000 * gx_freq_mult[getCx86 (CX86_DIR1 ) &0x0f ]; stock_freq = maxfreq; - curfreq =gx_get_cpuspeed (0 );pr_debug ("cpu max frequency is %d.\n" , maxfreq); -pr_debug ("cpu current frequency is %dkHz.\n" , curfreq);/* setup basic struct for cpufreq API */ policy->cpu =0 ;
@@ -428,7 +426,6 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy)else policy->min = maxfreq /POLICY_MIN_DIV ; policy->max = maxfreq; - policy->cur = curfreq; policy->cpuinfo.min_freq = maxfreq / max_duration; policy->cpuinfo.max_freq = maxfreq; policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 104/228 cpufreq: ia64-acpi: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/ia64-acpi-cpufreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/ia64-acpi-cpufreq.c +0 -1
@@ -305,7 +305,6 @@ acpi_cpufreq_cpu_init ( data->acpi_data.states[i].transition_latency *1000 ; } } - policy->cur =processor_get_freq (data, policy->cpu);/* table init */ for (i =0 ; i <= data->acpi_data.state_count; i++)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 105/228 cpufreq: imx6q: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/imx6q-cpufreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/imx6q-cpufreq.c +0 -1
@@ -162,7 +162,6 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy) } policy->cpuinfo.transition_latency = transition_latency; - policy->cur =clk_get_rate (arm_clk) /1000 ;cpumask_setall (policy->cpus);return 0 ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 106/228 cpufreq: integrator: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/integrator-cpufreq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/cpufreq/integrator-cpufreq.c +2 -3
@@ -181,10 +181,9 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy) {/* set default policy and cpuinfo */ - policy->cpuinfo.max_freq =160000 ; - policy->cpuinfo.min_freq =12000 ; + policy->max = policy->cpuinfo.max_freq =160000 ; + policy->min = policy->cpuinfo.min_freq =12000 ; policy->cpuinfo.transition_latency =1000000 ;/* 1 ms, assumed */ - policy->cur = policy->min = policy->max =integrator_get (policy->cpu);return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 106/228] cpufreq: integrator: don't initialize part of policy that is set by core too
Quoted 17 lines · Viresh Kumar
Many common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
Cc Russell King <[email protected]>Signed-off-by Viresh Kumar <[email protected]>--- drivers/cpufreq/integrator-cpufreq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/cpufreq/integrator-cpufreq.c +0
-0
drivers/cpufreq/integrator-cpufreq.c static int integrator_cpufreq_init(struct cpufreq_policy *policy) · line 187
Quoted 9 lines
drivers/cpufreq/integrator-cpufreq.c +2
-3@@ -181,10 +181,9 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy) {/* set default policy and cpuinfo */ - policy->cpuinfo.max_freq =160000 ; - policy->cpuinfo.min_freq =12000 ; + policy->max = policy->cpuinfo.max_freq =160000 ; + policy->min = policy->cpuinfo.min_freq =12000 ; policy->cpuinfo.transition_latency =1000000 ;/* 1 ms, assumed */ - policy->cur = policy->min = policy->max =integrator_get (policy->cpu);
This patch actually changes things - the description is misleading. Please explain why this change - which results in different values for policy->min and policy->max doesn't cause any functional difference.
Thanks.
Viresh Kumar
maintainerRe: [PATCH 106/228] cpufreq: integrator: don't initialize part of policy that is set by core too
Quoted 3 lines · Russell King - ARM Linux
This patch actually changes things - the description is misleading. Please explain why this change - which results in different values for
policy->minandpolicy->maxdoesn't cause any functional difference.
Yeah, see if below log looks correct (patch attached):
Subject: [PATCH 106/228] cpufreq: integrator: don't initialize part of policy
that is set by core too
Many common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init(). And so we don't need to set policy->cur from driver anymore.
Over that it sets policy->min and max correctly. They were earlier set to current frequency of CPU but they should be set to max and min freq of cpu.
--- drivers/cpufreq/integrator-cpufreq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
From 6d8d406ebca886e5147191cc8c333d926ef9eb30 Mon Sep 17 00:00:00 2001
Message-Id: <6d8d406ebca886e5147191cc8c333d926ef9eb30.1379063063.git.viresh.kumar@linaro.org>
In-Reply-To: <[email protected]>
References: <[email protected]>
From: Viresh Kumar <[email protected]>
Date: Wed, 14 Aug 2013 16:02:47 +0530
Subject: [PATCH 106/228] cpufreq: integrator: don't initialize part of policy
that is set by core too
Many common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init(). And so we don't need to set policy->cur from driver anymore.
Over that it sets policy->min and max correctly. They were earlier set to current frequency of CPU but they should be set to max and min freq of cpu.
--- drivers/cpufreq/integrator-cpufreq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/cpufreq/integrator-cpufreq.c +2 -3
@@ -181,10 +181,9 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy) {/* set default policy and cpuinfo */ - policy->cpuinfo.max_freq =160000 ; - policy->cpuinfo.min_freq =12000 ; + policy->max = policy->cpuinfo.max_freq =160000 ; + policy->min = policy->cpuinfo.min_freq =12000 ; policy->cpuinfo.transition_latency =1000000 ;/* 1 ms, assumed */ - policy->cur = policy->min = policy->max =integrator_get (policy->cpu);return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 107/228 cpufreq: kirkwood: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/kirkwood-cpufreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/kirkwood-cpufreq.c +0 -1
@@ -122,7 +122,6 @@ static int kirkwood_cpufreq_cpu_init(struct cpufreq_policy *policy) {/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =5000 ;/* 5uS */ - policy->cur =kirkwood_cpufreq_get_cpu_frequency (0 );return cpufreq_table_validate_and_show (policy, kirkwood_freq_table); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 108/228 cpufreq: longhaul: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/longhaul.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/longhaul.c +0 -1
@@ -913,7 +913,6 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy)longhaul_setup_voltagescaling (); policy->cpuinfo.transition_latency =200000 ;/* nsec */ - policy->cur =calc_speed (longhaul_get_cpu_mult ());return cpufreq_table_validate_and_show (policy, longhaul_table); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 109/228 cpufreq: loongson2: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/loongson2_cpufreq.c | 2 -- 1 file changed, 2 deletions(-)
drivers/cpufreq/loongson2_cpufreq.c +0 -2
@@ -131,8 +131,6 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)return ret; } - policy->cur =loongson2_cpufreq_get (policy->cpu); -return cpufreq_table_validate_and_show (policy, &loongson2_clockmod_table[0 ]); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 110/228 cpufreq: maple: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/maple-cpufreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/maple-cpufreq.c +0 -1
@@ -166,7 +166,6 @@ static unsigned int maple_cpufreq_get_speed(unsigned int cpu)static int maple_cpufreq_cpu_init (struct cpufreq_policy *policy) { policy->cpuinfo.transition_latency =12000 ; - policy->cur = maple_cpu_freqs[maple_scom_query_freq ()].frequency;/* secondary CPUs are tied to the primary one by the * cpufreq core if in the secondary policy we tell it that * it actually must be one policy together with all others. */
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 111/228 cpufreq: omap: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/omap-cpufreq.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/cpufreq/omap-cpufreq.c +0 -4
@@ -171,8 +171,6 @@ static int omap_cpu_init(struct cpufreq_policy *policy) goto fail_ck; } - policy->cur =omap_getspeed (policy->cpu); -if (!freq_table) result =opp_init_cpufreq_table (mpu_dev, &freq_table);
@@ -188,8 +186,6 @@ static int omap_cpu_init(struct cpufreq_policy *policy)if (result) goto fail_table; - policy->cur =omap_getspeed (policy->cpu); -/* * On OMAP SMP configuartion, both processors share the voltage * and clock. So both CPUs needs to be scaled together and hence
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 112/228 cpufreq: p4: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/p4-clockmod.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/p4-clockmod.c +0 -1
@@ -230,7 +230,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)/* the transition latency is set to be 1 higher than the maximum * transition latency of the ondemand governor */ policy->cpuinfo.transition_latency =10000001 ; - policy->cur = stock_freq;return cpufreq_table_validate_and_show (policy, &p4clockmod_table[0 ]); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 113/228 cpufreq: pcc: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/pcc-cpufreq.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/cpufreq/pcc-cpufreq.c +0 -7
@@ -559,13 +559,6 @@ static int pcc_cpufreq_cpu_init(struct cpufreq_policy *policy)ioread32 (&pcch_hdr->nominal) *1000 ; policy->min = policy->cpuinfo.min_freq =ioread32 (&pcch_hdr->minimum_frequency) *1000 ; - policy->cur =pcc_get_freq (cpu); - -if (!policy->cur) { -pr_debug ("init: Unable to get current CPU frequency\n" ); - result = -EINVAL ; - goto out; - }pr_debug ("init: policy->max is %d, policy->min is %d\n" , policy->max, policy->min);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 114/228 cpufreq: pmac: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/pmac32-cpufreq.c | 1 - drivers/cpufreq/pmac64-cpufreq.c | 1 - 2 files changed, 2 deletions(-)
drivers/cpufreq/pmac32-cpufreq.c +0 -1
@@ -396,7 +396,6 @@ static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)return -ENODEV ; policy->cpuinfo.transition_latency = transition_latency; - policy->cur = cur_freq;return cpufreq_table_validate_and_show (policy, pmac_cpu_freqs); }
drivers/cpufreq/pmac64-cpufreq.c +0 -1
@@ -348,7 +348,6 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu)static int g5_cpufreq_cpu_init (struct cpufreq_policy *policy) { policy->cpuinfo.transition_latency = transition_latency; - policy->cur = g5_cpu_freqs[g5_query_freq ()].frequency;/* secondary CPUs are tied to the primary one by the * cpufreq core if in the secondary policy we tell it that * it actually must be one policy together with all others. */
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 115/228 cpufreq: powernow: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/powernow-k6.c | 1 - drivers/cpufreq/powernow-k7.c | 2 -- drivers/cpufreq/powernow-k8.c | 3 --- 3 files changed, 6 deletions(-)
drivers/cpufreq/powernow-k6.c +0 -1
@@ -151,7 +151,6 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =200000 ; - policy->cur = busfreq * max_multiplier;return cpufreq_table_validate_and_show (policy, clock_ratio); }
drivers/cpufreq/powernow-k7.c +0 -2
@@ -673,8 +673,6 @@ static int powernow_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency =cpufreq_scale (2000000UL , fsb, latency); - policy->cur =powernow_get (0 ); -return cpufreq_table_validate_and_show (policy, powernow_table); }
drivers/cpufreq/powernow-k8.c +0 -3
@@ -1161,9 +1161,6 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)cpumask_copy (pol->cpus,cpu_core_mask (pol->cpu)); data->available_cores = pol->cpus; - pol->cur =find_khz_freq_from_fid (data->currfid); -pr_debug ("policy current frequency %d kHz\n" , pol->cur); -/* min/max the cpu is capable of */ if (cpufreq_table_validate_and_show (pol, data->powernow_table)) { printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n");
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 116/228 cpufreq: ppc: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/ppc-corenet-cpufreq.c | 2 -- 1 file changed, 2 deletions(-)
drivers/cpufreq/ppc-corenet-cpufreq.c +0 -2
@@ -217,8 +217,6 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy)per_cpu (cpu_data, i) = data; policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; - policy->cur =corenet_cpufreq_get_speed (policy->cpu); -of_node_put (np);return 0 ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 117/228 cpufreq: pxa: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/pxa2xx-cpufreq.c | 2 -- drivers/cpufreq/pxa3xx-cpufreq.c | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/cpufreq/pxa2xx-cpufreq.c +0 -2
@@ -397,8 +397,6 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)/* set default policy and cpuinfo */ policy->cpuinfo.transition_latency =1000 ;/* FIXME: 1 ms, assumed */ - policy->cur =get_clk_frequency_khz (0 );/* current freq */ - policy->min = policy->max = policy->cur;/* Generate pxa25x the run cpufreq_frequency_table struct */ for (i =0 ; i < NUM_PXA25x_RUN_FREQS; i++) {
drivers/cpufreq/pxa3xx-cpufreq.c +3 -4
@@ -201,11 +201,10 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)int ret = -EINVAL ;/* set default policy and cpuinfo */ - policy->cpuinfo.min_freq =104000 ; - policy->cpuinfo.max_freq = (cpu_is_pxa320 ()) ?806000 :624000 ; + policy->min = policy->cpuinfo.min_freq =104000 ; + policy->max = policy->cpuinfo.max_freq = + (cpu_is_pxa320 ()) ?806000 :624000 ; policy->cpuinfo.transition_latency =1000 ;/* FIXME: 1 ms, assumed */ - policy->max =pxa3xx_get_clk_frequency_khz (0 ); - policy->cur = policy->min = policy->max;if (cpu_is_pxa300 () ||cpu_is_pxa310 ()) ret = setup_freqs_table(policy, pxa300_freqs,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 118/228 cpufreq: s3c: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/s3c2416-cpufreq.c | 2 -- drivers/cpufreq/s3c24xx-cpufreq.c | 5 ----- drivers/cpufreq/s3c64xx-cpufreq.c | 2 -- 3 files changed, 9 deletions(-)
drivers/cpufreq/s3c2416-cpufreq.c +0 -2
@@ -476,8 +476,6 @@ static int __init s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy) freq++; } - policy->cur =clk_get_rate (s3c_freq->armclk) /1000 ; -/* Datasheet says PLL stabalisation time must be at least 300us, * so but add some fudge. (reference in LOCKCON0 register description) */
drivers/cpufreq/s3c24xx-cpufreq.c +0 -5
@@ -378,11 +378,6 @@ static int s3c_cpufreq_init(struct cpufreq_policy *policy)if (policy->cpu !=0 )return -EINVAL ; - policy->cur =s3c_cpufreq_get (0 ); - policy->min = policy->cpuinfo.min_freq =0 ; - policy->max = policy->cpuinfo.max_freq = cpu_cur.info->max.fclk /1000 ; - policy->governor =CPUFREQ_DEFAULT_GOVERNOR ; -/* feed the latency information from the cpu driver */ policy->cpuinfo.transition_latency = cpu_cur.info->latency;
drivers/cpufreq/s3c64xx-cpufreq.c +0 -2
@@ -235,8 +235,6 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy) freq++; } - policy->cur =clk_get_rate (armclk) /1000 ; -/* Datasheet says PLL stabalisation time (if we were to use * the PLLs, which we don't currently) is ~300us worst case, * but add some fudge.
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 119/228 cpufreq: s5pv210: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/s5pv210-cpufreq.c | 2 -- 1 file changed, 2 deletions(-)
drivers/cpufreq/s5pv210-cpufreq.c +0 -2
@@ -543,8 +543,6 @@ static int __init s5pv210_cpu_init(struct cpufreq_policy *policy) s5pv210_dram_conf[1 ].refresh = (__raw_readl (S5P_VA_DMC1 +0x30 ) *1000 ); s5pv210_dram_conf[1 ].freq =clk_get_rate (dmc1_clk); - policy->cur = policy->min = policy->max =s5pv210_getspeed (0 ); - policy->cpuinfo.transition_latency =40000 ;return cpufreq_table_validate_and_show (policy, s5pv210_freq_table);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 120/228 cpufreq: sa11x0: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/sa1100-cpufreq.c | 1 - drivers/cpufreq/sa1110-cpufreq.c | 1 - 2 files changed, 2 deletions(-)
drivers/cpufreq/sa1100-cpufreq.c +0 -1
@@ -220,7 +220,6 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy) {if (policy->cpu !=0 )return -EINVAL ; - policy->cur =sa11x0_getspeed (0 ); policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ;return cpufreq_table_validate_and_show (policy, sa11x0_freq_table);
drivers/cpufreq/sa1110-cpufreq.c +0 -1
@@ -334,7 +334,6 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy) {if (policy->cpu !=0 )return -EINVAL ; - policy->cur =sa11x0_getspeed (0 ); policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ;return cpufreq_table_validate_and_show (policy, sa11x0_freq_table);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 120/228] cpufreq: sa11x0: don't initialize part of policy that is set by core too
Quoted 8 lines · Viresh Kumar
Many common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
Cc Russell King <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
Viresh Kumar
maintainerPATCH 121/228 cpufreq: sc520_freq: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/sc520_freq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/sc520_freq.c +0 -1
@@ -109,7 +109,6 @@ static int sc520_freq_cpu_init(struct cpufreq_policy *policy)/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =1000000 ;/* 1ms */ - policy->cur =sc520_freq_get_cpu_frequency (0 );return cpufreq_table_validate_and_show (policy, sc520_freq_table); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 122/228 cpufreq: sh: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/sh-cpufreq.c | 2 -- 1 file changed, 2 deletions(-)
drivers/cpufreq/sh-cpufreq.c +0 -2
@@ -111,8 +111,6 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)return PTR_ERR (cpuclk); } - policy->cur =sh_cpufreq_get (cpu); - freq_table = cpuclk->nr_freqs ? cpuclk->freq_table :NULL ;if (freq_table) {int result;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 123/228 cpufreq: spear: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/spear-cpufreq.c | 2 -- 1 file changed, 2 deletions(-)
drivers/cpufreq/spear-cpufreq.c +0 -2
@@ -180,8 +180,6 @@ static int spear_cpufreq_init(struct cpufreq_policy *policy) } policy->cpuinfo.transition_latency = spear_cpufreq.transition_latency; - policy->cur =spear_cpufreq_get (0 ); -cpumask_setall (policy->cpus);return 0 ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 124/228 cpufreq: speedstep: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/speedstep-centrino.c | 5 ----- drivers/cpufreq/speedstep-ich.c | 15 +-------------- drivers/cpufreq/speedstep-smi.c | 13 ------------- 3 files changed, 1 insertion(+), 32 deletions(-)
drivers/cpufreq/speedstep-centrino.c +0 -5
@@ -343,7 +343,6 @@ static unsigned int get_cur_freq(unsigned int cpu)static int centrino_cpu_init (struct cpufreq_policy *policy) {struct cpuinfo_x86 *cpu = &cpu_data (policy->cpu); -unsigned freq;unsigned l, h;int i;
@@ -394,12 +393,8 @@ static int centrino_cpu_init(struct cpufreq_policy *policy) } } - freq =get_cur_freq (policy->cpu); policy->cpuinfo.transition_latency =10000 ;/* 10uS transition latency */ - policy->cur = freq; - -pr_debug ("centrino_cpu_init: cur=%dkHz\n" , policy->cur);return cpufreq_table_validate_and_show (policy,per_cpu (centrino_model, policy->cpu)->op_points);
drivers/cpufreq/speedstep-ich.c +1 -14
@@ -308,7 +308,7 @@ static void get_freqs_on_cpu(void *_get_freqs)static int speedstep_cpu_init (struct cpufreq_policy *policy) { -unsigned int policy_cpu, speed; +unsigned int policy_cpu;struct get_freqs gf;/* only run on CPU to be set, or on its sibling */
@@ -323,19 +323,6 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)if (gf.ret)return gf.ret; -/* get current speed setting */ - speed =speedstep_get (policy_cpu); -if (!speed) -return -EIO ; - -pr_debug ("currently at %s speed setting - %i MHz\n" , - (speed == speedstep_freqs[SPEEDSTEP_LOW ].frequency) - ?"low" :"high" , - (speed /1000 )); - -/* cpuinfo and default policy values */ - policy->cur = speed; -return cpufreq_table_validate_and_show (policy, speedstep_freqs); }
drivers/cpufreq/speedstep-smi.c +0 -13
@@ -267,7 +267,6 @@ static int speedstep_target(struct cpufreq_policy *policy,static int speedstep_cpu_init (struct cpufreq_policy *policy) {int result; -unsigned int speed, state;unsigned int *low, *high;/* capability check */
@@ -303,19 +302,7 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)pr_debug ("workaround worked.\n" ); } -/* get current speed setting */ - state =speedstep_get_state (); - speed = speedstep_freqs[state].frequency; - -pr_debug ("currently at %s speed setting - %i MHz\n" , - (speed == speedstep_freqs[SPEEDSTEP_LOW ].frequency) - ?"low" :"high" , - (speed /1000 )); - -/* cpuinfo and default policy values */ policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; - policy->cur = speed; -return cpufreq_table_validate_and_show (policy, speedstep_freqs); }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 125/228 cpufreq: tegra: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/tegra-cpufreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/tegra-cpufreq.c +1 -2
@@ -211,8 +211,7 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)clk_prepare_enable (cpu_clk);cpufreq_table_validate_and_show (policy, freq_table); - policy->cur =tegra_getspeed (policy->cpu); - target_cpu_speed[policy->cpu] = policy->cur; + target_cpu_speed[policy->cpu] =tegra_getspeed (policy->cpu);/* FIXME: what's the actual transition time? */ policy->cpuinfo.transition_latency =300 *1000 ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 126/228 cpufreq: unicore2: don't initialize part of policy that is set by core too
In reply to Viresh KumarMany common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code.
Most recent of those changes is to call ->get() in the core after calling ->init().
--- drivers/cpufreq/unicore2-cpufreq.c | 1 - 1 file changed, 1 deletion(-)
drivers/cpufreq/unicore2-cpufreq.c +0 -1
@@ -66,7 +66,6 @@ static int __init ucv2_cpu_init(struct cpufreq_policy *policy) {if (policy->cpu !=0 )return -EINVAL ; - policy->cur =ucv2_getspeed (0 ); policy->min = policy->cpuinfo.min_freq =250000 ; policy->max = policy->cpuinfo.max_freq =1000000 ; policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 127/228 cpufreq: create cpufreq_generic_init() routine
In reply to Viresh KumarMany CPUFreq drivers for SMP system (where all cores share same clock lines), do similar stuff in their ->init() part.
This patch creates a generic routine in cpufreq core which can be used by these so that we can remove some redundant code.
--- drivers/cpufreq/Kconfig | 1 + drivers/cpufreq/cpufreq.c | 31 +++++++++++++++++++++++++++++++ include/linux/cpufreq.h | 3 +++ 3 files changed, 35 insertions(+)
drivers/cpufreq/Kconfig +1 -0
@@ -2,6 +2,7 @@ menu "CPU Frequency scaling" config CPU_FREQ bool "CPU Frequency scaling" + select CPU_FREQ_TABLE help CPU Frequency scaling allows you to change the clock speed of CPUs on the fly. This is a nice method to save power, because
drivers/cpufreq/cpufreq.c +31 -0
@@ -183,6 +183,37 @@ u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy) }EXPORT_SYMBOL_GPL (get_cpu_idle_time); +/* +* This is a generic cpufreq init() routine which can be used by cpufreq +* drivers of SMP systems. It will do following: +* - validate & show freq table passed +* - set policies transition latency +* - policy->cpus with all possible CPUs +*/ +int cpufreq_generic_init (struct cpufreq_policy *policy, +struct cpufreq_frequency_table *table, +unsigned int transition_latency) +{ +int ret; + + ret =cpufreq_table_validate_and_show (policy, table); +if (ret) { +pr_err ("%s: invalid frequency table: %d\n" , __func__, ret); +return ret; + } + + policy->cpuinfo.transition_latency = transition_latency; + +/* +* The driver only supports the SMP configuartion where all processors +* share the clock and voltage and clock. +*/ +cpumask_setall (policy->cpus); + +return 0 ; +} +EXPORT_SYMBOL_GPL (cpufreq_generic_init); +struct cpufreq_policy *cpufreq_cpu_get (unsigned int cpu) {struct cpufreq_policy *policy =NULL ;
include/linux/cpufreq.h +3 -0
@@ -438,6 +438,9 @@ void cpufreq_frequency_table_put_attr(unsigned int cpu);int cpufreq_table_validate_and_show (struct cpufreq_policy *policy,struct cpufreq_frequency_table *table); +int cpufreq_generic_init (struct cpufreq_policy *policy, +struct cpufreq_frequency_table *table, +unsigned int transition_latency);static inline int cpufreq_generic_exit (struct cpufreq_policy *policy) {cpufreq_frequency_table_put_attr (policy->cpu);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 128/228 cpufreq: remove CONFIG_CPU_FREQ_TABLE
In reply to Viresh KumarCONFIG_CPU_FREQ_TABLE will be always enabled when cpufreq framework is used, as cpufreq core depends on it. So, we don't need this CONFIG option anymore as it is not configurable. Remove CONFIG_CPU_FREQ_TABLE and update its users.
--- arch/arm/mach-davinci/Kconfig | 1 - arch/arm/mach-pxa/Kconfig | 3 --- arch/arm/mach-ux500/Kconfig | 1 - arch/blackfin/Kconfig | 1 - arch/cris/Kconfig | 2 -- drivers/cpufreq/Kconfig | 12 ------------ drivers/cpufreq/Kconfig.arm | 11 ----------- drivers/cpufreq/Kconfig.powerpc | 6 ------ drivers/cpufreq/Kconfig.x86 | 13 ------------- drivers/cpufreq/Makefile | 5 +---- drivers/cpufreq/cpufreq.c | 2 -- drivers/thermal/Kconfig | 1 - 12 files changed, 1 insertion(+), 57 deletions(-)
arch/arm/mach-davinci/Kconfig +0 -1
@@ -40,7 +40,6 @@ config ARCH_DAVINCI_DA850 bool "DA850/OMAP-L138/AM18x based system" select ARCH_DAVINCI_DA8XX select ARCH_HAS_CPUFREQ - select CPU_FREQ_TABLE select CP_INTC config ARCH_DAVINCI_DA8XX
arch/arm/mach-pxa/Kconfig +0 -3
@@ -615,14 +615,12 @@ endmenu config PXA25x bool select CPU_XSCALE - select CPU_FREQ_TABLE if CPU_FREQ help Select code specific to PXA21x/25x/26x variants config PXA27x bool select CPU_XSCALE - select CPU_FREQ_TABLE if CPU_FREQ help Select code specific to PXA27x variants
@@ -635,7 +633,6 @@ config CPU_PXA26x config PXA3xx bool select CPU_XSC3 - select CPU_FREQ_TABLE if CPU_FREQ help Select code specific to PXA3xx variants
arch/arm/mach-ux500/Kconfig +0 -1
@@ -34,7 +34,6 @@ config UX500_SOC_COMMON config UX500_SOC_DB8500 bool - select CPU_FREQ_TABLE if CPU_FREQ select MFD_DB8500_PRCMU select PINCTRL_DB8500 select PINCTRL_DB8540
arch/blackfin/Kconfig +0 -1
@@ -1430,7 +1430,6 @@ source "drivers/cpufreq/Kconfig" config BFIN_CPU_FREQ bool depends on CPU_FREQ - select CPU_FREQ_TABLE default y config CPU_VOLTAGE
arch/cris/Kconfig +0 -2
@@ -134,13 +134,11 @@ config SVINTO_SIM config ETRAXFS bool "ETRAX-FS-V32" - select CPU_FREQ_TABLE if CPU_FREQ help Support CRIS V32. config CRIS_MACH_ARTPEC3 bool "ARTPEC-3" - select CPU_FREQ_TABLE if CPU_FREQ help Support Axis ARTPEC-3.
drivers/cpufreq/Kconfig +0 -12
@@ -2,7 +2,6 @@ menu "CPU Frequency scaling" config CPU_FREQ bool "CPU Frequency scaling" - select CPU_FREQ_TABLE help CPU Frequency scaling allows you to change the clock speed of CPUs on the fly. This is a nice method to save power, because
@@ -18,15 +17,11 @@ config CPU_FREQ if CPU_FREQ -config CPU_FREQ_TABLE - tristate - config CPU_FREQ_GOV_COMMON bool config CPU_FREQ_STAT tristate "CPU frequency translation statistics" - select CPU_FREQ_TABLE default y help This driver exports CPU frequency statistics information through sysfs
@@ -144,7 +139,6 @@ config CPU_FREQ_GOV_USERSPACE config CPU_FREQ_GOV_ONDEMAND tristate "'ondemand' cpufreq policy governor" - select CPU_FREQ_TABLE select CPU_FREQ_GOV_COMMON help 'ondemand' - This driver adds a dynamic cpufreq policy governor.
@@ -188,7 +182,6 @@ config CPU_FREQ_GOV_CONSERVATIVE config GENERIC_CPUFREQ_CPU0 tristate "Generic CPU0 cpufreq driver" depends on HAVE_CLK && REGULATOR && PM_OPP && OF - select CPU_FREQ_TABLE help This adds a generic cpufreq driver for CPU0 frequency management. It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)
@@ -224,7 +217,6 @@ depends on IA64 config IA64_ACPI_CPUFREQ tristate "ACPI Processor P-States driver" - select CPU_FREQ_TABLE depends on ACPI_PROCESSOR help This driver adds a CPUFreq driver which utilizes the ACPI
@@ -241,7 +233,6 @@ depends on MIPS config LOONGSON2_CPUFREQ tristate "Loongson2 CPUFreq Driver" - select CPU_FREQ_TABLE help This option adds a CPUFreq driver for loongson processors which support software configurable cpu frequency.
@@ -263,7 +254,6 @@ menu "SPARC CPU frequency scaling drivers" depends on SPARC64 config SPARC_US3_CPUFREQ tristate "UltraSPARC-III CPU Frequency driver" - select CPU_FREQ_TABLE help This adds the CPUFreq driver for UltraSPARC-III processors.
@@ -273,7 +263,6 @@ config SPARC_US3_CPUFREQ config SPARC_US2E_CPUFREQ tristate "UltraSPARC-IIe CPU Frequency driver" - select CPU_FREQ_TABLE help This adds the CPUFreq driver for UltraSPARC-IIe processors.
@@ -286,7 +275,6 @@ menu "SH CPU Frequency scaling" depends on SUPERH config SH_CPU_FREQ tristate "SuperH CPU Frequency driver" - select CPU_FREQ_TABLE help This adds the cpufreq driver for SuperH. Any CPU that supports clock rate rounding through the clock framework can use this
drivers/cpufreq/Kconfig.arm +0 -11
@@ -5,7 +5,6 @@ config ARM_BIG_LITTLE_CPUFREQ tristate "Generic ARM big LITTLE CPUfreq driver" depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK - select CPU_FREQ_TABLE help This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.
@@ -18,7 +17,6 @@ config ARM_DT_BL_CPUFREQ config ARM_EXYNOS_CPUFREQ bool - select CPU_FREQ_TABLE config ARM_EXYNOS4210_CPUFREQ bool "SAMSUNG EXYNOS4210"
@@ -58,7 +56,6 @@ config ARM_EXYNOS5440_CPUFREQ depends on SOC_EXYNOS5440 depends on HAVE_CLK && PM_OPP && OF default y - select CPU_FREQ_TABLE help This adds the CPUFreq driver for Samsung EXYNOS5440 SoC. The nature of exynos5440 clock controller is
@@ -85,7 +82,6 @@ config ARM_IMX6Q_CPUFREQ tristate "Freescale i.MX6Q cpufreq support" depends on SOC_IMX6Q depends on REGULATOR_ANATOP - select CPU_FREQ_TABLE help This adds cpufreq driver support for Freescale i.MX6Q SOC.
@@ -101,7 +97,6 @@ config ARM_INTEGRATOR config ARM_KIRKWOOD_CPUFREQ def_bool ARCH_KIRKWOOD && OF - select CPU_FREQ_TABLE help This adds the CPUFreq driver for Marvell Kirkwood SoCs.
@@ -110,7 +105,6 @@ config ARM_OMAP2PLUS_CPUFREQ bool "TI OMAP2+" depends on ARCH_OMAP2PLUS default ARCH_OMAP2PLUS - select CPU_FREQ_TABLE config ARM_S3C_CPUFREQ bool
@@ -165,7 +159,6 @@ config ARM_S3C2412_CPUFREQ config ARM_S3C2416_CPUFREQ bool "S3C2416 CPU Frequency scaling support" depends on CPU_S3C2416 - select CPU_FREQ_TABLE help This adds the CPUFreq driver for the Samsung S3C2416 and S3C2450 SoC. The S3C2416 supports changing the rate of the
@@ -196,7 +189,6 @@ config ARM_S3C2440_CPUFREQ config ARM_S3C64XX_CPUFREQ bool "Samsung S3C64XX" depends on CPU_S3C6410 - select CPU_FREQ_TABLE default y help This adds the CPUFreq driver for Samsung S3C6410 SoC.
@@ -206,7 +198,6 @@ config ARM_S3C64XX_CPUFREQ config ARM_S5PV210_CPUFREQ bool "Samsung S5PV210 and S5PC110" depends on CPU_S5PV210 - select CPU_FREQ_TABLE default y help This adds the CPUFreq driver for Samsung S5PV210 and
@@ -223,7 +214,6 @@ config ARM_SA1110_CPUFREQ config ARM_SPEAR_CPUFREQ bool "SPEAr CPUFreq support" depends on PLAT_SPEAR - select CPU_FREQ_TABLE default y help This adds the CPUFreq driver support for SPEAr SOCs.
@@ -231,7 +221,6 @@ config ARM_SPEAR_CPUFREQ config ARM_TEGRA_CPUFREQ bool "TEGRA CPUFreq support" depends on ARCH_TEGRA - select CPU_FREQ_TABLE default y help This adds the CPUFreq driver support for TEGRA SOCs.
drivers/cpufreq/Kconfig.powerpc +0 -6
@@ -1,7 +1,6 @@ config CPU_FREQ_CBE tristate "CBE frequency scaling" depends on CBE_RAS && PPC_CELL - select CPU_FREQ_TABLE default m help This adds the cpufreq driver for Cell BE processors.
@@ -20,7 +19,6 @@ config CPU_FREQ_CBE_PMI config CPU_FREQ_MAPLE bool "Support for Maple 970FX Evaluation Board" depends on PPC_MAPLE - select CPU_FREQ_TABLE help This adds support for frequency switching on Maple 970FX Evaluation Board and compatible boards (IBM JS2x blades).
@@ -28,7 +26,6 @@ config CPU_FREQ_MAPLE config PPC_CORENET_CPUFREQ tristate "CPU frequency scaling driver for Freescale E500MC SoCs" depends on PPC_E500MC && OF && COMMON_CLK - select CPU_FREQ_TABLE select CLK_PPC_CORENET help This adds the CPUFreq driver support for Freescale e500mc,
@@ -38,7 +35,6 @@ config PPC_CORENET_CPUFREQ config CPU_FREQ_PMAC bool "Support for Apple PowerBooks" depends on ADB_PMU && PPC32 - select CPU_FREQ_TABLE help This adds support for frequency switching on Apple PowerBooks, this currently includes some models of iBook & Titanium
@@ -47,7 +43,6 @@ config CPU_FREQ_PMAC config CPU_FREQ_PMAC64 bool "Support for some Apple G5s" depends on PPC_PMAC && PPC64 - select CPU_FREQ_TABLE help This adds support for frequency switching on Apple iMac G5, and some of the more recent desktop G5 machines as well.
@@ -55,7 +50,6 @@ config CPU_FREQ_PMAC64 config PPC_PASEMI_CPUFREQ bool "Support for PA Semi PWRficient" depends on PPC_PASEMI - select CPU_FREQ_TABLE default y help This adds the support for frequency switching on PA Semi
drivers/cpufreq/Kconfig.x86 +0 -13
@@ -31,7 +31,6 @@ config X86_PCC_CPUFREQ config X86_ACPI_CPUFREQ tristate "ACPI Processor P-States driver" - select CPU_FREQ_TABLE depends on ACPI_PROCESSOR help This driver adds a CPUFreq driver which utilizes the ACPI
@@ -60,7 +59,6 @@ config X86_ACPI_CPUFREQ_CPB config ELAN_CPUFREQ tristate "AMD Elan SC400 and SC410" - select CPU_FREQ_TABLE depends on MELAN ---help--- This adds the CPUFreq driver for AMD Elan SC400 and SC410
@@ -76,7 +74,6 @@ config ELAN_CPUFREQ config SC520_CPUFREQ tristate "AMD Elan SC520" - select CPU_FREQ_TABLE depends on MELAN ---help--- This adds the CPUFreq driver for AMD Elan SC520 processor.
@@ -88,7 +85,6 @@ config SC520_CPUFREQ config X86_POWERNOW_K6 tristate "AMD Mobile K6-2/K6-3 PowerNow!" - select CPU_FREQ_TABLE depends on X86_32 help This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
@@ -100,7 +96,6 @@ config X86_POWERNOW_K6 config X86_POWERNOW_K7 tristate "AMD Mobile Athlon/Duron PowerNow!" - select CPU_FREQ_TABLE depends on X86_32 help This adds the CPUFreq driver for mobile AMD K7 mobile processors.
@@ -118,7 +113,6 @@ config X86_POWERNOW_K7_ACPI config X86_POWERNOW_K8 tristate "AMD Opteron/Athlon64 PowerNow!" - select CPU_FREQ_TABLE depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ help This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.
@@ -132,7 +126,6 @@ config X86_POWERNOW_K8 config X86_AMD_FREQ_SENSITIVITY tristate "AMD frequency sensitivity feedback powersave bias" depends on CPU_FREQ_GOV_ONDEMAND && X86_ACPI_CPUFREQ && CPU_SUP_AMD - select CPU_FREQ_TABLE help This adds AMD-specific powersave bias function to the ondemand governor, which allows it to make more power-conscious frequency
@@ -160,7 +153,6 @@ config X86_GX_SUSPMOD config X86_SPEEDSTEP_CENTRINO tristate "Intel Enhanced SpeedStep (deprecated)" - select CPU_FREQ_TABLE select X86_SPEEDSTEP_CENTRINO_TABLE if X86_32 depends on X86_32 || (X86_64 && ACPI_PROCESSOR) help
@@ -190,7 +182,6 @@ config X86_SPEEDSTEP_CENTRINO_TABLE config X86_SPEEDSTEP_ICH tristate "Intel Speedstep on ICH-M chipsets (ioport interface)" - select CPU_FREQ_TABLE depends on X86_32 help This adds the CPUFreq driver for certain mobile Intel Pentium III
@@ -204,7 +195,6 @@ config X86_SPEEDSTEP_ICH config X86_SPEEDSTEP_SMI tristate "Intel SpeedStep on 440BX/ZX/MX chipsets (SMI interface)" - select CPU_FREQ_TABLE depends on X86_32 help This adds the CPUFreq driver for certain mobile Intel Pentium III
@@ -217,7 +207,6 @@ config X86_SPEEDSTEP_SMI config X86_P4_CLOCKMOD tristate "Intel Pentium 4 clock modulation" - select CPU_FREQ_TABLE help This adds the CPUFreq driver for Intel Pentium 4 / XEON processors. When enabled it will lower CPU temperature by skipping
@@ -259,7 +248,6 @@ config X86_LONGRUN config X86_LONGHAUL tristate "VIA Cyrix III Longhaul" - select CPU_FREQ_TABLE depends on X86_32 && ACPI_PROCESSOR help This adds the CPUFreq driver for VIA Samuel/CyrixIII,
@@ -272,7 +260,6 @@ config X86_LONGHAUL config X86_E_POWERSAVER tristate "VIA C7 Enhanced PowerSaver (DANGEROUS)" - select CPU_FREQ_TABLE depends on X86_32 && ACPI_PROCESSOR help This adds the CPUFreq driver for VIA C7 processors. However, this driver
drivers/cpufreq/Makefile +1 -4
@@ -1,5 +1,5 @@ # CPUfreq core -obj-$(CONFIG_CPU_FREQ) += cpufreq.o +obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o # CPUfreq stats obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o
@@ -11,9 +11,6 @@ obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o obj-$(CONFIG_CPU_FREQ_GOV_COMMON) += cpufreq_governor.o -# CPUfreq cross-arch helpers -obj-$(CONFIG_CPU_FREQ_TABLE) += freq_table.o - obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o ##################################################################################
drivers/cpufreq/cpufreq.c +0 -2
@@ -1025,9 +1025,7 @@ static void update_policy_cpu(struct cpufreq_policy *policy, unsigned int cpu) policy->last_cpu = policy->cpu; policy->cpu = cpu; -#ifdef CONFIG_CPU_FREQ_TABLE cpufreq_frequency_table_update_policy_cpu (policy); -#endif blocking_notifier_call_chain (&cpufreq_policy_notifier_list,CPUFREQ_UPDATE_POLICY_CPU , policy); }
drivers/thermal/Kconfig +0 -1
@@ -69,7 +69,6 @@ config THERMAL_GOV_USER_SPACE config CPU_THERMAL bool "generic cpu cooling support" depends on CPU_FREQ - select CPU_FREQ_TABLE help This implements the generic cpu cooling mechanism through frequency reduction. An ACPI version of this already exists
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 129/228 cpufreq: cpu0: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/cpufreq-cpu0.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
drivers/cpufreq/cpufreq-cpu0.c +1 -18
@@ -121,24 +121,7 @@ post_notify:static int cpu0_cpufreq_init (struct cpufreq_policy *policy) { -int ret; - - ret =cpufreq_table_validate_and_show (policy, freq_table); -if (ret) { -pr_err ("invalid frequency table: %d\n" , ret); -return ret; - } - - policy->cpuinfo.transition_latency = transition_latency; - -/* -* The driver only supports the SMP configuartion where all processors -* share the clock and voltage and clock. Use cpufreq affected_cpus -* interface to have all CPUs scaled together. -*/ -cpumask_setall (policy->cpus); - -return 0 ; +return cpufreq_generic_init (policy, freq_table, transition_latency); }static struct cpufreq_driver cpu0_cpufreq_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 130/228 cpufreq: cris: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/cris-artpec3-cpufreq.c | 6 +----- drivers/cpufreq/cris-etraxfs-cpufreq.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-)
drivers/cpufreq/cris-artpec3-cpufreq.c +1 -5
@@ -71,13 +71,9 @@ static int cris_freq_target(struct cpufreq_policy *policy,static int cris_freq_cpu_init (struct cpufreq_policy *policy) { -/* cpuinfo and default policy values */ - policy->cpuinfo.transition_latency =1000000 ;/* 1ms */ - -return cpufreq_table_validate_and_show (policy, cris_freq_table); +return cpufreq_generic_init (policy, cris_freq_table,1000000 ); } -static struct cpufreq_driver cris_freq_driver = { .get = cris_freq_get_cpu_frequency, .verify = cpufreq_generic_frequency_table_verify,
drivers/cpufreq/cris-etraxfs-cpufreq.c +1 -4
@@ -70,10 +70,7 @@ static int cris_freq_target(struct cpufreq_policy *policy,static int cris_freq_cpu_init (struct cpufreq_policy *policy) { -/* cpuinfo and default policy values */ - policy->cpuinfo.transition_latency =1000000 ;/* 1ms */ - -return cpufreq_table_validate_and_show (policy, cris_freq_table); +return cpufreq_generic_init (policy, cris_freq_table,1000000 ); }static struct cpufreq_driver cris_freq_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 130/228] cpufreq: cris: use cpufreq_generic_init() routine
Quoted 2 lines · Viresh Kumar
Use generic
cpufreq_generic_init()routine instead of replicating the same code here.
Quoted 3 lines
Cc Mikael Starvik <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Viresh Kumar
maintainerPATCH 131/228 cpufreq: davinci: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/davinci-cpufreq.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/cpufreq/davinci-cpufreq.c +1 -9
@@ -136,21 +136,13 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)return result; } - result =cpufreq_table_validate_and_show (policy, freq_table); -if (result) { -pr_err ("%s: cpufreq_table_validate_and_show() failed" , - __func__); -return result; - } -/* * Time measurement across the target() function yields ~1500-1800us * time taken with no drivers on notification list. * Setting the latency to 2000 us to accommodate addition of drivers * to pre/post change notification list. */ - policy->cpuinfo.transition_latency =2000 *1000 ; -return 0 ; +return cpufreq_generic_init (policy, freq_table,2000 *1000 ); }static struct cpufreq_driver davinci_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 132/228 cpufreq: dbx500: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/dbx500-cpufreq.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
drivers/cpufreq/dbx500-cpufreq.c +1 -20
@@ -74,26 +74,7 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)static int dbx500_cpufreq_init (struct cpufreq_policy *policy) { -int res; - -/* get policy fields based on the table */ - res =cpufreq_table_validate_and_show (policy, freq_table); -if (res) { -pr_err ("dbx500-cpufreq: Failed to read policy table\n" ); -return res; - } - -/* -* FIXME : Need to take time measurement across the target() -* function with no/some/all drivers in the notification -* list. -*/ - policy->cpuinfo.transition_latency =20 *1000 ;/* in ns */ - -/* policy sharing between dual CPUs */ -cpumask_setall (policy->cpus); - -return 0 ; +return cpufreq_generic_init (policy, freq_table,20 *1000 ); }static struct cpufreq_driver dbx500_cpufreq_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 133/228 cpufreq: exynos: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/exynos-cpufreq.c | 7 +------ drivers/cpufreq/exynos5440-cpufreq.c | 14 ++------------ 2 files changed, 3 insertions(+), 18 deletions(-)
drivers/cpufreq/exynos-cpufreq.c +1 -6
@@ -241,12 +241,7 @@ static struct notifier_block exynos_cpufreq_nb = {static int exynos_cpufreq_cpu_init (struct cpufreq_policy *policy) { -/* set the transition latency value */ - policy->cpuinfo.transition_latency =100000 ; - -cpumask_setall (policy->cpus); - -return cpufreq_table_validate_and_show (policy, exynos_info->freq_table); +return cpufreq_generic_init (policy, exynos_info->freq_table,100000 ); }static struct cpufreq_driver exynos_driver = {
drivers/cpufreq/exynos5440-cpufreq.c +2 -12
@@ -321,18 +321,8 @@ static void exynos_sort_descend_freq_table(void)static int exynos_cpufreq_cpu_init (struct cpufreq_policy *policy) { -int ret; - - ret =cpufreq_table_validate_and_show (policy, dvfs_info->freq_table); -if (ret) { -dev_err (dvfs_info->dev,"Invalid frequency table: %d\n" , ret); -return ret; - } - - policy->cpuinfo.transition_latency = dvfs_info->latency; -cpumask_setall (policy->cpus); - -return 0 ; +return cpufreq_generic_init (policy, dvfs_info->freq_table, + dvfs_info->latency); }static struct cpufreq_driver exynos_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 134/228 cpufreq: imx6q: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/imx6q-cpufreq.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/cpufreq/imx6q-cpufreq.c +1 -12
@@ -153,18 +153,7 @@ post_notify:static int imx6q_cpufreq_init (struct cpufreq_policy *policy) { -int ret; - - ret =cpufreq_table_validate_and_show (policy, freq_table); -if (ret) { -dev_err (cpu_dev,"invalid frequency table: %d\n" , ret); -return ret; - } - - policy->cpuinfo.transition_latency = transition_latency; -cpumask_setall (policy->cpus); - -return 0 ; +return cpufreq_generic_init (policy, freq_table, transition_latency); }static struct cpufreq_driver imx6q_cpufreq_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 135/228 cpufreq: kirkwood: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/kirkwood-cpufreq.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/cpufreq/kirkwood-cpufreq.c +1 -4
@@ -120,10 +120,7 @@ static int kirkwood_cpufreq_target(struct cpufreq_policy *policy,/* Module init and exit code */ static int kirkwood_cpufreq_cpu_init (struct cpufreq_policy *policy) { -/* cpuinfo and default policy values */ - policy->cpuinfo.transition_latency =5000 ;/* 5uS */ - -return cpufreq_table_validate_and_show (policy, kirkwood_freq_table); +return cpufreq_generic_init (policy, kirkwood_freq_table,5000 ); }static struct cpufreq_driver kirkwood_cpufreq_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 136/228 cpufreq: loongson2: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here. This driver wasn't setting transition_latency and so is getting set to 0 by default. Lets mark it explicitly by calling the generic routine with transition_latency as 0.
--- drivers/cpufreq/loongson2_cpufreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/cpufreq/loongson2_cpufreq.c +1 -2
@@ -131,8 +131,7 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)return ret; } -return cpufreq_table_validate_and_show (policy, - &loongson2_clockmod_table[0 ]); +return cpufreq_generic_init (policy, &loongson2_clockmod_table[0 ],0 ); }static int loongson2_cpufreq_exit (struct cpufreq_policy *policy)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 136/228] cpufreq: loongson2: use cpufreq_generic_init() routine
Quoted 8 lines · Viresh Kumar
Use generic
cpufreq_generic_init()routine instead of replicating the same code here. This driver wasn't settingtransition_latencyand so is getting set to 0 by default. Lets mark it explicitly by calling the generic routine withtransition_latencyas 0.Cc Aaro Koskinen <[email protected]>Cc John Crispin <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
BTW, this is not ARM but MIPS board, so adding linux-mips to CC.
A.
Quoted 21 lines
--- drivers/cpufreq/loongson2_cpufreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/cpufreq/loongson2_cpufreq.c +1
-2@@ -131,8 +131,7 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)return ret; } -return cpufreq_table_validate_and_show (policy, - &loongson2_clockmod_table[0 ]); +return cpufreq_generic_init (policy, &loongson2_clockmod_table[0 ],0 ); }static int loongson2_cpufreq_exit (struct cpufreq_policy *policy)Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 137/228 cpufreq: maple: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/maple-cpufreq.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/cpufreq/maple-cpufreq.c +1 -8
@@ -165,16 +165,9 @@ static unsigned int maple_cpufreq_get_speed(unsigned int cpu)static int maple_cpufreq_cpu_init (struct cpufreq_policy *policy) { - policy->cpuinfo.transition_latency =12000 ; -/* secondary CPUs are tied to the primary one by the -* cpufreq core if in the secondary policy we tell it that -* it actually must be one policy together with all others. */ -cpumask_setall (policy->cpus); - -return cpufreq_table_validate_and_show (policy, maple_cpu_freqs); +return cpufreq_generic_init (policy, maple_cpu_freqs,12000 ); } -static struct cpufreq_driver maple_cpufreq_driver = { .name ="maple" , .flags =CPUFREQ_CONST_LOOPS ,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 138/228 cpufreq: omap: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
This also rearranges the code a bit to make it more sensible. Also removes some unnecessary checks.
--- drivers/cpufreq/omap-cpufreq.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-)
drivers/cpufreq/omap-cpufreq.c +11 -30
@@ -160,50 +160,31 @@ static inline void freq_table_free(void)static int omap_cpu_init (struct cpufreq_policy *policy) { -int result =0 ; +int result; mpu_clk =clk_get (NULL ,"cpufreq_ck" );if (IS_ERR (mpu_clk))return PTR_ERR (mpu_clk); -if (policy->cpu >=NR_CPUS ) { - result = -EINVAL ; - goto fail_ck; - } - -if (!freq_table) +if (!freq_table) { result =opp_init_cpufreq_table (mpu_dev, &freq_table); - -if (result) { -dev_err (mpu_dev,"%s: cpu%d: failed creating freq table[%d]\n" , +if (result) { +dev_err (mpu_dev, +"%s: cpu%d: failed creating freq table[%d]\n" , __func__, policy->cpu, result); - goto fail_ck; + goto fail; + } }atomic_inc_return (&freq_table_users); - result =cpufreq_table_validate_and_show (policy, freq_table); -if (result) - goto fail_table; - -/* -* On OMAP SMP configuartion, both processors share the voltage -* and clock. So both CPUs needs to be scaled together and hence -* needs software co-ordination. Use cpufreq affected_cpus -* interface to handle this scenario. Additional is_smp() check -* is to keep SMP_ON_UP build working. -*/ -if (is_smp ()) -cpumask_setall (policy->cpus); -/* FIXME: what's the actual transition time? */ - policy->cpuinfo.transition_latency =300 *1000 ; - -return 0 ; + result =cpufreq_generic_init (policy, freq_table,300 *1000 ); +if (!result) +return 0 ; -fail_table:freq_table_free (); -fail_ck: +fail:clk_put (mpu_clk);return result; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 139/228 cpufreq: pasemi: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/pasemi-cpufreq.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/cpufreq/pasemi-cpufreq.c +1 -8
@@ -204,20 +204,13 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)pr_debug ("%d: %d\n" , i, pas_freqs[i].frequency); } - policy->cpuinfo.transition_latency =get_gizmo_latency (); - cur_astate =get_cur_astate (policy->cpu);pr_debug ("current astate is at %d\n" ,cur_astate); policy->cur = pas_freqs[cur_astate].frequency; -cpumask_copy (policy->cpus, cpu_online_mask); - ppc_proc_freq = policy->cur *1000ul ; -/* this ensures that policy->cpuinfo_min and policy->cpuinfo_max -* are set correctly -*/ -return cpufreq_table_validate_and_show (policy, pas_freqs); +return cpufreq_generic_init (policy, pas_freqs,get_gizmo_latency ()); out_unmap_sdcpwr:iounmap (sdcpwr_mapbase);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 140/228 cpufreq: pmac32: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/pmac32-cpufreq.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/cpufreq/pmac32-cpufreq.c +1 -6
@@ -392,12 +392,7 @@ static int pmac_cpufreq_target( struct cpufreq_policy *policy,static int pmac_cpufreq_cpu_init (struct cpufreq_policy *policy) { -if (policy->cpu !=0 ) -return -ENODEV ; - - policy->cpuinfo.transition_latency = transition_latency; - -return cpufreq_table_validate_and_show (policy, pmac_cpu_freqs); +return cpufreq_generic_init (policy, pmac_cpu_freqs, transition_latency); }static u32 read_gpio (struct device_node *np)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 141/228 cpufreq: pmac64: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/pmac64-cpufreq.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/cpufreq/pmac64-cpufreq.c +1 -8
@@ -347,16 +347,9 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu)static int g5_cpufreq_cpu_init (struct cpufreq_policy *policy) { - policy->cpuinfo.transition_latency = transition_latency; -/* secondary CPUs are tied to the primary one by the -* cpufreq core if in the secondary policy we tell it that -* it actually must be one policy together with all others. */ -cpumask_copy (policy->cpus, cpu_online_mask); - -return cpufreq_table_validate_and_show (policy, g5_cpu_freqs); +return cpufreq_generic_init (policy, g5_cpu_freqs, transition_latency); } -static struct cpufreq_driver g5_cpufreq_driver = { .name ="powermac" , .flags =CPUFREQ_CONST_LOOPS ,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 142/228 cpufreq: s3c: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/s3c2416-cpufreq.c | 6 ++---- drivers/cpufreq/s3c24xx-cpufreq.c | 13 +------------ drivers/cpufreq/s3c64xx-cpufreq.c | 5 ++--- 3 files changed, 5 insertions(+), 19 deletions(-)
drivers/cpufreq/s3c2416-cpufreq.c +2 -4
@@ -479,10 +479,8 @@ static int __init s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)/* Datasheet says PLL stabalisation time must be at least 300us, * so but add some fudge. (reference in LOCKCON0 register description) */ - policy->cpuinfo.transition_latency = (500 *1000 ) + - s3c_freq->regulator_latency; - - ret =cpufreq_table_validate_and_show (policy, s3c_freq->freq_table); + ret =cpufreq_generic_init (policy, s3c_freq->freq_table, + (500 *1000 ) + s3c_freq->regulator_latency);if (ret) goto err_freq_table;
drivers/cpufreq/s3c24xx-cpufreq.c +1 -12
@@ -373,18 +373,7 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name)static int s3c_cpufreq_init (struct cpufreq_policy *policy) { -printk (KERN_INFO "%s: initialising policy %p\n" , __func__, policy); - -if (policy->cpu !=0 ) -return -EINVAL ; - -/* feed the latency information from the cpu driver */ - policy->cpuinfo.transition_latency = cpu_cur.info->latency; - -if (ftab) -return cpufreq_table_validate_and_show (policy, ftab); - -return 0 ; +return cpufreq_generic_init (policy, ftab, cpu_cur.info->latency); }static int __init s3c_cpufreq_initclks (void )
drivers/cpufreq/s3c64xx-cpufreq.c +2 -3
@@ -239,9 +239,8 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)* the PLLs, which we don't currently) is ~300us worst case, * but add some fudge. */ - policy->cpuinfo.transition_latency = (500 *1000 ) + regulator_latency; - - ret =cpufreq_table_validate_and_show (policy, s3c64xx_freq_table); + ret =cpufreq_generic_init (policy, s3c64xx_freq_table, + (500 *1000 ) + regulator_latency);if (ret !=0 ) {pr_err ("Failed to configure frequency table: %d\n" , ret);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 143/228 cpufreq: s5pv210: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/s5pv210-cpufreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/cpufreq/s5pv210-cpufreq.c +1 -3
@@ -543,9 +543,7 @@ static int __init s5pv210_cpu_init(struct cpufreq_policy *policy) s5pv210_dram_conf[1 ].refresh = (__raw_readl (S5P_VA_DMC1 +0x30 ) *1000 ); s5pv210_dram_conf[1 ].freq =clk_get_rate (dmc1_clk); - policy->cpuinfo.transition_latency =40000 ; - -return cpufreq_table_validate_and_show (policy, s5pv210_freq_table); +return cpufreq_generic_init (policy, s5pv210_freq_table,40000 ); out_dmc1:clk_put (dmc0_clk);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 144/228 cpufreq: sa11x0: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/sa1100-cpufreq.c | 6 +----- drivers/cpufreq/sa1110-cpufreq.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-)
drivers/cpufreq/sa1100-cpufreq.c +1 -5
@@ -218,11 +218,7 @@ static int sa1100_target(struct cpufreq_policy *policy,static int __init sa1100_cpu_init (struct cpufreq_policy *policy) { -if (policy->cpu !=0 ) -return -EINVAL ; - policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; - -return cpufreq_table_validate_and_show (policy, sa11x0_freq_table); +return cpufreq_generic_init (policy, sa11x0_freq_table,CPUFREQ_ETERNAL ); }static struct cpufreq_driver sa1100_driver__refdata = {
drivers/cpufreq/sa1110-cpufreq.c +1 -5
@@ -332,11 +332,7 @@ static int sa1110_target(struct cpufreq_policy *policy,static int __init sa1110_cpu_init (struct cpufreq_policy *policy) { -if (policy->cpu !=0 ) -return -EINVAL ; - policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ; - -return cpufreq_table_validate_and_show (policy, sa11x0_freq_table); +return cpufreq_generic_init (policy, sa11x0_freq_table,CPUFREQ_ETERNAL ); }/* sa1110_driver needs __refdata because it must remain after init registers
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 144/228] cpufreq: sa11x0: use cpufreq_generic_init() routine
Quoted 4 lines · Viresh Kumar
Use generic
cpufreq_generic_init()routine instead of replicating the same code here.Signed-off-by Viresh Kumar <[email protected]>
Viresh Kumar
maintainerPATCH 145/228 cpufreq: spear: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/spear-cpufreq.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/cpufreq/spear-cpufreq.c +2 -12
@@ -171,18 +171,8 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,static int spear_cpufreq_init (struct cpufreq_policy *policy) { -int ret; - - ret =cpufreq_table_validate_and_show (policy, spear_cpufreq.freq_tbl); -if (ret) { -pr_err ("cpufreq_table_validate_and_show() failed" ); -return ret; - } - - policy->cpuinfo.transition_latency = spear_cpufreq.transition_latency; -cpumask_setall (policy->cpus); - -return 0 ; +return cpufreq_generic_init (policy, spear_cpufreq.freq_tbl, + spear_cpufreq.transition_latency); }static struct cpufreq_driver spear_cpufreq_driver = {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 146/228 cpufreq: tegra: use cpufreq_generic_init() routine
In reply to Viresh KumarUse generic cpufreq_generic_init() routine instead of replicating the same code here.
--- drivers/cpufreq/tegra-cpufreq.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/cpufreq/tegra-cpufreq.c +9 -4
@@ -204,19 +204,23 @@ static struct notifier_block tegra_cpu_pm_notifier = {static int tegra_cpu_init (struct cpufreq_policy *policy) { +int ret; +if (policy->cpu >=NUM_CPUS )return -EINVAL ;clk_prepare_enable (emc_clk);clk_prepare_enable (cpu_clk); -cpufreq_table_validate_and_show (policy, freq_table); target_cpu_speed[policy->cpu] =tegra_getspeed (policy->cpu);/* FIXME: what's the actual transition time? */ - policy->cpuinfo.transition_latency =300 *1000 ; - -cpumask_copy (policy->cpus, cpu_possible_mask); + ret =cpufreq_generic_init (policy, freq_table,300 *1000 ); +if (ret) { +clk_disable_unprepare (cpu_clk); +clk_disable_unprepare (emc_clk); +return ret; + }if (policy->cpu ==0 )register_pm_notifier (&tegra_cpu_pm_notifier);
@@ -227,6 +231,7 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)static int tegra_cpu_exit (struct cpufreq_policy *policy) {cpufreq_frequency_table_put_attr (policy->cpu); +clk_disable_unprepare (cpu_clk);clk_disable_unprepare (emc_clk);return 0 ; }
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 147/228 cpufreq: Implement light weight ->target_index() routine
In reply to Viresh KumarCurrently prototype of cpufreq_drivers target routines is:
int target(struct cpufreq_policy *policy, unsigned int target_freq,
unsigned int relation);
And most of the drivers call cpufreq_frequency_table_target() to get a valid index of their frequency table which is closest to the target_freq. And they don't use target_freq and relation after it.
So, it makes sense to just do this work in cpufreq core before calling cpufreq_frequency_table_target() and simply pass index instead. But this can be done only with drivers which expose their frequency table with cpufreq core. For others we need to stick with the old prototype of target() until those drivers are converted to expose frequency tables.
This patch implements the new light weight prototype for target_index() routine. It looks like this:
int target_index(struct cpufreq_policy *policy, unsigned int index);
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and pass index to it. Because CPUFreq core now requires to call routines present in freq_table.c CONFIG_CPU_FREQ_TABLE must be enabled all the time.
This also marks target() interface as deprecated. So, that new drivers avoid using it. And Documentation is updated accordingly.
--- Documentation/cpu-freq/cpu-drivers.txt | 27 ++++++++++------ Documentation/cpu-freq/governors.txt | 4 +-- drivers/cpufreq/cpufreq.c | 59 +++++++++++++++++++++++++++------- include/linux/cpufreq.h | 4 ++- 4 files changed, 71 insertions(+), 23 deletions(-)
Documentation/cpu-freq/cpu-drivers.txt +18 -9
@@ -23,8 +23,8 @@ Contents: 1.1 Initialization 1.2 Per-CPU Initialization 1.3 verify -1.4 target or setpolicy? -1.5 target +1.4 target/target_index or setpolicy? +1.5 target/target_index 1.6 setpolicy 2. Frequency Table Helpers
@@ -56,7 +56,8 @@ cpufreq_driver.init - A pointer to the per-CPU initialization cpufreq_driver.verify - A pointer to a "verification" function. cpufreq_driver.setpolicy _or_ -cpufreq_driver.target - See below on the differences. +cpufreq_driver.target/ +target_index - See below on the differences. And optionally
@@ -66,7 +67,7 @@ cpufreq_driver.resume - A pointer to a per-CPU resume function which is called with interrupts disabled and _before_ the pre-suspend frequency and/or policy is restored by a call to - ->target or ->setpolicy. + ->target/target_index or ->setpolicy. cpufreq_driver.attr - A pointer to a NULL-terminated list of "struct freq_attr" which allow to
@@ -103,8 +104,8 @@ policy->governor must contain the "default policy" for this CPU. A few moments later, cpufreq_driver.verify and either cpufreq_driver.setpolicy or - cpufreq_driver.target is called with - these values. + cpufreq_driver.target/target_index is called + with these values. 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
@@ -133,20 +134,28 @@ range) is within policy->min and policy->max. If necessary, increase policy->max first, and only if this is no solution, decrease policy->min. -1.4 target or setpolicy? +1.4 target/target_index or setpolicy? ---------------------------- Most cpufreq drivers or even most cpu frequency scaling algorithms only allow the CPU to be set to one frequency. For these, you use the -->target call. +->target/target_index call. Some cpufreq-capable processors switch the frequency between certain limits on their own. These shall use the ->setpolicy call -1.4. target +1.4. target/target_index ------------- +The target_index call has two arguments: struct cpufreq_policy *policy, +and unsigned int index (into the exposed frequency table). + +The CPUfreq driver must set the new frequency when called here. The +actual frequency must be determined by freq_table[index].frequency. + +Deprecated: +---------- The target call has three arguments: struct cpufreq_policy *policy, unsigned int target_frequency, unsigned int relation.
Documentation/cpu-freq/governors.txt +2 -2
@@ -40,7 +40,7 @@ Most cpufreq drivers (in fact, all except one, longrun) or even most cpu frequency scaling algorithms only offer the CPU to be set to one frequency. In order to offer dynamic frequency scaling, the cpufreq core must be able to tell these drivers of a "target frequency". So -these specific drivers will be transformed to offer a "->target" +these specific drivers will be transformed to offer a "->target/target_index" call instead of the existing "->setpolicy" call. For "longrun", all stays the same, though.
@@ -71,7 +71,7 @@ CPU can be set to switch independently | CPU can only be set / the limits of policy->{min,max} / \ / \ - Using the ->setpolicy call, Using the ->target call, + Using the ->setpolicy call, Using the ->target/target_index call, the limits and the the frequency closest "policy" is set. to target_freq is set. It is assured that it
drivers/cpufreq/cpufreq.c +48 -11
140 lines not on this page · raw message
include/linux/cpufreq.h +3 -1
@@ -188,9 +188,11 @@ struct cpufreq_driver {/* define one out of two */ int (*setpolicy) (struct cpufreq_policy *policy); -int (*target) (struct cpufreq_policy *policy, +int (*target) (struct cpufreq_policy *policy,/* Deprecated */ unsigned int target_freq,unsigned int relation); +int (*target_index) (struct cpufreq_policy *policy, +unsigned int index);/* should be defined, if possible */ unsigned int (*get) (unsigned int cpu);
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 148/228 cpufreq: acpi: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/acpi-cpufreq.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +6 -15
@@ -424,17 +424,17 @@ static unsigned int check_freqs(const struct cpumask *mask, unsigned int freq, }static int acpi_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +unsigned int index) {struct acpi_cpufreq_data *data =per_cpu (acfreq_data, policy->cpu);struct acpi_processor_performance *perf;struct cpufreq_freqs freqs;struct drv_cmd cmd; -unsigned int next_state =0 ;/* Index into freq_table */ unsigned int next_perf_state =0 ;/* Index into perf table */ int result =0 ; -pr_debug ("acpi_cpufreq_target %d (%d)\n" , target_freq, policy->cpu); +pr_debug ("acpi_cpufreq_target %d (%d)\n" , + data->freq_table[index].frequency, policy->cpu);if (unlikely (data ==NULL || data->acpi_data ==NULL || data->freq_table ==NULL )) {
@@ -442,16 +442,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, } perf = data->acpi_data; - result =cpufreq_frequency_table_target (policy, - data->freq_table, - target_freq, - relation, &next_state); -if (unlikely (result)) { - result = -ENODEV ; - goto out; - } - - next_perf_state = data->freq_table[next_state].driver_data; + next_perf_state = data->freq_table[index].driver_data;if (perf->state == next_perf_state) {if (unlikely (data->resume)) { pr_debug("Called after resume, resetting to P%d\n",
@@ -493,7 +484,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, cmd.mask =cpumask_of (policy->cpu); freqs.old = perf->states[perf->state].core_frequency *1000 ; - freqs.new = data->freq_table[next_state].frequency; + freqs.new = data->freq_table[index].frequency;cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );drv_write (&cmd);
@@ -918,7 +909,7 @@ static struct freq_attr *acpi_cpufreq_attr[] = {static struct cpufreq_driver acpi_cpufreq_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = acpi_cpufreq_target, + .target_index = acpi_cpufreq_target, .bios_limit = acpi_processor_get_bios_limit, .init = acpi_cpufreq_cpu_init, .exit = acpi_cpufreq_cpu_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 149/228 cpufreq: arm_big_little: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/arm_big_little.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
drivers/cpufreq/arm_big_little.c +5 -12
@@ -49,28 +49,21 @@ static unsigned int bL_cpufreq_get(unsigned int cpu)/* Set clock frequency */ static int bL_cpufreq_set_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +unsigned int index) {struct cpufreq_freqs freqs; -u32 cpu = policy->cpu, freq_tab_idx, cur_cluster; +u32 cpu = policy->cpu, cur_cluster;int ret =0 ; cur_cluster =cpu_to_cluster (policy->cpu); freqs.old =bL_cpufreq_get (policy->cpu); - -/* Determine valid target frequency using freq_table */ -cpufreq_frequency_table_target (policy, freq_table[cur_cluster], - target_freq, relation, &freq_tab_idx); - freqs.new = freq_table[cur_cluster][freq_tab_idx].frequency; + freqs.new = freq_table[cur_cluster][index].frequency;pr_debug ("%s: cpu: %d, cluster: %d, oldfreq: %d, target freq: %d, new freq: %d\n" , - __func__, cpu, cur_cluster, freqs.old, target_freq, + __func__, cpu, cur_cluster, freqs.old, freqs.new, freqs.new); -if (freqs.old == freqs.new) -return 0 ; -cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); ret =clk_set_rate (clk[cur_cluster], freqs.new *1000 );
@@ -200,7 +193,7 @@ static struct cpufreq_driver bL_cpufreq_driver = { .flags = CPUFREQ_STICKY | CPUFREQ_HAVE_GOVERNOR_PER_POLICY, .verify = cpufreq_generic_frequency_table_verify, - .target = bL_cpufreq_set_target, + .target_index = bL_cpufreq_set_target, .get = bL_cpufreq_get, .init = bL_cpufreq_init, .exit = bL_cpufreq_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 150/228 cpufreq: at32ap: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/at32ap-cpufreq.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-)
drivers/cpufreq/at32ap-cpufreq.c +5 -18
@@ -35,25 +35,12 @@ static unsigned int at32_get_speed(unsigned int cpu)static unsigned int ref_freq;static unsigned long loops_per_jiffy_ref; -static int at32_set_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +static int at32_set_target (struct cpufreq_policy *policy,unsigned int index) {struct cpufreq_freqs freqs; -long freq; - -/* Convert target_freq from kHz to Hz */ - freq =clk_round_rate (cpuclk, target_freq *1000 ); - -/* Check if policy->min <= new_freq <= policy->max */ -if (freq < (policy->min *1000 ) || freq > (policy->max *1000 )) -return -EINVAL ; - -pr_debug ("cpufreq: requested frequency %u Hz\n" , target_freq *1000 ); freqs.old =at32_get_speed (0 ); - freqs.new = (freq +500 ) /1000 ; - freqs.flags =0 ; + freqs.new = freq_table[index].frequency;if (!ref_freq) { ref_freq = freqs.old;
@@ -64,13 +51,13 @@ static int at32_set_target(struct cpufreq_policy *policy,if (freqs.old < freqs.new) boot_cpu_data.loops_per_jiffy =cpufreq_scale ( loops_per_jiffy_ref, ref_freq, freqs.new); -clk_set_rate (cpuclk, freq); +clk_set_rate (cpuclk, freqs.new *1000 );if (freqs.new < freqs.old) boot_cpu_data.loops_per_jiffy =cpufreq_scale ( loops_per_jiffy_ref, ref_freq, freqs.new);cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); -pr_debug ("cpufreq: set frequency %lu Hz\n" , freq); +pr_debug ("cpufreq: set frequency %u Hz\n" , freqs.new *1000 );return 0 ; }
@@ -139,7 +126,7 @@ static struct cpufreq_driver at32_driver = { .name = "at32ap", .init = at32_cpufreq_driver_init, .verify = cpufreq_generic_frequency_table_verify, - .target = at32_set_target, + .target_index = at32_set_target, .get = at32_get_speed, .flags = CPUFREQ_STICKY, };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 151/228 cpufreq: blackfin: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/blackfin-cpufreq.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
drivers/cpufreq/blackfin-cpufreq.c +4 -13
@@ -127,14 +127,11 @@ unsigned long cpu_set_cclk(int cpu, unsigned long new) }#endif -static int bfin_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +static int bfin_target (struct cpufreq_policy *policy,unsigned int index) {#ifndef CONFIG_BF60xunsigned int plldiv;#endif -unsigned int index; -unsigned long cclk_hz;struct cpufreq_freqs freqs;static unsigned long lpj_ref;static unsigned int lpj_ref_freq;
@@ -144,17 +141,11 @@ static int bfin_target(struct cpufreq_policy *policy,cycles_t cycles;#endif -if (cpufreq_frequency_table_target (policy, bfin_freq_table, target_freq, - relation, &index)) -return -EINVAL ; - - cclk_hz = bfin_freq_table[index].frequency; - freqs.old =bfin_getfreq_khz (0 ); - freqs.new = cclk_hz; + freqs.new = bfin_freq_table[index].frequency;pr_debug ("cpufreq: changing cclk to %lu; target = %u, oldfreq = %u\n" , - cclk_hz, target_freq, freqs.old); + freqs.new, freqs.new, freqs.old);cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );#ifndef CONFIG_BF60x
@@ -209,7 +200,7 @@ static int __bfin_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver bfin_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = bfin_target, + .target_index = bfin_target, .get = bfin_getfreq_khz, .init = __bfin_cpu_init, .exit = cpufreq_generic_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 152/228 cpufreq: cpu0: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/cpufreq-cpu0.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/cpufreq/cpufreq-cpu0.c +2 -15
@@ -34,24 +34,14 @@ static unsigned int cpu0_get_speed(unsigned int cpu)return clk_get_rate (cpu_clk) /1000 ; } -static int cpu0_set_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +static int cpu0_set_target (struct cpufreq_policy *policy,unsigned int index) {struct cpufreq_freqs freqs;struct opp *opp;unsigned long volt =0 , volt_old =0 , tol =0 ;long freq_Hz, freq_exact; -unsigned int index;int ret; - ret =cpufreq_frequency_table_target (policy, freq_table, target_freq, - relation, &index); -if (ret) { -pr_err ("failed to match target freqency %d: %d\n" , - target_freq, ret); -return ret; - } - freq_Hz =clk_round_rate (cpu_clk, freq_table[index].frequency *1000 );if (freq_Hz <0 ) freq_Hz = freq_table[index].frequency *1000 ;
@@ -59,9 +49,6 @@ static int cpu0_set_target(struct cpufreq_policy *policy, freqs.new = freq_Hz /1000 ; freqs.old =clk_get_rate (cpu_clk) /1000 ; -if (freqs.old == freqs.new) -return 0 ; -cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );if (!IS_ERR (cpu_reg)) {
@@ -127,7 +114,7 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy)static struct cpufreq_driver cpu0_cpufreq_driver = { .flags =CPUFREQ_STICKY , .verify = cpufreq_generic_frequency_table_verify, - .target = cpu0_set_target, + .target_index = cpu0_set_target, .get = cpu0_get_speed, .init = cpu0_cpufreq_init, .exit = cpufreq_generic_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 153/228 cpufreq: cris: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/cris-artpec3-cpufreq.c | 18 ++---------------- drivers/cpufreq/cris-etraxfs-cpufreq.c | 17 ++--------------- 2 files changed, 4 insertions(+), 31 deletions(-)
drivers/cpufreq/cris-artpec3-cpufreq.c +2 -16
@@ -27,8 +27,7 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)return clk_ctrl.pll ?200000 :6000 ; } -static void cris_freq_set_cpu_state (struct cpufreq_policy *policy, -unsigned int state) +static int cris_freq_target (struct cpufreq_policy *policy,unsigned int state) {struct cpufreq_freqs freqs;reg_clkgen_rw_clk_ctrl clk_ctrl;
@@ -52,19 +51,6 @@ static void cris_freq_set_cpu_state(struct cpufreq_policy *policy,local_irq_enable ();cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); -}; - -static int cris_freq_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) -{ -unsigned int newstate =0 ; - -if (cpufreq_frequency_table_target (policy, cris_freq_table, - target_freq, relation, &newstate)) -return -EINVAL ; - -cris_freq_set_cpu_state (policy, newstate);return 0 ; }
@@ -77,7 +63,7 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver cris_freq_driver = { .get = cris_freq_get_cpu_frequency, .verify = cpufreq_generic_frequency_table_verify, - .target = cris_freq_target, + .target_index = cris_freq_target, .init = cris_freq_cpu_init, .exit = cpufreq_generic_exit, .name ="cris_freq" ,
drivers/cpufreq/cris-etraxfs-cpufreq.c +2 -15
@@ -27,8 +27,7 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)return clk_ctrl.pll ?200000 :6000 ; } -static void cris_freq_set_cpu_state (struct cpufreq_policy *policy, -unsigned int state) +static int cris_freq_target (struct cpufreq_policy *policy,unsigned int state) {struct cpufreq_freqs freqs;reg_config_rw_clk_ctrl clk_ctrl;
@@ -52,18 +51,6 @@ static void cris_freq_set_cpu_state(struct cpufreq_policy *policy,local_irq_enable ();cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); -}; - -static int cris_freq_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) -{ -unsigned int newstate =0 ; - -if (cpufreq_frequency_table_target - (policy, cris_freq_table, target_freq, relation, &newstate)) -return -EINVAL ; - -cris_freq_set_cpu_state (policy, newstate);return 0 ; }
@@ -76,7 +63,7 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver cris_freq_driver = { .get = cris_freq_get_cpu_frequency, .verify = cpufreq_generic_frequency_table_verify, - .target = cris_freq_target, + .target_index = cris_freq_target, .init = cris_freq_cpu_init, .exit = cpufreq_generic_exit, .name ="cris_freq" ,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 153/228] cpufreq: cris: Convert to light weight ->target_index() routine
Quoted 5 lines · Viresh Kumar
This patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call
cpufreq_frequency_table_target()before calling this routine and will pass index to it.
Quoted 3 lines
Cc Mikael Starvik <[email protected]>Signed-off-by Viresh Kumar <[email protected]>
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Viresh Kumar
maintainerPATCH 154/228 cpufreq: davinci: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/davinci-cpufreq.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/cpufreq/davinci-cpufreq.c +3 -13
@@ -66,28 +66,18 @@ static unsigned int davinci_getspeed(unsigned int cpu)return clk_get_rate (cpufreq.armclk) /1000 ; } -static int davinci_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +static int davinci_target (struct cpufreq_policy *policy,unsigned int idx) {int ret =0 ; -unsigned int idx;struct cpufreq_freqs freqs;struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;struct clk *armclk = cpufreq.armclk; freqs.old =davinci_getspeed (0 ); - freqs.new =clk_round_rate (armclk, target_freq *1000 ) /1000 ; - -if (freqs.old == freqs.new) -return ret; + freqs.new = pdata->freq_table[idx].frequency;dev_dbg (cpufreq.dev,"transition: %u --> %u\n" , freqs.old, freqs.new); - ret =cpufreq_frequency_table_target (policy, pdata->freq_table, - freqs.new, relation, &idx); -if (ret) -return -EINVAL ; -cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* if moving to higher frequency, up the voltage beforehand */
@@ -148,7 +138,7 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver davinci_driver = { .flags =CPUFREQ_STICKY , .verify = davinci_verify_speed, - .target = davinci_target, + .target_index = davinci_target, .get = davinci_getspeed, .init = davinci_cpu_init, .exit = cpufreq_generic_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 155/228 cpufreq: dbx500: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/dbx500-cpufreq.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/cpufreq/dbx500-cpufreq.c +3 -13
@@ -20,23 +20,13 @@ static struct cpufreq_frequency_table *freq_table;static struct clk *armss_clk;static int dbx500_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +unsigned int index) {struct cpufreq_freqs freqs; -unsigned int idx;int ret; -/* Lookup the next frequency */ -if (cpufreq_frequency_table_target (policy, freq_table, target_freq, - relation, &idx)) -return -EINVAL ; - freqs.old = policy->cur; - freqs.new = freq_table[idx].frequency; - -if (freqs.old == freqs.new) -return 0 ; + freqs.new = freq_table[index].frequency;/* pre-change notification */ cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );
@@ -80,7 +70,7 @@ static int dbx500_cpufreq_init(struct cpufreq_policy *policy)static struct cpufreq_driver dbx500_cpufreq_driver = { .flags =CPUFREQ_STICKY |CPUFREQ_CONST_LOOPS , .verify = cpufreq_generic_frequency_table_verify, - .target = dbx500_cpufreq_target, + .target_index = dbx500_cpufreq_target, .get = dbx500_cpufreq_getspeed, .init = dbx500_cpufreq_init, .name ="DBX500" ,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 156/228 cpufreq: e_powersaver: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/e_powersaver.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/cpufreq/e_powersaver.c +3 -14
@@ -168,12 +168,9 @@ postchange:return err; } -static int eps_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +static int eps_target (struct cpufreq_policy *policy,unsigned int index) {struct eps_cpu_data *centaur; -unsigned int newstate =0 ;unsigned int cpu = policy->cpu;unsigned int dest_state;int ret;
@@ -182,16 +179,8 @@ static int eps_target(struct cpufreq_policy *policy,return -ENODEV ; centaur = eps_cpu[cpu]; -if (unlikely (cpufreq_frequency_table_target (policy, - &eps_cpu[cpu]->freq_table[0 ], - target_freq, - relation, - &newstate))) { -return -EINVAL ; - } -/* Make frequency transition */ - dest_state = centaur->freq_table[newstate].driver_data &0xffff ; + dest_state = centaur->freq_table[index].driver_data &0xffff ; ret =eps_set_state (centaur, policy, dest_state);if (ret)printk (KERN_ERR "eps: Timeout!\n" );
@@ -418,7 +407,7 @@ static int eps_cpu_exit(struct cpufreq_policy *policy)static struct cpufreq_driver eps_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = eps_target, + .target_index = eps_target, .init = eps_cpu_init, .exit = eps_cpu_exit, .get = eps_get,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 157/228 cpufreq: elanfreq: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/elanfreq.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-)
drivers/cpufreq/elanfreq.c +3 -31
@@ -105,20 +105,8 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu) } -/** -* elanfreq_set_cpu_frequency: Change the CPU core frequency -* @cpu: cpu number -* @freq: frequency in kHz -* -* This function takes a frequency value and changes the CPU frequency -* according to this. Note that the frequency has to be checked by -* elanfreq_validatespeed() for correctness! -* -* There is no return value. -*/ - -static void elanfreq_set_cpu_state (struct cpufreq_policy *policy, -unsigned int state) +static int elanfreq_target (struct cpufreq_policy *policy, +unsigned int state) {struct cpufreq_freqs freqs;
@@ -162,25 +150,9 @@ static void elanfreq_set_cpu_state(struct cpufreq_policy *policy,local_irq_enable ();cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); -}; - - -static int elanfreq_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) -{ -unsigned int newstate =0 ; - -if (cpufreq_frequency_table_target (policy, &elanfreq_table[0 ], - target_freq, relation, &newstate)) -return -EINVAL ; - -elanfreq_set_cpu_state (policy, newstate);return 0 ; } - -/* * Module init and exit code */
@@ -237,7 +209,7 @@ __setup("elanfreq=", elanfreq_setup);static struct cpufreq_driver elanfreq_driver = { .get = elanfreq_get_cpu_frequency, .verify = cpufreq_generic_frequency_table_verify, - .target = elanfreq_target, + .target_index = elanfreq_target, .init = elanfreq_cpu_init, .exit = cpufreq_generic_exit, .name ="elanfreq" ,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 158/228 cpufreq: exynos: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/exynos-cpufreq.c | 21 +++------------------ drivers/cpufreq/exynos5440-cpufreq.c | 25 +++++++------------------ 2 files changed, 10 insertions(+), 36 deletions(-)
drivers/cpufreq/exynos-cpufreq.c +3 -18
@@ -65,9 +65,6 @@ static int exynos_cpufreq_scale(unsigned int target_freq) freqs.old = policy->cur; freqs.new = target_freq; -if (freqs.new == freqs.old) - goto out; -/* * The policy max have been changed so that we cannot get proper * old_index with cpufreq_frequency_table_target(). Thus, ignore
@@ -151,13 +148,9 @@ out:return ret; } -static int exynos_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +static int exynos_target (struct cpufreq_policy *policy,unsigned int index) {struct cpufreq_frequency_table *freq_table = exynos_info->freq_table; -unsigned int index; -unsigned int new_freq;int ret =0 ;mutex_lock (&cpufreq_lock);
@@ -165,15 +158,7 @@ static int exynos_target(struct cpufreq_policy *policy,if (frequency_locked) goto out; -if (cpufreq_frequency_table_target (policy, freq_table, - target_freq, relation, &index)) { - ret = -EINVAL ; - goto out; - } - - new_freq = freq_table[index].frequency; - - ret =exynos_cpufreq_scale (new_freq); + ret =exynos_cpufreq_scale (freq_table[index].frequency); out:mutex_unlock (&cpufreq_lock);
@@ -247,7 +232,7 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver exynos_driver = { .flags =CPUFREQ_STICKY , .verify = cpufreq_generic_frequency_table_verify, - .target = exynos_target, + .target_index = exynos_target, .get = exynos_getspeed, .init = exynos_cpufreq_cpu_init, .exit = cpufreq_generic_exit,
drivers/cpufreq/exynos5440-cpufreq.c +7 -18
@@ -214,27 +214,17 @@ static unsigned int exynos_getspeed(unsigned int cpu)return dvfs_info->cur_frequency; } -static int exynos_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +static int exynos_target (struct cpufreq_policy *policy,unsigned int index) { -unsigned int index, tmp; -int ret =0 , i; +unsigned int tmp; +int i;struct cpufreq_frequency_table *freq_table = dvfs_info->freq_table;mutex_lock (&cpufreq_lock); - ret =cpufreq_frequency_table_target (policy, freq_table, - target_freq, relation, &index); -if (ret) - goto out; - freqs.old = dvfs_info->cur_frequency; freqs.new = freq_table[index].frequency; -if (freqs.old == freqs.new) - goto out; -cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );/* Set the target frequency in all C0_3_PSTATE register */
@@ -246,11 +236,10 @@ static int exynos_target(struct cpufreq_policy *policy,__raw_writel (tmp, dvfs_info->base +XMU_C0_3_PSTATE + i *4 ); } -/* Mark transition as In-progress */ - ret = -EINPROGRESS ; -out:mutex_unlock (&cpufreq_lock); -return ret; + +/* Mark transition as In-progress */ +return -EINPROGRESS ; }static void exynos_cpufreq_work (struct work_struct *work)
@@ -328,7 +317,7 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver exynos_driver = { .flags =CPUFREQ_STICKY |CPUFREQ_ASYNC_NOTIFICATION , .verify = cpufreq_generic_frequency_table_verify, - .target = exynos_target, + .target_index = exynos_target, .get = exynos_getspeed, .init = exynos_cpufreq_cpu_init, .exit = cpufreq_generic_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 159/228 cpufreq: ia64: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/ia64-acpi-cpufreq.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)
drivers/cpufreq/ia64-acpi-cpufreq.c +3 -18
@@ -227,26 +227,11 @@ acpi_cpufreq_get (static int acpi_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +unsigned int index) { -struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu]; -unsigned int next_state =0 ; -unsigned int result =0 ; - -pr_debug ("acpi_cpufreq_setpolicy\n" ); - - result =cpufreq_frequency_table_target (policy, - data->freq_table, target_freq, relation, &next_state); -if (result) -return (result); - - result =processor_set_freq (data, policy, next_state); - -return (result); +return processor_set_freq (acpi_io_data[policy->cpu], policy, index); } -static int acpi_cpufreq_cpu_init (struct cpufreq_policy *policy)
@@ -379,7 +364,7 @@ acpi_cpufreq_cpu_exit (static struct cpufreq_driver acpi_cpufreq_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = acpi_cpufreq_target, + .target_index = acpi_cpufreq_target, .get = acpi_cpufreq_get, .init = acpi_cpufreq_cpu_init, .exit = acpi_cpufreq_cpu_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 160/228 cpufreq: imx6q: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/imx6q-cpufreq.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/cpufreq/imx6q-cpufreq.c +2 -15
@@ -39,30 +39,17 @@ static unsigned int imx6q_get_speed(unsigned int cpu)return clk_get_rate (arm_clk) /1000 ; } -static int imx6q_set_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +static int imx6q_set_target (struct cpufreq_policy *policy,unsigned int index) {struct cpufreq_freqs freqs;struct opp *opp;unsigned long freq_hz, volt, volt_old; -unsigned int index;int ret; - ret =cpufreq_frequency_table_target (policy, freq_table, target_freq, - relation, &index); -if (ret) { -dev_err (cpu_dev,"failed to match target frequency %d: %d\n" , - target_freq, ret); -return ret; - } - freqs.new = freq_table[index].frequency; freq_hz = freqs.new *1000 ; freqs.old =clk_get_rate (arm_clk) /1000 ; -if (freqs.old == freqs.new) -return 0 ; -rcu_read_lock (); opp =opp_find_freq_ceil (cpu_dev, &freq_hz);if (IS_ERR (opp)) {
@@ -158,7 +145,7 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy)static struct cpufreq_driver imx6q_cpufreq_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = imx6q_set_target, + .target_index = imx6q_set_target, .get = imx6q_get_speed, .init = imx6q_cpufreq_init, .exit = cpufreq_generic_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 161/228 cpufreq: kirkwood: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/kirkwood-cpufreq.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/cpufreq/kirkwood-cpufreq.c +3 -16
@@ -55,8 +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 (struct cpufreq_policy *policy, -unsigned int index) +static int kirkwood_cpufreq_target (struct cpufreq_policy *policy, +unsigned int index) {struct cpufreq_freqs freqs;unsigned int state = kirkwood_freq_table[index].driver_data;
@@ -100,19 +100,6 @@ static void kirkwood_cpufreq_set_cpu_state(struct cpufreq_policy *policy,local_irq_enable (); }cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); -}; - -static int kirkwood_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) -{ -unsigned int index =0 ; - -if (cpufreq_frequency_table_target (policy, kirkwood_freq_table, - target_freq, relation, &index)) -return -EINVAL ; - -kirkwood_cpufreq_set_cpu_state (policy, index);return 0 ; }
@@ -126,7 +113,7 @@ static int kirkwood_cpufreq_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver kirkwood_cpufreq_driver = { .get = kirkwood_cpufreq_get_cpu_frequency, .verify = cpufreq_generic_frequency_table_verify, - .target = kirkwood_cpufreq_target, + .target_index = kirkwood_cpufreq_target, .init = kirkwood_cpufreq_cpu_init, .exit = cpufreq_generic_exit, .name ="kirkwood-cpufreq" ,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 162/228 cpufreq: longhaul: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/longhaul.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/cpufreq/longhaul.c +2 -11
@@ -626,21 +626,12 @@ static void longhaul_setup_voltagescaling(void)static int longhaul_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +unsigned int table_index) { -unsigned int table_index =0 ;unsigned int i;unsigned int dir =0 ;u8 vid, current_vid; -if (cpufreq_frequency_table_target (policy, longhaul_table, target_freq, - relation, &table_index)) -return -EINVAL ; - -/* Don't set same frequency again */ -if (longhaul_index == table_index) -return 0 ; -if (!can_scale_voltage)longhaul_setstate (policy, table_index);else {
@@ -919,7 +910,7 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy)static struct cpufreq_driver longhaul_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = longhaul_target, + .target_index = longhaul_target, .get = longhaul_get, .init = longhaul_cpu_init, .exit = cpufreq_generic_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 163/228 cpufreq: loongson2: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/loongson2_cpufreq.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
drivers/cpufreq/loongson2_cpufreq.c +5 -16
@@ -53,11 +53,9 @@ static unsigned int loongson2_cpufreq_get(unsigned int cpu)* Here we notify other drivers of the proposed change and the final change. */ static int loongson2_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +unsigned int index) {unsigned int cpu = policy->cpu; -unsigned int newstate =0 ;cpumask_t cpus_allowed;struct cpufreq_freqs freqs;unsigned int freq;
@@ -65,26 +63,17 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy, cpus_allowed = current->cpus_allowed;set_cpus_allowed_ptr (current,cpumask_of (cpu)); -if (cpufreq_frequency_table_target - (policy, &loongson2_clockmod_table[0 ], target_freq, relation, - &newstate)) -return -EINVAL ; - freq = ((cpu_clock_freq /1000 ) * - loongson2_clockmod_table[newstate].driver_data) /8 ; -if (freq < policy->min || freq > policy->max) -return -EINVAL ; + loongson2_clockmod_table[index].driver_data) /8 ; -pr_debug ("cpufreq: requested frequency %u Hz\n" , target_freq *1000 ); +pr_debug ("cpufreq: requested frequency %u Hz\n" , + loongson2_clockmod_table[index].frequency *1000 ); freqs.old =loongson2_cpufreq_get (cpu); freqs.new = freq; freqs.flags =0 ; -if (freqs.new == freqs.old) -return 0 ; -/* notifiers */ cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );
@@ -145,7 +134,7 @@ static struct cpufreq_driver loongson2_cpufreq_driver = { .name = "loongson2", .init = loongson2_cpufreq_cpu_init, .verify = cpufreq_generic_frequency_table_verify, - .target = loongson2_cpufreq_target, + .target_index = loongson2_cpufreq_target, .get = loongson2_cpufreq_get, .exit = loongson2_cpufreq_exit, .attr = cpufreq_generic_attr,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 164/228 cpufreq: maple: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/maple-cpufreq.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/cpufreq/maple-cpufreq.c +4 -12
@@ -131,26 +131,18 @@ static int maple_scom_query_freq(void)*/ static int maple_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +unsigned int index) { -unsigned int newstate =0 ;struct cpufreq_freqs freqs;int rc; -if (cpufreq_frequency_table_target (policy, maple_cpu_freqs, - target_freq, relation, &newstate)) -return -EINVAL ; - -if (maple_pmode_cur == newstate) -return 0 ; -mutex_lock (&maple_switch_mutex); freqs.old = maple_cpu_freqs[maple_pmode_cur].frequency; - freqs.new = maple_cpu_freqs[newstate].frequency; + freqs.new = maple_cpu_freqs[index].frequency;cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); - rc =maple_scom_switch_freq (newstate); + rc =maple_scom_switch_freq (index);cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&maple_switch_mutex);
@@ -173,7 +165,7 @@ static struct cpufreq_driver maple_cpufreq_driver = { .flags = CPUFREQ_CONST_LOOPS, .init = maple_cpufreq_cpu_init, .verify = cpufreq_generic_frequency_table_verify, - .target = maple_cpufreq_target, + .target_index = maple_cpufreq_target, .get = maple_cpufreq_get_speed, .attr = cpufreq_generic_attr, };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 165/228 cpufreq: omap: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/omap-cpufreq.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)
drivers/cpufreq/omap-cpufreq.c +3 -28
@@ -51,40 +51,15 @@ static unsigned int omap_getspeed(unsigned int cpu)return rate; } -static int omap_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +static int omap_target (struct cpufreq_policy *policy,unsigned int index) { -unsigned int i;int r, ret =0 ;struct cpufreq_freqs freqs;struct opp *opp;unsigned long freq, volt =0 , volt_old =0 , tol =0 ; -if (!freq_table) { -dev_err (mpu_dev,"%s: cpu%d: no freq table!\n" , __func__, - policy->cpu); -return -EINVAL ; - } - - ret =cpufreq_frequency_table_target (policy, freq_table, target_freq, - relation, &i); -if (ret) { -dev_dbg (mpu_dev,"%s: cpu%d: no freq match for %d(ret=%d)\n" , - __func__, policy->cpu, target_freq, ret); -return ret; - } - freqs.new = freq_table[i].frequency; -if (!freqs.new) { -dev_err (mpu_dev,"%s: cpu%d: no match for freq %d\n" , __func__, - policy->cpu, target_freq); -return -EINVAL ; - } - freqs.old =omap_getspeed (policy->cpu); - -if (freqs.old == freqs.new && policy->cur == freqs.new) -return ret; + freqs.new = freq_table[index].frequency; freq = freqs.new *1000 ; ret =clk_round_rate (mpu_clk, freq);
@@ -200,7 +175,7 @@ static int omap_cpu_exit(struct cpufreq_policy *policy)static struct cpufreq_driver omap_driver = { .flags =CPUFREQ_STICKY , .verify = cpufreq_generic_frequency_table_verify, - .target = omap_target, + .target_index = omap_target, .get = omap_getspeed, .init = omap_cpu_init, .exit = omap_cpu_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 166/228 cpufreq: p4: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/p4-clockmod.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
drivers/cpufreq/p4-clockmod.c +4 -14
@@ -105,23 +105,13 @@ static struct cpufreq_frequency_table p4clockmod_table[] = { }; -static int cpufreq_p4_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +static int cpufreq_p4_target (struct cpufreq_policy *policy,unsigned int index) { -unsigned int newstate =DC_RESV ;struct cpufreq_freqs freqs;int i; -if (cpufreq_frequency_table_target (policy, &p4clockmod_table[0 ], - target_freq, relation, &newstate)) -return -EINVAL ; - freqs.old =cpufreq_p4_get (policy->cpu); - freqs.new = stock_freq * p4clockmod_table[newstate].driver_data /8 ; - -if (freqs.new == freqs.old) -return 0 ; + freqs.new = stock_freq * p4clockmod_table[index].driver_data /8 ;/* notifiers */ cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE );
@@ -131,7 +121,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,* Developer's Manual, Volume 3 */ for_each_cpu (i, policy->cpus) -cpufreq_p4_setdc (i, p4clockmod_table[newstate].driver_data); +cpufreq_p4_setdc (i, p4clockmod_table[index].driver_data);/* notifiers */ cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );
@@ -255,7 +245,7 @@ static unsigned int cpufreq_p4_get(unsigned int cpu)static struct cpufreq_driver p4clockmod_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = cpufreq_p4_target, + .target_index = cpufreq_p4_target, .init = cpufreq_p4_cpu_init, .exit = cpufreq_generic_exit, .get = cpufreq_p4_get,
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 167/228 cpufreq: pasemi: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/pasemi-cpufreq.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/cpufreq/pasemi-cpufreq.c +2 -10
@@ -240,19 +240,11 @@ static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy) }static int pas_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +unsigned int pas_astate_new) {struct cpufreq_freqs freqs; -int pas_astate_new;int i; -cpufreq_frequency_table_target (policy, - pas_freqs, - target_freq, - relation, - &pas_astate_new); - freqs.old = policy->cur; freqs.new = pas_freqs[pas_astate_new].frequency;
@@ -282,7 +274,7 @@ static struct cpufreq_driver pas_cpufreq_driver = { .init = pas_cpufreq_cpu_init, .exit = pas_cpufreq_cpu_exit, .verify = cpufreq_generic_frequency_table_verify, - .target = pas_cpufreq_target, + .target_index = pas_cpufreq_target, .attr = cpufreq_generic_attr, };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 168/228 cpufreq: pmac32: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/pmac32-cpufreq.c | 12 +++--------- drivers/cpufreq/pmac64-cpufreq.c | 17 ++++------------- 2 files changed, 7 insertions(+), 22 deletions(-)
drivers/cpufreq/pmac32-cpufreq.c +3 -9
@@ -374,17 +374,11 @@ static unsigned int pmac_cpufreq_get_speed(unsigned int cpu) }static int pmac_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) +unsigned int index) { -unsigned int newstate =0 ;int rc; -if (cpufreq_frequency_table_target (policy, pmac_cpu_freqs, - target_freq, relation, &newstate)) -return -EINVAL ; - - rc =do_set_cpu_speed (policy, newstate,1 ); + rc =do_set_cpu_speed (policy, index,1 ); ppc_proc_freq = cur_freq *1000ul ;return rc;
@@ -453,7 +447,7 @@ static int pmac_cpufreq_resume(struct cpufreq_policy *policy)static struct cpufreq_driver pmac_cpufreq_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = pmac_cpufreq_target, + .target_index = pmac_cpufreq_target, .get = pmac_cpufreq_get_speed, .init = pmac_cpufreq_cpu_init, .suspend = pmac_cpufreq_suspend,
drivers/cpufreq/pmac64-cpufreq.c +4 -13
@@ -312,27 +312,18 @@ static int g5_pfunc_query_freq(void)* Common interface to the cpufreq core */ -static int g5_cpufreq_target (struct cpufreq_policy *policy, -unsigned int target_freq,unsigned int relation) +static int g5_cpufreq_target (struct cpufreq_policy *policy,unsigned int index) { -unsigned int newstate =0 ;struct cpufreq_freqs freqs;int rc; -if (cpufreq_frequency_table_target (policy, g5_cpu_freqs, - target_freq, relation, &newstate)) -return -EINVAL ; - -if (g5_pmode_cur == newstate) -return 0 ; -mutex_lock (&g5_switch_mutex); freqs.old = g5_cpu_freqs[g5_pmode_cur].frequency; - freqs.new = g5_cpu_freqs[newstate].frequency; + freqs.new = g5_cpu_freqs[index].frequency;cpufreq_notify_transition (policy, &freqs,CPUFREQ_PRECHANGE ); - rc =g5_switch_freq (newstate); + rc =g5_switch_freq (index);cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE );mutex_unlock (&g5_switch_mutex);
@@ -355,7 +346,7 @@ static struct cpufreq_driver g5_cpufreq_driver = { .flags = CPUFREQ_CONST_LOOPS, .init = g5_cpufreq_cpu_init, .verify = cpufreq_generic_frequency_table_verify, - .target = g5_cpufreq_target, + .target_index = g5_cpufreq_target, .get = g5_cpufreq_get_speed, .attr = cpufreq_generic_attr, };
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 169/228 cpufreq: powernow: Convert to light weight ->target_index() routine
In reply to Viresh KumarThis patch converts existing .target() to newly defined light weight .target_index() routine for this driver.
CPUFreq core will call cpufreq_frequency_table_target() before calling this routine and will pass index to it.
--- drivers/cpufreq/powernow-k6.c | 35 +++++------------------------------ drivers/cpufreq/powernow-k7.c | 22 ++++------------------ drivers/cpufreq/powernow-k8.c | 26 ++++++++------------------ 3 files changed, 17 insertions(+), 66 deletions(-)
drivers/cpufreq/powernow-k6.c +5 -30
@@ -63,12 +63,12 @@ static int powernow_k6_get_cpu_multiplier(void)/** -* powernow_k6_set_state - set the PowerNow! multiplier +* powernow_k6_target - set the PowerNow! multiplier * @best_i: clock_ratio[best_i] is the target multiplier * * Tries to change the PowerNow! multiplier */ -static void powernow_k6_set_state (struct cpufreq_policy *policy, +static int powernow_k6_target (struct cpufreq_policy *policy,unsigned int best_i) {unsigned long outvalue =0 , invalue =0 ;
@@ -77,7 +77,7 @@ static void powernow_k6_set_state(struct cpufreq_policy *policy,if (clock_ratio[best_i].driver_data > max_multiplier) { printk(KERN_ERR PFX "invalid target frequency\n"); -return ; +return -EINVAL ; } freqs.old = busfreq *powernow_k6_get_cpu_multiplier ();
@@ -100,31 +100,6 @@ static void powernow_k6_set_state(struct cpufreq_policy *policy,cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); -return ; -} - - -/** -* powernow_k6_setpolicy - sets a new CPUFreq policy -* @policy: new policy -* @target_freq: the target frequency -* @relation: how that frequency relates to achieved frequency -* (CPUFREQ_RELATION_L or CPUFREQ_RELATION_H) -* -* sets a new CPUFreq policy -*/ -static int powernow_k6_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) -{ -unsigned int newstate =0 ; - -if (cpufreq_frequency_table_target (policy, &clock_ratio[0 ], - target_freq, relation, &newstate)) -return -EINVAL ; - -powernow_k6_set_state (policy, newstate); -return 0 ; }
@@ -161,7 +136,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 (policy, i); +powernow_k6_target (policy, i); }cpufreq_frequency_table_put_attr (policy->cpu);return 0 ;
@@ -176,7 +151,7 @@ static unsigned int powernow_k6_get(unsigned int cpu)static struct cpufreq_driver powernow_k6_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = powernow_k6_target, + .target_index = powernow_k6_target, .init = powernow_k6_cpu_init, .exit = powernow_k6_cpu_exit, .get = powernow_k6_get,
drivers/cpufreq/powernow-k7.c +4 -18
@@ -248,7 +248,7 @@ static void change_VID(int vid) } -static void change_speed (struct cpufreq_policy *policy,unsigned int index) +static int powernow_target (struct cpufreq_policy *policy,unsigned int index) {u8 fid, vid;struct cpufreq_freqs freqs;
@@ -291,6 +291,8 @@ static void change_speed(struct cpufreq_policy *policy, unsigned int index)local_irq_enable ();cpufreq_notify_transition (policy, &freqs,CPUFREQ_POSTCHANGE ); + +return 0 ; }
@@ -533,22 +535,6 @@ static int powernow_decode_bios(int maxfid, int startvid) } -static int powernow_target (struct cpufreq_policy *policy, -unsigned int target_freq, -unsigned int relation) -{ -unsigned int newstate; - -if (cpufreq_frequency_table_target (policy, powernow_table, target_freq, - relation, &newstate)) -return -EINVAL ; - -change_speed (policy, newstate); - -return 0 ; -} - -/* * We use the fact that the bus frequency is somehow * a multiple of 100000/3 khz, then we compute sgtc according
@@ -694,7 +680,7 @@ static int powernow_cpu_exit(struct cpufreq_policy *policy)static struct cpufreq_driver powernow_driver = { .verify = cpufreq_generic_frequency_table_verify, - .target = powernow_target, + .target_index = powernow_target, .get = powernow_get, #ifdef CONFIG_X86_POWERNOW_K7_ACPI .bios_limit = acpi_processor_get_bios_limit,
drivers/cpufreq/powernow-k8.c +8 -18
@@ -977,20 +977,17 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,struct powernowk8_target_arg {struct cpufreq_policy *pol; -unsigned targfreq; -unsigned relation; +unsigned newstate; };static long powernowk8_target_fn (void *arg) {struct powernowk8_target_arg *pta = arg;struct cpufreq_policy *pol = pta->pol; -unsigned targfreq = pta->targfreq; -unsigned relation = pta->relation; +unsigned newstate = pta->newstate;struct powernow_k8_data *data =per_cpu (powernow_data, pol->cpu);u32 checkfid;u32 checkvid; -unsigned int newstate;int ret;if (!data) {
@@ -1007,8 +1004,9 @@ static long powernowk8_target_fn(void *arg) goto transition_complete; } -pr_debug ("targ: cpu %d, %d kHz, min %d, max %d, relation %d\n" , - pol->cpu, targfreq, pol->min, pol->max, relation); +pr_debug ("targ: cpu %d, %d kHz, min %d, max %d\n" , + pol->cpu, data->powernow_table[newstate].frequency, pol->min, + pol->max);if (query_current_values_with_pending_wait (data)) { ret = -EIO ;
@@ -1026,12 +1024,6 @@ static long powernowk8_target_fn(void *arg) checkvid, data->currvid); } -if (cpufreq_frequency_table_target (pol, data->powernow_table, - targfreq, relation, &newstate)) { - ret = -EIO ; - goto transition_complete; - } -mutex_lock (&fidvid_mutex);powernow_k8_acpi_pst_values (data, newstate);
@@ -1060,11 +1052,9 @@ transition_complete: }/* Driver entry point to switch to the target frequency */ -static int powernowk8_target (struct cpufreq_policy *pol, -unsigned targfreq,unsigned relation) +static int powernowk8_target (struct cpufreq_policy *pol,unsigned index) { -struct powernowk8_target_arg pta = { .pol = pol, .targfreq = targfreq, - .relation = relation }; +struct powernowk8_target_arg pta = { .pol = pol, .newstate = index };int ret; ret =work_on_cpu (pol->cpu, powernowk8_target_fn, &pta);
@@ -1234,7 +1224,7 @@ out:static struct cpufreq_driver cpufreq_amd64_driver = { .flags =CPUFREQ_ASYNC_NOTIFICATION , .verify = cpufreq_generic_frequency_table_verify, - .target = powernowk8_target, + .target_index = powernowk8_target, .bios_limit = acpi_processor_get_bios_limit, .init = powernowk8_cpu_init, .exit = powernowk8_cpu_exit,
Signature · 1 line
1.7.12.rc2.18.g61b472e