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

Commit 35b004cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message
  x86, msr: Fix typo in ENERGY_PERF_BIAS_POWERSAVE
  x86, intel, power: Initialize MSR_IA32_ENERGY_PERF_BIAS
parents 0a613b64 17edf2d7

arch/x86/include/asm/msr-index.h

+3 −0
Original line number Diff line number Diff line
@@ -259,6 +259,9 @@ 
#define MSR_IA32_TEMPERATURE_TARGET	0x000001a2



#define MSR_IA32_ENERGY_PERF_BIAS	0x000001b0

#define ENERGY_PERF_BIAS_PERFORMANCE	0

#define ENERGY_PERF_BIAS_NORMAL		6

#define ENERGY_PERF_BIAS_POWERSAVE	15



#define MSR_IA32_PACKAGE_THERM_STATUS		0x000001b1

arch/x86/kernel/cpu/intel.c

+18 −0
Original line number Diff line number Diff line
@@ -456,6 +456,24 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) 


	if (cpu_has(c, X86_FEATURE_VMX))

		detect_vmx_virtcap(c);



	/*

	 * Initialize MSR_IA32_ENERGY_PERF_BIAS if BIOS did not.

	 * x86_energy_perf_policy(8) is available to change it at run-time

	 */

	if (cpu_has(c, X86_FEATURE_EPB)) {

		u64 epb;



		rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

		if ((epb & 0xF) == ENERGY_PERF_BIAS_PERFORMANCE) {

			printk_once(KERN_WARNING "ENERGY_PERF_BIAS:"

				" Set to 'normal', was 'performance'\n"

				"ENERGY_PERF_BIAS: View and update with"

				" x86_energy_perf_policy(8)\n");

			epb = (epb & ~0xF) | ENERGY_PERF_BIAS_NORMAL;

			wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

		}

	}

}



#ifdef CONFIG_X86_32