Commit b7356abb authored Jul 19, 2013 by Linus Torvalds

linux-pm

Pull power management and ACPI fixes from Rafael Wysocki:
"These are fixes collected over the last week, most importnatly two
cpufreq reverts fixing regressions introduced in 3.10, an autoseelp
fix preventing systems using it from crashing during shutdown and two
ACPI scan fixes related to hotplug.

Specifics:

- Two cpufreq commits from the 3.10 cycle introduced regressions.
The first of them was buggy (it did way much more than it needed to
do) and the second one attempted to fix an issue introduced by the
first one. Fixes from Srivatsa S Bhat revert both.

- If autosleep triggers during system shutdown and the shutdown
callbacks of some device drivers have been called already, it may
crash the system. Fix from Liu Shuo prevents that from happening
by making try_to_suspend() check system_state.

- The ACPI memory hotplug driver doesn't clear its driver_data on
errors which may cause a NULL poiter dereference to happen later.
Fix from Toshi Kani.

- The ACPI namespace scanning code should not try to attach scan
handlers to device objects that have them already, which may
confuse things quite a bit, and it should rescan the whole
namespace branch starting at the given node after receiving a bus
check notify event even if the device at that particular node has
been discovered already. Fixes from Rafael J Wysocki.

- New ACPI video blacklist entry for a system whose initial backlight
setting from the BIOS doesn't make sense. From Lan Tianyu.

- Garbage string output avoindance for ACPI PNP from Liu Shuo.

- Two Kconfig fixes for issues introduced recently in the s3c24xx
cpufreq driver (when moving the driver to drivers/cpufreq) from
Paul Bolle.

- Trivial comment fix in pm_wakeup.h from Chanwoo Choi"

* tag 'pm+acpi-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / video: ignore BIOS initial backlight value for Fujitsu E753
PNP / ACPI: avoid garbage in resource name
cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression
cpufreq: s3c24xx: fix "depends on ARM_S3C24XX" in Kconfig
cpufreq: s3c24xx: rename CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
PM / Sleep: Fix comment typo in pm_wakeup.h
PM / Sleep: avoid 'autosleep' in shutdown progress
cpufreq: Revert commit a66b2e to fix suspend/resume regression
ACPI / memhotplug: Fix a stale pointer in error path
ACPI / scan: Always call acpi_bus_scan() for bus check notifications
ACPI / scan: Do not try to attach scan handlers to devices having them

parents ecb2cf1a 5a8d2815

arch/arm/mach-s3c24xx/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ config S3C24XX_GPIO_EXTRA128

		config S3C24XX_PLL
		bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
		depends on ARM_S3C24XX
		depends on ARM_S3C24XX_CPUFREQ
		help
		Compile in support for changing the PLL frequency from the
		S3C24XX series CPUfreq driver. The PLL takes time to settle

drivers/acpi/acpi_memhotplug.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -323,6 +323,7 @@ static int acpi_memory_device_add(struct acpi_device *device,
		/* Get the range from the _CRS */
		result = acpi_memory_get_device_resources(mem_device);
		if (result) {
		device->driver_data = NULL;
		kfree(mem_device);
		return result;
		}

drivers/acpi/scan.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -352,11 +352,13 @@ static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
		mutex_lock(&acpi_scan_lock);
		lock_device_hotplug();

		if (ost_source != ACPI_NOTIFY_BUS_CHECK) {
		acpi_bus_get_device(handle, &device);
		if (device) {
		dev_warn(&device->dev, "Attempt to re-insert\n");
		goto out;
		}
		}
		acpi_evaluate_hotplug_ost(handle, ost_source,
		ACPI_OST_SC_INSERT_IN_PROGRESS, NULL);
		error = acpi_bus_scan(handle);
		@@ -1981,6 +1983,9 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
		if (acpi_bus_get_device(handle, &device))
		return AE_CTRL_DEPTH;

		if (device->handler)
		return AE_OK;

		ret = acpi_scan_attach_handler(device);
		if (ret)
		return ret > 0 ? AE_OK : AE_CTRL_DEPTH;

drivers/acpi/video.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -448,6 +448,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13 - 2000 Notebook PC"),
		},
		},
		{
		.callback = video_ignore_initial_backlight,
		.ident = "Fujitsu E753",
		.matches = {
		DMI_MATCH(DMI_BOARD_VENDOR, "FUJITSU"),
		DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E753"),
		},
		},
		{
		.callback = video_ignore_initial_backlight,
		.ident = "HP Pavilion dm4",

drivers/cpufreq/cpufreq.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1942,13 +1942,15 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
		if (dev) {
		switch (action) {
		case CPU_ONLINE:
		case CPU_ONLINE_FROZEN:
		cpufreq_add_dev(dev, NULL);
		break;
		case CPU_DOWN_PREPARE:
		case CPU_UP_CANCELED_FROZEN:
		case CPU_DOWN_PREPARE_FROZEN:
		__cpufreq_remove_dev(dev, NULL);
		break;
		case CPU_DOWN_FAILED:
		case CPU_DOWN_FAILED_FROZEN:
		cpufreq_add_dev(dev, NULL);
		break;
		}