Skip to contentSkip to conversation

x86_64 EFI support -v3: EFI runtime support

PATCH In review Huang, Ying 2 participants 3 messages Jul 31, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 3/5 x86_64 EFI support -v3: EFI runtime support

This patch adds runtime service support 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 are chosen based on the value of efi_enabled.

---

 reboot.c |   11 ++++++++++-
 time.c   |   47 +++++++++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 17 deletions(-)
arch/x86_64/kernel/reboot.c +10 -1
Index: linux-2.6.23-rc1/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>
@@ -117,7 +118,7 @@
 	pci_iommu_shutdown();
 }
 
-void machine_emergency_restart(void)
+static inline void bios_emergency_restart(void)
 {
 	int i;
 
@@ -145,6 +146,14 @@
 	}      
 }
 
+void machine_emergency_restart(void)
+{
+	if (efi_enabled)
+		efi_emergency_restart();
+	else
+		bios_emergency_restart();
+}
+
 void machine_restart(char * __unused)
 {
 	printk("machine restart\n");
arch/x86_64/kernel/time.c +31 -16

92 lines not on this page · raw message

#1 lore raw
Quoted 6 lines · Ying

This patch adds runtime service support 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 are chosen based on the value of efi_enabled.

The patches to the reboot path are wrong (see below).

Why do we need to do this anyway? Why do we need any EFI runtime support? We already have ACPI. Isn't that good enough to abstract out the runtime parts of the hardware?

Why do we need to replace working code that directly talks to the architecturally defined hardware, with firmware calls?

What is the point? What is the advantage?

The disadvantage of having more code to maintain and having to deal with more BIOS bugs should be obvious.

Quoted 34 lines

---

 reboot.c |   11 ++++++++++-
 time.c   |   47 +++++++++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 17 deletions(-)

Index: linux-2.6.23-rc1/arch/x86_64/kernel/reboot.c
===================================================================
--- linux-2.6.23-rc1.orig/arch/x86_64/kernel/reboot.c 2007-07-23 04:41:00.000000000 +0800
+++ linux-2.6.23-rc1/arch/x86_64/kernel/reboot.c 2007-07-30 09:26:56.000000000 +0800

arch/x86_64/kernel/reboot.c +2 -1
@@ -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>
@@ -117,7 +118,7 @@
 	pci_iommu_shutdown();
 }
 
-void machine_emergency_restart(void)
+static inline void bios_emergency_restart(void)
 {
 	int i;
 
@@ -145,6 +146,14 @@
 	}      

arch/x86_64/kernel/reboot.c line 156

Quoted 10 lines
arch/x86_64/kernel/reboot.c +8 -0
 }
 
+void machine_emergency_restart(void)
+{
+	if (efi_enabled)
+		efi_emergency_restart();
+	else
+		bios_emergency_restart();
+}
+

A EFI is a bios so naming the current machine_emergency_restart bios_emergency_restart is a misnomer, especially since pounds the hardware not the firmware.
Second we already have a perfectly capable mechanism in the
reboot_type variable so you should just need to add one more type and handle this properly.

Quoted 107 lines
arch/x86_64/kernel/reboot.c +0 -0
 void machine_restart(char * __unused)
 {
 	printk("machine restart\n");

Index: linux-2.6.23-rc1/arch/x86_64/kernel/time.c
===================================================================
--- linux-2.6.23-rc1.orig/arch/x86_64/kernel/time.c 2007-07-23 04:41:00.000000000 +0800
+++ linux-2.6.23-rc1/arch/x86_64/kernel/time.c 2007-07-30 09:42:12.000000000 +0800

arch/x86_64/kernel/time.c +31 -16
@@ -27,6 +27,7 @@
 #include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/kallsyms.h>
+#include <linux/efi.h>
 #include <linux/acpi.h>
 #ifdef CONFIG_ACPI
 #include <acpi/achware.h>	/* for PM timer frequency */
@@ -89,13 +90,6 @@
 	unsigned char control, freq_select;
 
 /*
- * IRQs are disabled when we're called from the timer interrupt,
- * no need for spin_lock_irqsave()
- */
-
-	spin_lock(&rtc_lock);
-
-/*
  * Tell the clock it's being set and stop it.
  */
 
@@ -143,14 +137,26 @@
 	CMOS_WRITE(control, RTC_CONTROL);
 	CMOS_WRITE(freq_select, RTC_FREQ_SELECT);
 
-	spin_unlock(&rtc_lock);
-
 	return retval;
 }
 
 int update_persistent_clock(struct timespec now)
 {
-	return set_rtc_mmss(now.tv_sec);
+	int retval;
+
+/*
+ * IRQs are disabled when we're called from the timer interrupt,
+ * no need for spin_lock_irqsave()
+ */
+
+	spin_lock(&rtc_lock);
+	if (efi_enabled)
+		retval = efi_set_rtc_mmss(now.tv_sec);
+	else
+		retval = set_rtc_mmss(now.tv_sec);
+	spin_unlock(&rtc_lock);
+
+	return retval;
 }
 
 void main_timer_handler(void)
