[PATCH 2/2] efi/arm64: use UEFI for system reset
From: mark.rutland@arm.com (Mark Rutland)
Date: 2014-08-29 16:06:41
Hi Ard, On Fri, Aug 29, 2014 at 04:05:57PM +0100, Ard Biesheuvel wrote:
If UEFI Runtime Services are available, they are preferred over direct PSCI calls or other methods to reset the system. For the reset case, we need to hook into machine_restart(), as the arm_pm_restart function pointer may be overwritten by modules.
This is changing with the restart handler callchain series [1]. I think you need to rework this atop of that. Thanks, Mark. [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-August/280519.html
quoted hunk ↗ jump to hunk
Signed-off-by: Ard Biesheuvel <redacted> --- arch/arm64/kernel/process.c | 7 +++++++ 1 file changed, 7 insertions(+)diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 1309d64aa926..335a93da5eeb 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c@@ -177,6 +177,13 @@ void machine_restart(char *cmd) local_irq_disable(); smp_send_stop(); + /* + * arm_pm_restart is exported to modules, so the only way to supersede + * it with efi_reboot() is to call it here. + */ + if (IS_ENABLED(CONFIG_EFI) && efi_enabled(EFI_RUNTIME_SERVICES)) + efi_reboot(REBOOT_WARM, NULL); + /* Now call the architecture specific reboot code. */ if (arm_pm_restart) arm_pm_restart(reboot_mode, cmd);-- 1.8.3.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel