Skip to contentSkip to conversation

CPUFREQ git pull for 2.6.40 [1/2]

DISCUSSION Dave Jones 1 participant 3 messages May 19, 2011

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

Please pull from .. master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq.git/ next

 Documentation/cpu-freq/governors.txt         |   11 +++
 arch/arm/mach-s5pv210/cpufreq.c              |    3 +-
 arch/arm/mach-s5pv310/cpufreq.c              |    3 +-
 arch/arm/plat-s3c24xx/cpu-freq.c             |    2 +-
 arch/powerpc/platforms/powermac/cpufreq_32.c |    2 +-
 arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c    |    2 -
 arch/x86/kernel/cpu/cpufreq/powernow-k8.c    |    3 +-
 drivers/cpufreq/cpufreq.c                    |    2 +-
 drivers/cpufreq/cpufreq_conservative.c       |  123 ++------------------------
 drivers/cpufreq/cpufreq_ondemand.c           |  122 +++-----------------------
 include/linux/cpufreq.h                      |   11 +--
 11 files changed, 36 insertions(+), 248 deletions(-)

commit bdce2595a2f539c6fdedd8f2bd281326b627bba3

Author: Chumbalkar, Nagananda <[email protected]>
Date:   Wed Mar 16 21:37:41 2011 +0000

[CPUFREQ] pcc-cpufreq: remove duplicate statements

Remove a couple of assigment statements that appear twice.

commit 7ca64e2d2859e96a325c28678b5fdb5e17a5764b

Author: Rafael J. Wysocki <[email protected]>
Date:   Thu Mar 10 21:13:05 2011 +0100

[CPUFREQ] Remove the pm_message_t argument from driver suspend

