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

Commit ba2ab41f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-for-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI and power management fixes from Rafael Wysocki:

 - Two cpuidle initialization fixes from Konrad Rzeszutek Wilk.

 - cpufreq regression fixes for AMD processors from Borislav Petkov,
   Stefan Bader, and Matthew Garrett.

 - ACPI cpufreq fix from Thomas Schlichter.

 - cpufreq and devfreq fixes related to incorrect usage of operating
   performance points (OPP) framework and RCU from Nishanth Menon.

 - APEI workaround for incorrect BIOS information from Lans Zhang.

* tag 'pm+acpi-for-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: Add module aliases for acpi-cpufreq
  ACPI: Check MSR valid bit before using P-state frequencies
  PM / devfreq: exynos4_bus: honor RCU lock usage
  PM / devfreq: add locking documentation for recommended_opp
  cpufreq: cpufreq-cpu0: use RCU locks around usage of OPP
  cpufreq: OMAP: use RCU locks around usage of OPP
  ACPI, APEI: Fixup incorrect 64-bit access width firmware bug
  ACPI / processor: Get power info before updating the C-states
  powernow-k8: Add a kconfig dependency on acpi-cpufreq
  ACPI / cpuidle: Fix NULL pointer issues when cpuidle is disabled
  intel_idle: Don't register CPU notifier if we are not running.
parents bff92411 efa17194

drivers/acpi/apei/apei-base.c

+3 −0
Original line number Diff line number Diff line
@@ -590,6 +590,9 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr, 
	if (bit_width == 32 && bit_offset == 0 && (*paddr & 0x03) == 0 &&

	    *access_bit_width < 32)

		*access_bit_width = 32;

	else if (bit_width == 64 && bit_offset == 0 && (*paddr & 0x07) == 0 &&

	    *access_bit_width < 64)

		*access_bit_width = 64;



	if ((bit_width + bit_offset) > *access_bit_width) {

		pr_warning(FW_BUG APEI_PFX

drivers/acpi/processor_idle.c

+4 −0
Original line number Diff line number Diff line
@@ -958,6 +958,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr) 
		return -EINVAL;

	}



	if (!dev)

		return -EINVAL;



	dev->cpu = pr->id;



	if (max_cstate == 0)
@@ -1149,6 +1152,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) 
		}



		/* Populate Updated C-state information */

		acpi_processor_get_power_info(pr);

		acpi_processor_setup_cpuidle_states(pr);



		/* Enable all cpuidle devices */

drivers/acpi/processor_perflib.c

+7 −0
Original line number Diff line number Diff line
@@ -340,6 +340,13 @@ static void amd_fixup_frequency(struct acpi_processor_px *px, int i) 
	if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10)

	    || boot_cpu_data.x86 == 0x11) {

		rdmsr(MSR_AMD_PSTATE_DEF_BASE + index, lo, hi);

		/*

		 * MSR C001_0064+:

		 * Bit 63: PstateEn. Read-write. If set, the P-state is valid.

		 */

		if (!(hi & BIT(31)))

			return;



		fid = lo & 0x3f;

		did = (lo >> 6) & 7;

		if (boot_cpu_data.x86 == 0x10)

drivers/cpufreq/Kconfig.x86

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ config X86_POWERNOW_K7_ACPI 
config X86_POWERNOW_K8

	tristate "AMD Opteron/Athlon64 PowerNow!"

	select CPU_FREQ_TABLE

	depends on ACPI && ACPI_PROCESSOR

	depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ

	help

	  This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.

	  Support for K10 and newer processors is now in acpi-cpufreq.

drivers/cpufreq/acpi-cpufreq.c

+7 −0
Original line number Diff line number Diff line
@@ -1030,4 +1030,11 @@ MODULE_PARM_DESC(acpi_pstate_strict, 
late_initcall(acpi_cpufreq_init);

module_exit(acpi_cpufreq_exit);



static const struct x86_cpu_id acpi_cpufreq_ids[] = {

	X86_FEATURE_MATCH(X86_FEATURE_ACPI),

	X86_FEATURE_MATCH(X86_FEATURE_HW_PSTATE),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);



MODULE_ALIAS("acpi");