From: Huang, Ying Date: Wed, 30 Jan 2008 12:31:19 +0000 (+0100) Subject: x86: EFI runtime service support: EFI runtime services X-Git-Tag: v2.6.25-rc1~1143^2~581 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de18c850af701ac9512b7239e88fa45e4c168771;p=linux-2.6 x86: EFI runtime service support: EFI runtime services This patch adds support for several EFI runtime services for EFI x86_64 system. The EFI support for emergency_restart is added. Signed-off-by: Chandramouli Narayanan Signed-off-by: Huang Ying Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/reboot_64.c b/arch/x86/kernel/reboot_64.c index 307f996a39..d6bdf93ffc 100644 --- a/arch/x86/kernel/reboot_64.c +++ b/arch/x86/kernel/reboot_64.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -28,20 +29,17 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); static long no_idt[3]; -static enum { - BOOT_TRIPLE = 't', - BOOT_KBD = 'k', - BOOT_ACPI = 'a' -} reboot_type = BOOT_KBD; +enum reboot_type reboot_type = BOOT_KBD; static int reboot_mode = 0; int reboot_force; -/* reboot=t[riple] | k[bd] [, [w]arm | [c]old] +/* reboot=t[riple] | k[bd] | e[fi] [, [w]arm | [c]old] warm Don't set the cold reboot flag cold Set the cold reboot flag triple Force a triple fault (init) kbd Use the keyboard controller. cold reset (default) acpi Use the RESET_REG in the FADT + efi Use efi reset_system runtime service force Avoid anything that could hang. */ static int __init reboot_setup(char *str) @@ -60,6 +58,7 @@ static int __init reboot_setup(char *str) case 'a': case 'b': case 'k': + case 'e': reboot_type = *str; break; case 'f': @@ -155,7 +154,14 @@ void machine_emergency_restart(void) acpi_reboot(); reboot_type = BOOT_KBD; break; - } + + case BOOT_EFI: + if (efi_enabled) + efi.reset_system(reboot_mode ? EFI_RESET_WARM : EFI_RESET_COLD, + EFI_SUCCESS, 0, NULL); + reboot_type = BOOT_KBD; + break; + } } } diff --git a/include/asm-x86/emergency-restart.h b/include/asm-x86/emergency-restart.h index 680c395633..5418908446 100644 --- a/include/asm-x86/emergency-restart.h +++ b/include/asm-x86/emergency-restart.h @@ -1,6 +1,15 @@ #ifndef _ASM_EMERGENCY_RESTART_H #define _ASM_EMERGENCY_RESTART_H +enum reboot_type { + BOOT_TRIPLE = 't', + BOOT_KBD = 'k', + BOOT_ACPI = 'a', + BOOT_EFI = 'e' +}; + +extern enum reboot_type reboot_type; + extern void machine_emergency_restart(void); #endif /* _ASM_EMERGENCY_RESTART_H */