None of the existing cpufreq drivers uses the second argument of its .suspend() callback (which isn't useful anyway), so remove it.

commit 326c86deaed54ad1b364fcafe5073f563671eb58

Author: Thomas Renninger <[email protected]>
Date:   Thu Mar 3 21:31:27 2011 +0100

[CPUFREQ] Remove unneeded locks

There cannot be any concurrent access to these through different cpu sysfs files anymore, because these tunables are now all global (not per cpu).

I still have some doubts whether some of these locks were needed at all. Anyway, let's get rid of them.

commit e8951251b89440644a39f2512b4f265973926b41

Author: Thomas Renninger <[email protected]>
Date:   Thu Mar 3 21:31:26 2011 +0100

[CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files

Marked deprecated for quite a whilte now...

commit ef598549b28014ec2ea7574d4e793728e0e33d02

Author: Thomas Renninger <[email protected]>
Date:   Thu Mar 3 21:31:25 2011 +0100

[CPUFREQ] Remove deprecated sysfs file sampling_rate_max

Marked deprecated for quite a while now...

commit 9e91869544fc831d640cae1ffd0313b38657b593

Author: Thomas Renninger <[email protected]>
Date:   Thu Mar 3 21:31:24 2011 +0100

[CPUFREQ] powernow-k8: The table index is not worth displaying

and it also is misleading due to another message above which makes the index look like it is the CPU.

https://bugzilla.kernel.org/show_bug.cgi?id=24562

commit 5cb2c3bd0c5e0f3ced63f250ec2ad59d7c5c626a

Author: Vincent Guittot <[email protected]>
Date:   Mon Feb 7 17:14:25 2011 +0100

[CPUFREQ] calculate delay after dbs_check_cpu

calculate ondemand delay after dbs_check_cpu call because it can modify rate_mult value

use freq_lo_jiffies value for the sub sample period of powersave_bias mode

commit 5b95364f6101d67a073a5ec18d726e94e02ca605

Author: Vishwanath BS <[email protected]>
Date:   Tue Jan 25 20:12:41 2011 +0530

[CPUFREQ] Add documentation for sampling_down_factor

Update cpufreq governor documentation for sampling_down_factor tunable parameter.

commit 2feb690c20d52e22c7874a1e090245e6a4344ce6

Author: Joe Perches <[email protected]>
Date:   Sun Nov 14 19:04:23 2010 -0800

[CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons

author Acked-by Mark Langsdorf Reviewed-by Thomas Renninger
#1 lore raw

Re: CPUFREQ git pull for 2.6.40 [1/2] [fixed]

oops, sent wrong pull request from last cycle. Here's the correct one.

Please pull from .. master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq.git/ next

 arch/arm/mach-davinci/cpufreq.c                  |    4 +-
 arch/blackfin/mach-common/dpmc.c                 |    3 -
 arch/ia64/kernel/cpufreq/acpi-cpufreq.c          |   44 ++---
 arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c       |   45 ++---
 arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c    |    6 +-
 arch/x86/kernel/cpu/cpufreq/gx-suspmod.c         |   21 +--
 arch/x86/kernel/cpu/cpufreq/longhaul.c           |   11 +-
 arch/x86/kernel/cpu/cpufreq/longrun.c            |   17 +-
 arch/x86/kernel/cpu/cpufreq/p4-clockmod.c        |   10 +-
 arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c        |   51 +++---
 arch/x86/kernel/cpu/cpufreq/powernow-k7.c        |   33 ++--
 arch/x86/kernel/cpu/cpufreq/powernow-k8.c        |  100 +++++-----
 arch/x86/kernel/cpu/cpufreq/powernow-k8.h        |    2 -
 arch/x86/kernel/cpu/cpufreq/sc520_freq.c         |    6 +-
 arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c |   23 +--
 arch/x86/kernel/cpu/cpufreq/speedstep-ich.c      |   28 ++--
 arch/x86/kernel/cpu/cpufreq/speedstep-lib.c      |   43 ++---
 arch/x86/kernel/cpu/cpufreq/speedstep-smi.c      |   41 ++---
 drivers/acpi/processor_perflib.c                 |    6 +-
 drivers/cpufreq/Kconfig                          |   13 --
 drivers/cpufreq/cpufreq.c                        |  215 ++++++----------------
 drivers/cpufreq/cpufreq_performance.c            |    5 +-
 drivers/cpufreq/cpufreq_powersave.c              |    5 +-
 drivers/cpufreq/cpufreq_stats.c                  |   24 ++-
 drivers/cpufreq/cpufreq_userspace.c              |   13 +-
 drivers/cpufreq/freq_table.c                     |   19 +-
 include/linux/cpufreq.h                          |   52 ++----
 27 files changed, 331 insertions(+), 509 deletions(-)

commit 1a8e1463a49aaa452da1cefe184a00d4df47f1ef

Author: Kees Cook <[email protected]>
Date:   Wed May 4 08:38:56 2011 -0700

[CPUFREQ] remove redundant sprintf from request_module call.

Since format string handling is part of request_module, there is no need to construct the module name. As such, drop the redundant sprintf and heap usage.

commit 469057d587a9de2cd6087d71a008b908e785a5b6

Author: Karthigan Srinivasan <[email protected]>
Date:   Fri Apr 1 17:34:47 2011 -0500

[CPUFREQ] cpufreq_stats.c: Fixed brace coding style issue

Fixed brace coding style issue.

commit 98586ed8b8878e10691203687e89a42fa3355300

Author: steven finney <[email protected]>
Date:   Mon May 2 11:29:17 2011 -0700

[CPUFREQ] Fix memory leak in cpufreq_stat

When a CPU is taken offline in an SMP system, cpufreq_remove_dev() nulls out the per-cpu policy before cpufreq_stats_free_table() can make use of it. cpufreq_stats_free_table() then skips the call to sysfs_remove_group(), leaving about 100 bytes of sysfs-related memory unclaimed each time a CPU-removal occurs. Break up cpu_stats_free_table into sysfs and table portions, and call the sysfs portion early.

commit 335dc3335ff692173bc766b248f7a97f3a23b30a

Author: Thiago Farina <[email protected]>
Date:   Thu Apr 28 20:42:53 2011 -0300

[CPUFREQ] cpufreq.h: Fix some checkpatch.pl coding style issues.

Before:
$ scripts/checkpatch.pl --file --terse include/linux/cpufreq.h
total: 14 errors, 11 warnings, 419 lines checked

After:
$ scripts/checkpatch.pl --file --terse include/linux/cpufreq.h
total: 2 errors, 4 warnings, 422 lines checked

commit 2d06d8c49afdcc9bb35a85039fa50f0fe35bd40e

Author: Dominik Brodowski <[email protected]>
Date:   Sun Mar 27 15:04:46 2011 +0200

[CPUFREQ] use dynamic debug instead of custom infrastructure

With dynamic debug having gained the capability to report debug messages also during the boot process, it offers a far superior interface for debug messages than the custom cpufreq infrastructure. As a first step, remove the old cpufreq_debug_printk() function and replace it with a call to the generic pr_debug() function.

How can dynamic debug be used on cpufreq? You need a kernel which has CONFIG_DYNAMIC_DEBUG enabled.

To enabled debugging during runtime, mount debugfs and

$ echo -n 'module cpufreq +p' > /sys/kernel/debug/dynamic_debug/control

for debugging the complete "cpufreq" module. To achieve the same goal during boot, append

ddebug_query="module cpufreq +p"

as a boot parameter to the kernel of your choice.

For more detailled instructions, please see
Documentation/dynamic-debug-howto.txt

commit 27ecddc2a9f99ce4ac9a59a0acd77f7100b6d034

Author: Jacob Shin <[email protected]>
Date:   Wed Apr 27 13:32:11 2011 -0500

[CPUFREQ] CPU hotplug, re-create sysfs directory and symlinks

When we discover CPUs that are affected by each other's frequency/voltage transitions, the first CPU gets a sysfs directory created, and rest of the siblings get symlinks. Currently, when we hotplug off only the first CPU, all of the symlinks and the sysfs directory gets removed. Even though rest of the siblings are still online and functional, they are orphaned, and no longer governed by cpufreq.

This patch, given the above scenario, creates a sysfs directory for the first sibling and symlinks for the rest of the siblings.

Please note the recursive call, it was rather too ugly to roll it out. And the removal of redundant NULL setting (it is already taken care of near the top of the function).

commit 904cc1e637a00dba1b58e7752f485f90ebf2a568

Author: Naga Chumbalkar <[email protected]>
Date:   Tue Apr 26 17:05:18 2011 +0000

[CPUFREQ] Fix _OSC UUID in pcc-cpufreq

UUID needs to be written out the way it is described in Sec 18.5.124 of ACPI 4.0a Specification.

Platform firmware's use of this UUID/_OSC is optional, which is why we didn't notice this bug earlier.

author Acked-by Mark Langsdorf Reviewed-by Thomas Renninger
#2 lore raw

CPUFREQ git pull for 2.6.40 [2/2]

In reply to Dave Jones

This pull request moves the x86 cpufreq drivers to drivers/cpufreq/ The ARM people are working on moving theirs over afterwards once the Makefile/Kconfig's have landed in your tree.

Please pull from .. master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq.git/ move-drivers

 arch/arm/mach-davinci/cpufreq.c                    |    4 +-
 arch/blackfin/mach-common/dpmc.c                   |    3 -
 arch/ia64/kernel/cpufreq/acpi-cpufreq.c            |   44 ++---
 arch/x86/Kconfig                                   |    2 +-
 arch/x86/kernel/cpu/Makefile                       |    1 -
 arch/x86/kernel/cpu/cpufreq/Makefile               |   21 --
 drivers/acpi/processor_perflib.c                   |    6 +-
 drivers/cpufreq/Kconfig                            |   23 +--
 .../cpufreq/Kconfig => drivers/cpufreq/Kconfig.x86 |   13 +--
 drivers/cpufreq/Makefile                           |   26 +++
 .../kernel/cpu => drivers}/cpufreq/acpi-cpufreq.c  |   45 ++---
 .../cpu => drivers}/cpufreq/cpufreq-nforce2.c      |    6 +-
 drivers/cpufreq/cpufreq.c                          |  196 ++++++--------------
 drivers/cpufreq/cpufreq_performance.c              |    5 +-
 drivers/cpufreq/cpufreq_powersave.c                |    5 +-
 drivers/cpufreq/cpufreq_stats.c                    |    3 +-
 drivers/cpufreq/cpufreq_userspace.c                |   13 +-
 .../kernel/cpu => drivers}/cpufreq/e_powersaver.c  |    0
 .../x86/kernel/cpu => drivers}/cpufreq/elanfreq.c  |    0
 drivers/cpufreq/freq_table.c                       |   19 +-
 .../kernel/cpu => drivers}/cpufreq/gx-suspmod.c    |   21 +--
 .../x86/kernel/cpu => drivers}/cpufreq/longhaul.c  |   11 +-
 .../x86/kernel/cpu => drivers}/cpufreq/longhaul.h  |    0
 {arch/x86/kernel/cpu => drivers}/cpufreq/longrun.c |   17 +-
 {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.c   |    0
 {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.h   |    0
 .../kernel/cpu => drivers}/cpufreq/p4-clockmod.c   |   10 +-
 .../kernel/cpu => drivers}/cpufreq/pcc-cpufreq.c   |   51 +++---
 .../kernel/cpu => drivers}/cpufreq/powernow-k6.c   |    0
 .../kernel/cpu => drivers}/cpufreq/powernow-k7.c   |   33 ++--
 .../kernel/cpu => drivers}/cpufreq/powernow-k7.h   |    0
 .../kernel/cpu => drivers}/cpufreq/powernow-k8.c   |  100 +++++-----
 .../kernel/cpu => drivers}/cpufreq/powernow-k8.h   |    2 -
 .../kernel/cpu => drivers}/cpufreq/sc520_freq.c    |    6 +-
 .../cpu => drivers}/cpufreq/speedstep-centrino.c   |   23 +--
 .../kernel/cpu => drivers}/cpufreq/speedstep-ich.c |   28 ++--
 .../kernel/cpu => drivers}/cpufreq/speedstep-lib.c |   43 ++---
 .../kernel/cpu => drivers}/cpufreq/speedstep-lib.h |    0
 .../kernel/cpu => drivers}/cpufreq/speedstep-smi.c |   41 ++---
 include/linux/cpufreq.h                            |   52 ++----
 40 files changed, 344 insertions(+), 529 deletions(-)
 delete mode 100644 arch/x86/kernel/cpu/cpufreq/Makefile
 rename arch/x86/kernel/cpu/cpufreq/Kconfig => drivers/cpufreq/Kconfig.x86 (97%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/acpi-cpufreq.c (94%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/cpufreq-nforce2.c (97%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/e_powersaver.c (100%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/elanfreq.c (100%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/gx-suspmod.c (95%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/longhaul.c (98%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/longhaul.h (100%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/longrun.c (94%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.c (100%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.h (100%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/p4-clockmod.c (96%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/pcc-cpufreq.c (91%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k6.c (100%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k7.c (95%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k7.h (100%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k8.c (93%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k8.h (98%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/sc520_freq.c (95%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-centrino.c (96%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-ich.c (92%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-lib.c (90%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-lib.h (100%)
 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-smi.c (90%)

commit ff397e04dcca765e054ffb1ffc9d65fabe357a41

Author: Dave Jones <[email protected]>
Date:   Fri Apr 29 16:09:37 2011 -0400

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

commit 84a20cad52e92e51a3a280cae7bcd2af0407a881

Author: Thiago Farina <[email protected]>
Date:   Thu Apr 28 20:42:53 2011 -0300

[CPUFREQ] cpufreq.h: Fix some checkpatch.pl coding style issues.

Before:
$ scripts/checkpatch.pl --file --terse include/linux/cpufreq.h
total: 14 errors, 11 warnings, 419 lines checked

After:
$ scripts/checkpatch.pl --file --terse include/linux/cpufreq.h
total: 2 errors, 4 warnings, 422 lines checked

commit dbe566fdf03ae56db008abbcd0aba306efd94d06

Author: Dominik Brodowski <[email protected]>
Date:   Sun Mar 27 15:04:46 2011 +0200

[CPUFREQ] use dynamic debug instead of custom infrastructure

With dynamic debug having gained the capability to report debug messages also during the boot process, it offers a far superior interface for debug messages than the custom cpufreq infrastructure. As a first step, remove the old cpufreq_debug_printk() function and replace it with a call to the generic pr_debug() function.

How can dynamic debug be used on cpufreq? You need a kernel which has CONFIG_DYNAMIC_DEBUG enabled.

To enabled debugging during runtime, mount debugfs and

$ echo -n 'module cpufreq +p' > /sys/kernel/debug/dynamic_debug/control

for debugging the complete "cpufreq" module. To achieve the same goal during boot, append

ddebug_query="module cpufreq +p"

as a boot parameter to the kernel of your choice.

For more detailled instructions, please see
Documentation/dynamic-debug-howto.txt

commit d94e52b8d0399331dd500394b8fdcfd997360513

Author: Jacob Shin <[email protected]>
Date:   Wed Apr 27 13:32:11 2011 -0500

[CPUFREQ] CPU hotplug, re-create sysfs directory and symlinks

When we discover CPUs that are affected by each other's frequency/voltage transitions, the first CPU gets a sysfs directory created, and rest of the siblings get symlinks. Currently, when we hotplug off only the first CPU, all of the symlinks and the sysfs directory gets removed. Even though rest of the siblings are still online and functional, they are orphaned, and no longer governed by cpufreq.

This patch, given the above scenario, creates a sysfs directory for the first sibling and symlinks for the rest of the siblings.

Please note the recursive call, it was rather too ugly to roll it out. And the removal of redundant NULL setting (it is already taken care of near the top of the function).

commit 877e916ea365196a5fd61d60fdaea635e9f5bd4b

Author: Naga Chumbalkar <[email protected]>
Date:   Tue Apr 26 17:05:18 2011 +0000

[CPUFREQ] Fix _OSC UUID in pcc-cpufreq

UUID needs to be written out the way it is described in Sec 18.5.124 of ACPI 4.0a Specification.

Platform firmware's use of this UUID/_OSC is optional, which is why we didn't notice this bug earlier.

commit a90f86460371305c069eb0c2ffb65026a1994605

Author: Karthigan Srinivasan <[email protected]>
Date:   Fri Apr 1 17:34:47 2011 -0500

[CPUFREQ] Drivers: cpufreq/cpufreq_stats.c: Fixed brace coding style issue

Fixed brace coding style issue.