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

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

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

Pull ACPI and power management fixes from Rafael J Wysocki:

 - Fix for a recent cpufreq regression related to acpi-cpufreq and
   suspend/resume from Viresh Kumar.

 - cpufreq stats reference counting fix from Viresh Kumar.

 - intel_pstate driver fixes from Dirk Brandewie and Konrad Rzeszutek
   Wilk.

 - New ACPI suspend blacklist entry for Sony Vaio VGN-FW21M from Fabio
   Valentini.

 - ACPI Platform Error Interface (APEI) fix from Chen Gong.

 - PCI root bridge hotplug locking fix from Yinghai Lu.

* tag 'pm+acpi-3.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PCI / ACPI: hold acpi_scan_lock during root bus hotplug
  ACPI / APEI: fix error status check condition for CPER
  ACPI / PM: fix suspend and resume on Sony Vaio VGN-FW21M
  cpufreq: acpi-cpufreq: Don't set policy->related_cpus from .init()
  cpufreq: stats: do cpufreq_cpu_put() corresponding to cpufreq_cpu_get()
  intel-pstate: Use #defines instead of hard-coded values.
  cpufreq / intel_pstate: Fix calculation of current frequency
  cpufreq / intel_pstate: Add function to check that all MSRs are valid
parents 8b1e54c4 6125c2be

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

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define SNB_C1_AUTO_UNDEMOTE		(1UL << 27)

#define SNB_C3_AUTO_UNDEMOTE		(1UL << 28)



#define MSR_PLATFORM_INFO		0x000000ce

#define MSR_MTRRcap			0x000000fe

#define MSR_IA32_BBL_CR_CTL		0x00000119

#define MSR_IA32_BBL_CR_CTL3		0x0000011e

drivers/acpi/apei/cper.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ int apei_estatus_check(const struct acpi_hest_generic_status *estatus) 
		return rc;

	data_len = estatus->data_length;

	gdata = (struct acpi_hest_generic_data *)(estatus + 1);

	while (data_len > sizeof(*gdata)) {

	while (data_len >= sizeof(*gdata)) {

		gedata_len = gdata->error_data_length;

		if (gedata_len > data_len - sizeof(*gdata))

			return -EINVAL;

drivers/acpi/pci_root.c

+7 −2
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ static void handle_root_bridge_insertion(acpi_handle handle) 


static void handle_root_bridge_removal(struct acpi_device *device)

{

	acpi_status status;

	struct acpi_eject_event *ej_event;



	ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
@@ -661,7 +662,9 @@ static void handle_root_bridge_removal(struct acpi_device *device) 
	ej_event->device = device;

	ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;



	acpi_bus_hot_remove_device(ej_event);

	status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device, ej_event);

	if (ACPI_FAILURE(status))

		kfree(ej_event);

}



static void _handle_hotplug_event_root(struct work_struct *work)
@@ -676,8 +679,9 @@ static void _handle_hotplug_event_root(struct work_struct *work) 
	handle = hp_work->handle;

	type = hp_work->type;



	root = acpi_pci_find_root(handle);

	acpi_scan_lock_acquire();



	root = acpi_pci_find_root(handle);

	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);



	switch (type) {
@@ -711,6 +715,7 @@ static void _handle_hotplug_event_root(struct work_struct *work) 
		break;

	}



	acpi_scan_lock_release();

	kfree(hp_work); /* allocated in handle_hotplug_event_bridge */

	kfree(buffer.pointer);

}

drivers/acpi/sleep.c

+8 −0
Original line number Diff line number Diff line
@@ -193,6 +193,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { 
	},

	{

	.callback = init_nvs_nosave,

	.ident = "Sony Vaio VGN-FW21M",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),

		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21M"),

		},

	},

	{

	.callback = init_nvs_nosave,

	.ident = "Sony Vaio VPCEB17FX",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),

drivers/cpufreq/acpi-cpufreq.c

+0 −2
Original line number Diff line number Diff line
@@ -730,7 +730,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	    policy->shared_type == CPUFREQ_SHARED_TYPE_ANY) {

		cpumask_copy(policy->cpus, perf->shared_cpu_map);

	}

	cpumask_copy(policy->related_cpus, perf->shared_cpu_map);



#ifdef CONFIG_SMP

	dmi_check_system(sw_any_bug_dmi_table);
@@ -742,7 +741,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	if (check_amd_hwpstate_cpu(cpu) && !acpi_pstate_strict) {

		cpumask_clear(policy->cpus);

		cpumask_set_cpu(cpu, policy->cpus);

		cpumask_copy(policy->related_cpus, cpu_sibling_mask(cpu));

		policy->shared_type = CPUFREQ_SHARED_TYPE_HW;

		pr_info_once(PFX "overriding BIOS provided _PSD data\n");

	}