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

Merge tag 'acpi-7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI support fixes from Rafael Wysocki:

 - Revert a commit related to ACPI device power management that was
   not supposed to make any functional difference, but it did so and
   introduced a regression (Rafael Wysocki)

 - Update the _CPC object definition in ACPICA to match ACPI 6.6 and
   prevent the kernel from printing a false-positive warning regarding
   _CPC output package format on platforms shipping with firmware based
   on ACPI 6.6 (Saket Dumbre)

* tag 'acpi-7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI: PM: Let acpi_dev_pm_attach() skip devices without ACPI PM"
  ACPICA: Update the _CPC definition to match ACPI 6.6
parents abacaf55 084f8430

drivers/acpi/acpica/acpredef.h

+3 −2
Original line number Diff line number Diff line
@@ -379,8 +379,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 


	{{"_CPC", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Variable-length (Ints/Bufs) */

	PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0,

		     0, 0, 0),

	PACKAGE_INFO(ACPI_PTYPE1_VAR,

		     ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER |

		     ACPI_RTYPE_PACKAGE, 0, 0, 0, 0),



	{{"_CR3", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},

drivers/acpi/device_pm.c

+0 −9
Original line number Diff line number Diff line
@@ -1456,15 +1456,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) 
	if (!adev || !acpi_match_device_ids(adev, special_pm_ids))

		return 0;



	/*

	 * Skip devices whose ACPI companions don't support power management and

	 * don't have a wakeup GPE.

	 */

	if (!acpi_device_power_manageable(adev) && !acpi_device_can_wakeup(adev)) {

		dev_dbg(dev, "No ACPI power management or wakeup GPE\n");

		return 0;

	}



	/*

	 * Only attach the power domain to the first device if the

	 * companion is shared by multiple. This is to prevent doing power