Skip to content

Commit 3988716

Browse files
committed
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
2 parents abacaf5 + 084f843 commit 3988716

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

drivers/acpi/acpica/acpredef.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
379379

380380
{{"_CPC", METHOD_0ARGS,
381381
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints/Bufs) */
382-
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0,
383-
0, 0, 0),
382+
PACKAGE_INFO(ACPI_PTYPE1_VAR,
383+
ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER |
384+
ACPI_RTYPE_PACKAGE, 0, 0, 0, 0),
384385

385386
{{"_CR3", METHOD_0ARGS, /* ACPI 6.0 */
386387
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},

drivers/acpi/device_pm.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,15 +1456,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
14561456
if (!adev || !acpi_match_device_ids(adev, special_pm_ids))
14571457
return 0;
14581458

1459-
/*
1460-
* Skip devices whose ACPI companions don't support power management and
1461-
* don't have a wakeup GPE.
1462-
*/
1463-
if (!acpi_device_power_manageable(adev) && !acpi_device_can_wakeup(adev)) {
1464-
dev_dbg(dev, "No ACPI power management or wakeup GPE\n");
1465-
return 0;
1466-
}
1467-
14681459
/*
14691460
* Only attach the power domain to the first device if the
14701461
* companion is shared by multiple. This is to prevent doing power

0 commit comments

Comments
 (0)