@@ -195,14 +201,11 @@
 	return IRQ_HANDLED;
 }
 
-unsigned long read_persistent_clock(void)
+unsigned long read_cmos_clock(void)
 {
 	unsigned int year, mon, day, hour, min, sec;
-	unsigned long flags;
 	unsigned century = 0;
 
-	spin_lock_irqsave(&rtc_lock, flags);
-
 	do {
 		sec = CMOS_READ(RTC_SECONDS);
 		min = CMOS_READ(RTC_MINUTES);
@@ -217,8 +220,6 @@
 #endif
 	} while (sec != CMOS_READ(RTC_SECONDS));
 
-	spin_unlock_irqrestore(&rtc_lock, flags);
-
 	/*
 	 * We know that x86-64 always uses BCD format, no need to check the
 	 * config register.
@@ -246,6 +247,20 @@
 	return mktime(year, mon, day, hour, min, sec);
 }
 
+unsigned long read_persistent_clock(void)
+{
+	unsigned long flags, retval;
+
+	spin_lock_irqsave(&rtc_lock, flags);
+	if (efi_enabled)
+		retval = efi_get_time();
+	else
+		retval = read_cmos_clock();
+	spin_unlock_irqrestore(&rtc_lock, flags);
+
+	return retval;
+}
+
 /* calibrate_cpu is used on systems with fixed rate TSCs to determine
  * processor frequency */
 #define TICK_COUNT 100000000
#2 lore raw
Quoted 13 lines · Eric W. Biederman
Quoted 6 lines

This patch adds runtime service support 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 are chosen based on the value of efi_enabled.

The patches to the reboot path are wrong (see below).

Why do we need to do this anyway? Why do we need any EFI runtime support? We already have ACPI. Isn't that good enough to abstract out the runtime parts of the hardware?

Quoted 7 lines

Why do we need to replace working code that directly talks to the architecturally defined hardware, with firmware calls?

What is the point? What is the advantage?

The disadvantage of having more code to maintain and having to deal with more BIOS bugs should be obvious.

The reboot EFI runtime service is needed because otherwise we have no way to tell firmware whether a warm or cold reboot is requested. The "0x472" protocol is used by legacy BIOS, but not by EFI based firmware. For EFI based firmware, the parameter to runtime service call is the only way to tell firmware whether a warm or cold reboot is requested.

That is not implemented by current EFI support patch yet, but we will add it in the next version.

Quoted 36 lines
Quoted 36 lines

---

 reboot.c |   11 ++++++++++-
 time.c   |   47 +++++++++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 17 deletions(-)

Index: linux-2.6.23-rc1/arch/x86_64/kernel/reboot.c
===================================================================
--- linux-2.6.23-rc1.orig/arch/x86_64/kernel/reboot.c 2007-07-23 04:41:00.000000000 +0800
+++ linux-2.6.23-rc1/arch/x86_64/kernel/reboot.c 2007-07-30 09:26:56.000000000 +0800

arch/x86_64/kernel/reboot.c +2 -1
@@ -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>
@@ -117,7 +118,7 @@
 	pci_iommu_shutdown();
 }
 
-void machine_emergency_restart(void)
+static inline void bios_emergency_restart(void)
 {
 	int i;
 
@@ -145,6 +146,14 @@
 	}      
 }
 
Quoted 14 lines

arch/x86_64/kernel/reboot.c line 156

Quoted 8 lines
arch/x86_64/kernel/reboot.c +8 -0
+void machine_emergency_restart(void)
+{
+	if (efi_enabled)
+		efi_emergency_restart();
+	else
+		bios_emergency_restart();
+}
+

A EFI is a bios so naming the current machine_emergency_restart bios_emergency_restart is a misnomer, especially since pounds the hardware not the firmware.
Second we already have a perfectly capable mechanism in the
reboot_type variable so you should just need to add one more type and handle this properly.

Yes. Reboot via EFI should be implemented as a new type of "reboot_type".

Best Regards,
Huang Ying