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

Merge tag 'pm+acpi-3.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI and power management fixes and cleanups from Rafael Wysocki:

 - ACPI device hotplug fix preventing ACPI drivers from binding to device
   objects that acpi_bus_trim() has been called for and the devices
   represented by them may not be operational.

 - Recent cpufreq changes related to the "boost" (turbo) feature broke
   the acpi-cpufreq error code path causing a NULL pointer dereference
   to occur on some systems.  Fix from Konrad Rzeszutek Wilk.

 - The log level of a CPU initialization error message added recently
   needs to be reduced, because the particular BIOS issue indicated by
   it turns out to be widespread and doesn't really matter for the
   majority of systems having it.  From Jiang Liu.

 - The regulator API needs to be told to stay away from things on systems
   with ACPI BIOSes or it may conflict with the BIOS' own handling of
   voltage regulators.  Fix from Mark Brown that works around a 3.13
   regression in lm90 on PCs occuring if the regulator API is enabled.

 - Prevent the Exynos4 devfreq driver from being built on multiplatform,
   because it depends on things that aren't available during such builds.
   From Sachin Kamat.

 - Upstream ACPICA doesn't use the bool type as defined in the kernel,
   so modify the kernel's ACPICA code to follow the upstream in that
   respect (only one variable definition is affected) to reduce
   divergences between the two.  From Lv Zheng.

 - Make the ACPI device PM code use ACPI_COMPANION() instead of its own
   routine doing the same thing (and invokng ACPI_COMPANION() in the
   process).

 - Modify some routines in the ACPI processor driver to follow the
   common convention and return negative integers on errors.  From
   Hanjun Guo.

* tag 'pm+acpi-3.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / scan: Clear match_driver flag in acpi_bus_trim()
  ACPI / init: Flag use of ACPI and ACPI idioms for power supplies to regulator API
  acpi-cpufreq: De-register CPU notifier and free struct msr on error.
  ACPICA: Remove bool usage from ACPICA.
  PM / devfreq: Disable Exynos4 driver build on multiplatform
  ACPI / PM: Use ACPI_COMPANION() to get ACPI companions of devices
  ACPI / scan: reduce log level of "ACPI: \_PR_.CPU4: failed to get CPU APIC ID"
  ACPI / processor: Return specific error value when mapping lapic id
parents aafd9d6a 88ea0f2c

drivers/acpi/acpi_processor.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int acpi_processor_get_info(struct acpi_device *device) 


	apic_id = acpi_get_apicid(pr->handle, device_declaration, pr->acpi_id);

	if (apic_id < 0) {

		acpi_handle_err(pr->handle, "failed to get CPU APIC ID.\n");

		acpi_handle_debug(pr->handle, "failed to get CPU APIC ID.\n");

		return -ENODEV;

	}

	pr->apic_id = apic_id;

drivers/acpi/acpica/acglobal.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE); 
/*

 * Optionally enable output from the AML Debug Object.

 */

bool ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);

u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);



/*

 * Optionally copy the entire DSDT to local memory (instead of simply

drivers/acpi/bus.c

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/proc_fs.h>

#include <linux/acpi.h>

#include <linux/slab.h>

#include <linux/regulator/machine.h>

#ifdef CONFIG_X86

#include <asm/mpspec.h>

#endif
@@ -509,6 +510,14 @@ void __init acpi_early_init(void) 
		goto error0;

	}



	/*

	 * If the system is using ACPI then we can be reasonably

	 * confident that any regulators are managed by the firmware

	 * so tell the regulator core it has everything it needs to

	 * know.

	 */

	regulator_has_full_constraints();



	return;



      error0:

drivers/acpi/device_pm.c

+6 −18
Original line number Diff line number Diff line
@@ -726,18 +726,6 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable) 
}

#endif /* CONFIG_PM_SLEEP */



/**

 * acpi_dev_pm_get_node - Get ACPI device node for the given physical device.

 * @dev: Device to get the ACPI node for.

 */

struct acpi_device *acpi_dev_pm_get_node(struct device *dev)

{

	acpi_handle handle = ACPI_HANDLE(dev);

	struct acpi_device *adev;



	return handle && !acpi_bus_get_device(handle, &adev) ? adev : NULL;

}



/**

 * acpi_dev_pm_low_power - Put ACPI device into a low-power state.

 * @dev: Device to put into a low-power state.
@@ -778,7 +766,7 @@ static int acpi_dev_pm_full_power(struct acpi_device *adev) 
 */

