github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 03:53:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ACPI: scan: Use acpi_setup_gpe_for_wake() for buttons

Browse Source 
After starting to use platform devices for representing buttons
enumerated via ACPI, acpi_mark_gpe_for_wake() is insufficient for
preparing their GPEs to wake up the system from sleep because it
does not change the "dispatch type" of the given GPE to
ACPI_GPE_DISPATCH_NOTIFY.  Subsequently, this causes acpi_enable_gpe()
in __acpi_device_wakeup_enable() to fail and system suspend transitions
to be aborted.

Address this by updating acpi_wakeup_gpe_init() to use
acpi_setup_gpe_for_wake() for buttons like for any other devices.

This allows acpi_setup_gpe_for_wake() to be simplified further because
buttons are not a special case in it any more, so do that as well.

Fixes: 52d8640196 ("ACPI: button: Convert the driver to a platform one")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Xi Pardee <xi.pardee@linux.intel.com>
Link: https://patch.msgid.link/2259694.irdbgypaU6@rafael.j.wysocki
This commit is contained in:
Rafael J. Wysocki 2026-01-10 12:58:38 +01:00
parent 88fad6ce09
commit 57c31e6d62
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/acpi/scan.c
View File

@ -999,15 +999,11 @@ static int acpi_bus_extract_wakeup_device_power_package(struct acpi_device *dev)
return err; return err;
} }
/* Do not use a button for S5 wakeup */
#define ACPI_AVOID_WAKE_FROM_S5 BIT(0)
static bool acpi_wakeup_gpe_init(struct acpi_device *device) static bool acpi_wakeup_gpe_init(struct acpi_device *device)
{ {
static const struct acpi_device_id button_device_ids[] = { static const struct acpi_device_id button_device_ids[] = {
{"PNP0C0C", 0}, /* Power button */ {"PNP0C0D", 0}, /* Lid */
{"PNP0C0D", ACPI_AVOID_WAKE_FROM_S5}, /* Lid */ {"PNP0C0E", 0}, /* Sleep button */
{"PNP0C0E", ACPI_AVOID_WAKE_FROM_S5}, /* Sleep button */
{"", 0}, {"", 0},
}; };
struct acpi_device_wakeup *wakeup = &device->wakeup; struct acpi_device_wakeup *wakeup = &device->wakeup;
@ -1016,15 +1012,9 @@ static bool acpi_wakeup_gpe_init(struct acpi_device *device)
wakeup->flags.notifier_present = 0; wakeup->flags.notifier_present = 0;
/* Power button, Lid switch always enable wakeup */
match = acpi_match_acpi_device(button_device_ids, device); match = acpi_match_acpi_device(button_device_ids, device);
if (match) { if (match && wakeup->sleep_state == ACPI_STATE_S5)
if ((match->driver_data & ACPI_AVOID_WAKE_FROM_S5) && wakeup->sleep_state = ACPI_STATE_S4;
wakeup->sleep_state == ACPI_STATE_S5)
wakeup->sleep_state = ACPI_STATE_S4;
acpi_mark_gpe_for_wake(wakeup->gpe_device, wakeup->gpe_number);
return true;
}
status = acpi_setup_gpe_for_wake(device->handle, wakeup->gpe_device, status = acpi_setup_gpe_for_wake(device->handle, wakeup->gpe_device,
wakeup->gpe_number); wakeup->gpe_number);