Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fe77b81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [ACPI/CPUFREQ] Introduce bios_limit per cpu cpufreq sysfs interface
  [CPUFREQ] make internal cpufreq_add_dev_* static
  [CPUFREQ] use an enum for speedstep processor identification
  [CPUFREQ] Document units for transition latency
  [CPUFREQ] Use global sysfs cpufreq structure for conservative governor tunings
  [CPUFREQ] Documentation: ABI: /sys/devices/system/cpu/cpu#/cpufreq/
  [CPUFREQ] powernow-k6: set transition latency value so ondemand governor can be used
  [CPUFREQ] cpumask: don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c
parents cb5228a6 e2f74f35

Documentation/ABI/testing/sysfs-devices-system-cpu

+18 −0
Original line number Diff line number Diff line
@@ -136,6 +136,24 @@ Description: Discover cpuidle policy and mechanism 
		See files in Documentation/cpuidle/ for more information.





What:		/sys/devices/system/cpu/cpu#/cpufreq/*

Date:		pre-git history

Contact:	cpufreq@vger.kernel.org

Description:	Discover and change clock speed of CPUs



		Clock scaling allows you to change the clock speed of the

		CPUs on the fly. This is a nice method to save battery

		power, because the lower the clock speed, the less power

		the CPU consumes.



		There are many knobs to tweak in this directory.



		See files in Documentation/cpu-freq/ for more information.



		In particular, read Documentation/cpu-freq/user-guide.txt

		to learn how to control the knobs.





What:      /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X

Date:      August 2008

KernelVersion:	2.6.27

Documentation/cpu-freq/cpu-drivers.txt

+3 −3
Original line number Diff line number Diff line
@@ -92,9 +92,9 @@ policy->cpuinfo.max_freq - the minimum and maximum frequency 
				(in kHz) which is supported by 

				this CPU

policy->cpuinfo.transition_latency   the time it takes on this CPU to

				switch between two frequencies (if

				appropriate, else specify

				CPUFREQ_ETERNAL)

				switch between two frequencies in

				nanoseconds (if appropriate, else

				specify CPUFREQ_ETERNAL)



policy->cur			The current operating frequency of

				this CPU (if appropriate)

Documentation/cpu-freq/user-guide.txt

+11 −0
Original line number Diff line number Diff line
@@ -203,6 +203,17 @@ scaling_cur_freq : Current frequency of the CPU as determined by 
				the frequency the kernel thinks the CPU runs

				at.



bios_limit :			If the BIOS tells the OS to limit a CPU to

				lower frequencies, the user can read out the

				maximum available frequency from this file.

				This typically can happen through (often not

				intended) BIOS settings, restrictions

				triggered through a service processor or other

				BIOS/HW based implementations.

				This does not cover thermal ACPI limitations

				which can be detected through the generic

				thermal driver.



If you have selected the "userspace" governor which allows you to

set the CPU operating frequency to a specific value, you can read out

the current frequency in

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+9 −8
Original line number Diff line number Diff line
@@ -766,6 +766,7 @@ static struct freq_attr *acpi_cpufreq_attr[] = { 
static struct cpufreq_driver acpi_cpufreq_driver = {

	.verify		= acpi_cpufreq_verify,

	.target		= acpi_cpufreq_target,

	.bios_limit	= acpi_processor_get_bios_limit,

	.init		= acpi_cpufreq_cpu_init,

	.exit		= acpi_cpufreq_cpu_exit,

	.resume		= acpi_cpufreq_resume,

arch/x86/kernel/cpu/cpufreq/powernow-k6.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy) 
	}



	/* cpuinfo and default policy values */

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	policy->cpuinfo.transition_latency = 200000;

	policy->cur = busfreq * max_multiplier;



	result = cpufreq_frequency_table_cpuinfo(policy, clock_ratio);