int acpi_dev_runtime_suspend(struct device *dev)

{

	struct acpi_device *adev = acpi_dev_pm_get_node(dev);

	struct acpi_device *adev = ACPI_COMPANION(dev);

	bool remote_wakeup;

	int error;
@@ -809,7 +797,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_runtime_suspend); 
 */

int acpi_dev_runtime_resume(struct device *dev)

{

	struct acpi_device *adev = acpi_dev_pm_get_node(dev);

	struct acpi_device *adev = ACPI_COMPANION(dev);

	int error;



	if (!adev)
@@ -862,7 +850,7 @@ EXPORT_SYMBOL_GPL(acpi_subsys_runtime_resume); 
 */

int acpi_dev_suspend_late(struct device *dev)

{

	struct acpi_device *adev = acpi_dev_pm_get_node(dev);

	struct acpi_device *adev = ACPI_COMPANION(dev);

	u32 target_state;

	bool wakeup;

	int error;
@@ -894,7 +882,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_suspend_late); 
 */

int acpi_dev_resume_early(struct device *dev)

{

	struct acpi_device *adev = acpi_dev_pm_get_node(dev);

	struct acpi_device *adev = ACPI_COMPANION(dev);

	int error;



	if (!adev)
@@ -985,7 +973,7 @@ static struct dev_pm_domain acpi_general_pm_domain = { 
 */

int acpi_dev_pm_attach(struct device *dev, bool power_on)

{

	struct acpi_device *adev = acpi_dev_pm_get_node(dev);

	struct acpi_device *adev = ACPI_COMPANION(dev);



	if (!adev)

		return -ENODEV;
@@ -1017,7 +1005,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_pm_attach); 
 */

void acpi_dev_pm_detach(struct device *dev, bool power_off)

{

	struct acpi_device *adev = acpi_dev_pm_get_node(dev);

	struct acpi_device *adev = ACPI_COMPANION(dev);



	if (adev && dev->pm_domain == &acpi_general_pm_domain) {

		dev->pm_domain = NULL;

drivers/acpi/processor_core.c

+13 −13
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ static int map_lapic_id(struct acpi_subtable_header *entry, 
		(struct acpi_madt_local_apic *)entry;



	if (!(lapic->lapic_flags & ACPI_MADT_ENABLED))

		return 0;

		return -ENODEV;



	if (lapic->processor_id != acpi_id)

		return 0;

		return -EINVAL;



	*apic_id = lapic->id;

	return 1;

	return 0;

}



static int map_x2apic_id(struct acpi_subtable_header *entry,
@@ -60,14 +60,14 @@ static int map_x2apic_id(struct acpi_subtable_header *entry, 
		(struct acpi_madt_local_x2apic *)entry;



	if (!(apic->lapic_flags & ACPI_MADT_ENABLED))

		return 0;

		return -ENODEV;



	if (device_declaration && (apic->uid == acpi_id)) {

		*apic_id = apic->local_apic_id;

		return 1;

		return 0;

	}



	return 0;

	return -EINVAL;

}



static int map_lsapic_id(struct acpi_subtable_header *entry,
@@ -77,16 +77,16 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, 
		(struct acpi_madt_local_sapic *)entry;



	if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))

		return 0;

		return -ENODEV;



	if (device_declaration) {

		if ((entry->length < 16) || (lsapic->uid != acpi_id))

			return 0;

			return -EINVAL;

	} else if (lsapic->processor_id != acpi_id)

		return 0;

		return -EINVAL;



	*apic_id = (lsapic->id << 8) | lsapic->eid;

	return 1;

	return 0;

}



static int map_madt_entry(int type, u32 acpi_id)
@@ -116,13 +116,13 @@ static int map_madt_entry(int type, u32 acpi_id) 
		struct acpi_subtable_header *header =

			(struct acpi_subtable_header *)entry;

		if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {

			if (map_lapic_id(header, acpi_id, &apic_id))

			if (!map_lapic_id(header, acpi_id, &apic_id))

				break;

		} else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {

			if (map_x2apic_id(header, type, acpi_id, &apic_id))

			if (!map_x2apic_id(header, type, acpi_id, &apic_id))

				break;

		} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {

			if (map_lsapic_id(header, type, acpi_id, &apic_id))

			if (!map_lsapic_id(header, type, acpi_id, &apic_id))

				break;

		}

		entry += header->length;

CRA Git | Maintained and supported by SUSTech CRA and CCSE