[04/10] ACPICA: Enable sleep button on ACPI legacy wake
diff mbox series

Message ID 20200214184804.15114-5-erik.kaneda@intel.com
State Awaiting Upstream
Delegated to: Rafael Wysocki
Headers show
  • ACPICA release 20200214
Related show

Commit Message

Erik Kaneda Feb. 14, 2020, 6:47 p.m. UTC
From: Anchal Agarwal <anchalag@amazon.com>

ACPICA commit 9383f5b01091e432c05f802a57edc20d329eec1f

Hibernation (S4) is triggered in a guest when it recieves a sleep
trigger from the hypervisor. When the guest resumes from this power
state, it does not see the sleep_enabled bit. In otherwords, the sleep
button is not enabled on waking from an S4 state. This causes
subsequent invocation of sleep state to fail in the guest.

Fix this problem by enabling the sleep button in ACPI legacy wake.

Signed-off-by: Anchal Agarwal <anchalag@amazon.com>
Reviewed-by: Balbir Singh <sblbir@amazon.com>
Reviewed-by: Frank van der Linden <fllinden@amazon.com>
[ ek: changelog]

Link: https://github.com/acpica/acpica/commit/9383f5b0
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
Signed-off-by: Anchal Agarwal <anchalag@amazon.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
 drivers/acpi/acpica/hwsleep.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff mbox series

diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 243a25add28f..317ae870336b 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -300,6 +300,18 @@  acpi_status acpi_hw_legacy_wake(u8 sleep_state)
 				    status_register_id, ACPI_CLEAR_STATUS);
+	/* Enable sleep button */
+	(void)
+	    acpi_write_bit_register(acpi_gbl_fixed_event_info
+				    enable_register_id, ACPI_ENABLE_EVENT);
+	(void)
+	    acpi_write_bit_register(acpi_gbl_fixed_event_info
+				    status_register_id, ACPI_CLEAR_STATUS);
 	acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);