Skip to content

Commit f706a63

Browse files
committed
ACPI: TAD: Use DC wakeup only if AC wakeup is supported
According to Section 9.17.2 of ACPI 6.6 [1], setting ACPI_TAD_DC_WAKE in the capabilities without setting ACPI_TAD_AC_WAKE is invalid, so don't support wakeup if that's the case. Moreover, it is sufficient to check ACPI_TAD_AC_WAKE alone to determine if wakeup is supported at all, so use this observation to simplify one check. Link: https://uefi.org/specs/ACPI/6.6/09_ACPI_Defined_Devices_and_Device_Specific_Objects.html#gcp-get-capability [1] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Link: https://patch.msgid.link/2833494.mvXUDI8C0e@rafael.j.wysocki
1 parent 93afe8b commit f706a63

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/acpi/acpi_tad.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,9 @@ static int acpi_tad_probe(struct platform_device *pdev)
706706
caps &= ~(ACPI_TAD_AC_WAKE | ACPI_TAD_DC_WAKE);
707707
}
708708

709+
if (!(caps & ACPI_TAD_AC_WAKE))
710+
caps &= ~ACPI_TAD_DC_WAKE;
711+
709712
dd = devm_kzalloc(dev, sizeof(*dd), GFP_KERNEL);
710713
if (!dd)
711714
return -ENOMEM;
@@ -719,7 +722,7 @@ static int acpi_tad_probe(struct platform_device *pdev)
719722
* runtime suspend. Everything else should be taken care of by the ACPI
720723
* PM domain callbacks.
721724
*/
722-
if (ACPI_TAD_AC_WAKE | ACPI_TAD_DC_WAKE) {
725+
if (ACPI_TAD_AC_WAKE) {
723726
device_init_wakeup(dev, true);
724727
dev_pm_set_driver_flags(dev, DPM_FLAG_SMART_SUSPEND |
725728
DPM_FLAG_MAY_SKIP_RESUME);

0 commit comments

Comments
 (0)