Commit 57c31e6d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: scan: Use acpi_setup_gpe_for_wake() for buttons 



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: 52d86401 ("ACPI: button: Convert the driver to a platform one")
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarXi Pardee <xi.pardee@linux.intel.com>
Link: https://patch.msgid.link/2259694.irdbgypaU6@rafael.j.wysocki
parent 88fad6ce

drivers/acpi/scan.c

+4 −14
Original line number Diff line number Diff line
@@ -999,15 +999,11 @@ static int acpi_bus_extract_wakeup_device_power_package(struct acpi_device *dev) 
	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 const struct acpi_device_id button_device_ids[] = {

		{"PNP0C0C", 0},				/* Power button */

		{"PNP0C0D", ACPI_AVOID_WAKE_FROM_S5},	/* Lid */

		{"PNP0C0E", ACPI_AVOID_WAKE_FROM_S5},	/* Sleep button */

		{"PNP0C0D", 0},	/* Lid */

		{"PNP0C0E", 0},	/* Sleep button */

		{"", 0},

	};

	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;



	/* Power button, Lid switch always enable wakeup */

	match = acpi_match_acpi_device(button_device_ids, device);

	if (match) {

		if ((match->driver_data & ACPI_AVOID_WAKE_FROM_S5) &&

		    wakeup->sleep_state == ACPI_STATE_S5)

	if (match && 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,

					 wakeup->gpe_number);