mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-09 06:43:09 +00:00
PM: ACPI: reboot: Reinstate S5 for reboot
Commitd60cd06331
("PM: ACPI: reboot: Use S5 for reboot") caused Dell PowerEdge r440 hangs at reboot. The issue is fixed by commit2ca1c94ce0
("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 <dmitry.osipenko@collabora.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
e7fd8b6840
commit
38f34dba80
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user