kernel: Import Xiaomi changes

* From dagu-s-oss

Change-Id: I48f3331802e188a77247125ab9d213e051fba129
This commit is contained in:
Sebastiano Barezzi
2022-11-16 16:57:25 +01:00
committed by Sebastiano Barezzi
parent f85bb0d96f
commit 1efb8eec72

View File

@@ -241,14 +241,14 @@ void migrate_to_reboot_cpu(void)
*/ */
void kernel_restart(char *cmd) void kernel_restart(char *cmd)
{ {
kernel_restart_prepare(cmd);
migrate_to_reboot_cpu();
syscore_shutdown();
if (!cmd) if (!cmd)
pr_emerg("Restarting system\n"); pr_emerg("Restarting system\n");
else else
pr_emerg("Restarting system with command '%s'\n", cmd); pr_emerg("Restarting system with command '%s'\n", cmd);
kmsg_dump(KMSG_DUMP_RESTART); kmsg_dump(KMSG_DUMP_RESTART);
kernel_restart_prepare(cmd);
migrate_to_reboot_cpu();
syscore_shutdown();
machine_restart(cmd); machine_restart(cmd);
} }
EXPORT_SYMBOL_GPL(kernel_restart); EXPORT_SYMBOL_GPL(kernel_restart);
@@ -268,11 +268,11 @@ static void kernel_shutdown_prepare(enum system_states state)
*/ */
void kernel_halt(void) void kernel_halt(void)
{ {
pr_emerg("System halted\n");
kmsg_dump(KMSG_DUMP_HALT);
kernel_shutdown_prepare(SYSTEM_HALT); kernel_shutdown_prepare(SYSTEM_HALT);
migrate_to_reboot_cpu(); migrate_to_reboot_cpu();
syscore_shutdown(); syscore_shutdown();
pr_emerg("System halted\n");
kmsg_dump(KMSG_DUMP_HALT);
machine_halt(); machine_halt();
} }
EXPORT_SYMBOL_GPL(kernel_halt); EXPORT_SYMBOL_GPL(kernel_halt);
@@ -284,13 +284,13 @@ EXPORT_SYMBOL_GPL(kernel_halt);
*/ */
void kernel_power_off(void) void kernel_power_off(void)
{ {
pr_emerg("Power down\n");
kmsg_dump(KMSG_DUMP_POWEROFF);
kernel_shutdown_prepare(SYSTEM_POWER_OFF); kernel_shutdown_prepare(SYSTEM_POWER_OFF);
if (pm_power_off_prepare) if (pm_power_off_prepare)
pm_power_off_prepare(); pm_power_off_prepare();
migrate_to_reboot_cpu(); migrate_to_reboot_cpu();
syscore_shutdown(); syscore_shutdown();
pr_emerg("Power down\n");
kmsg_dump(KMSG_DUMP_POWEROFF);
machine_power_off(); machine_power_off();
} }
EXPORT_SYMBOL_GPL(kernel_power_off); EXPORT_SYMBOL_GPL(kernel_power_off);