From: Kai-Heng Feng Date: Thu, 29 Sep 2022 07:05:24 +0000 (+0800) Subject: PM: ACPI: reboot: Reinstate S5 for reboot X-Git-Tag: v6.6.17~6410^2^4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38f34dba806a4cb54ef3b2256948e770699a5769;p=platform%2Fkernel%2Flinux-rpi.git PM: ACPI: reboot: Reinstate S5 for reboot Commit d60cd06331a3 ("PM: ACPI: reboot: Use S5 for reboot") caused Dell PowerEdge r440 hangs at reboot. The issue is fixed by commit 2ca1c94ce0b6 ("tg3: Disable tg3 device on system reboot to avoid triggering AER"), so use the new sysoff API to reinstate S5 for reboot on ACPI-based systems. Using S5 for reboot is default behavior under Windows: "A full shutdown (S5) occurs when a system restart is requested" [1]. Link: https://docs.microsoft.com/en-us/windows/win32/power/system-power-state # [1] Suggested-by: Dmitry Osipenko Signed-off-by: Kai-Heng Feng Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index ad4b298..0b557c0 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -1088,6 +1088,14 @@ int __init acpi_sleep_init(void) register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_FIRMWARE, acpi_power_off, NULL); + + /* + * Windows uses S5 for reboot, so some BIOSes depend on it to + * perform proper reboot. + */ + register_sys_off_handler(SYS_OFF_MODE_RESTART_PREPARE, + SYS_OFF_PRIO_FIRMWARE, + acpi_power_off_prepare, NULL); } else { acpi_no_s5 = true; }