Skip to content

Commit 38f34db

Browse files
khfengrafaeljw
authored andcommitted
PM: ACPI: reboot: Reinstate S5 for reboot
Commit d60cd06 ("PM: ACPI: reboot: Use S5 for reboot") caused Dell PowerEdge r440 hangs at reboot. The issue is fixed by commit 2ca1c94 ("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 <[email protected]> Signed-off-by: Kai-Heng Feng <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent e7fd8b6 commit 38f34db

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/acpi/sleep.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,14 @@ int __init acpi_sleep_init(void)
10881088
register_sys_off_handler(SYS_OFF_MODE_POWER_OFF,
10891089
SYS_OFF_PRIO_FIRMWARE,
10901090
acpi_power_off, NULL);
1091+
1092+
/*
1093+
* Windows uses S5 for reboot, so some BIOSes depend on it to
1094+
* perform proper reboot.
1095+
*/
1096+
register_sys_off_handler(SYS_OFF_MODE_RESTART_PREPARE,
1097+
SYS_OFF_PRIO_FIRMWARE,
1098+
acpi_power_off_prepare, NULL);
10911099
} else {
10921100
acpi_no_s5 = true;
10931101
}

0 commit comments

Comments
 (0)