Skip to contentSkip to conversation

x86_64 EFI runtime service support: EFI runtime services

PATCH In review Huang, Ying 1 participant 1 message Aug 13, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 x86_64 EFI runtime service support: EFI runtime services

Changelog between v3 of EFI x86_64 support patch and this version

1. EFI reboot runtime service is embedded into the framework of reboot_type.
2. Function pointers are used for EFI time runtime service.
3. A kernel command line option "noefi_time" is added to make it possible to fall back to CMOS based implementation.

---

This patch adds support for several EFI runtime services for EFI x86_64 system.

The EFI support for emergency_restart and RTC clock is added. The EFI based implementation and legacy BIOS or CMOS based implementation are put in separate functions and can be chosen with kernel boot options.

---

 arch/x86_64/kernel/reboot.c            |   19 ++++++++-----
 arch/x86_64/kernel/time.c              |   48 ++++++++++++++++++++++-----------
 include/asm-x86_64/emergency-restart.h |    8 +++++
 include/asm-x86_64/time.h              |    7 ++++
 4 files changed, 60 insertions(+), 22 deletions(-)
arch/x86_64/kernel/reboot.c +13 -6
Index: linux-2.6.23-rc2/arch/x86_64/kernel/reboot.c
===================================================================
@@ -9,6 +9,7 @@
 #include <linux/pm.h>
 #include <linux/kdebug.h>
 #include <linux/sched.h>
+#include <linux/efi.h>
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/hw_irq.h>
@@ -25,18 +26,16 @@
 EXPORT_SYMBOL(pm_power_off);
 
 static long no_idt[3];
-static enum { 
-	BOOT_TRIPLE = 't',
-	BOOT_KBD = 'k'
-} 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)
+   efi    Use efi reset_system runtime service. cold reset (default)
    force  Avoid anything that could hang.
  */ 
 static int __init reboot_setup(char *str)
@@ -54,6 +53,7 @@
 		case 't':
 		case 'b':
 		case 'k':
+		case 'e':
 			reboot_type = *str;
 			break;
 		case 'f':
@@ -141,7 +141,14 @@
 
 			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;
+		}
 	}      
 }
 
arch/x86_64/kernel/time.c +32 -16

105 lines not on this page · raw message

include/asm-x86_64/emergency-restart.h +8 -0
Index: linux-2.6.23-rc2/include/asm-x86_64/emergency-restart.h
===================================================================
@@ -1,6 +1,14 @@
 #ifndef _ASM_EMERGENCY_RESTART_H
 #define _ASM_EMERGENCY_RESTART_H
 
+enum reboot_type {
+	BOOT_TRIPLE = 't',
+	BOOT_KBD = 'k',
+	BOOT_EFI = 'e'
+};
+
+extern enum reboot_type reboot_type;
+
 extern void machine_emergency_restart(void);
 
 #endif /* _ASM_EMERGENCY_RESTART_H */
include/asm-x86_64/time.h new file +7 -0
Index: linux-2.6.23-rc2/include/asm-x86_64/time.h
===================================================================
@@ -0,0 +1,7 @@
+#ifndef __ASM_X86_64_TIME_H
+#define __ASM_X86_64_TIME_H
+
+extern unsigned long (*get_wallclock)(void);
+extern int (*set_wallclock)(unsigned long nowtime);
+
+#endif