Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / x86_64 / kernel / reboot.c

diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 92fc7e7..57117b8 100644 (file)
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -6,6 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/pm.h>
 #include <asm/io.h>
 #include <asm/kdebug.h>
 #include <asm/delay.h>
@@ -21,22 +22,19 @@
 void (*pm_power_off)(void);
 
 static long no_idt[3];
+static enum { 
+       BOOT_TRIPLE = 't',
+       BOOT_KBD = 'k'
+} reboot_type = BOOT_KBD;
 static int reboot_mode = 0;
-enum reboot_types reboot_type = BOOT_KBD;
-EXPORT_SYMBOL(reboot_type);
-int reboot_override;
-EXPORT_SYMBOL(reboot_override);
+int reboot_force;
 
-void (*machine_reset)(void);
-EXPORT_SYMBOL(machine_reset);
-
-/* reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old] | [a]cpi
-   bios          Use the CPU reboot vector for warm reset
+/* reboot=t[riple] | k[bd] [, [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 ACPI reset mechanism defined in the FADT
+   force  Avoid anything that could hang.
  */ 
 static int __init reboot_setup(char *str)
 {
@@ -53,9 +51,10 @@ static int __init reboot_setup(char *str)
                case 't':
                case 'b':
                case 'k':
-               case 'a':
                        reboot_type = *str;
-                       reboot_override = 1;
+                       break;
+               case 'f':
+                       reboot_force = 1;
                        break;
                }
                if((str = strchr(str,',')) != NULL)
@@ -68,34 +67,6 @@ static int __init reboot_setup(char *str)
 
 __setup("reboot=", reboot_setup);
 
-/* overwrites random kernel memory. Should not be kernel .text */
-#define WARMBOOT_TRAMP 0x1000UL
-
-static void reboot_warm(void)
-{
-       extern unsigned char warm_reboot[], warm_reboot_end[];
-       printk("warm reboot\n");
-
-       local_irq_disable(); 
-               
-       /* restore identity mapping */
-       init_level4_pgt[0] = __pml4(__pa(level3_ident_pgt) | 7); 
-       __flush_tlb_all(); 
-
-       /* Move the trampoline to low memory */
-       memcpy(__va(WARMBOOT_TRAMP), warm_reboot, warm_reboot_end - warm_reboot); 
-
-       /* Start it in compatibility mode. */
-       asm volatile( "   pushq $0\n"           /* ss */
-                    "   pushq $0x2000\n"       /* rsp */
-                    "   pushfq\n"              /* eflags */
-                    "   pushq %[cs]\n"
-                    "   pushq %[target]\n"
-                    "   iretq" :: 
-                     [cs] "i" (__KERNEL_COMPAT32_CS), 
-                     [target] "b" (WARMBOOT_TRAMP));
-}
-
 static inline void kb_wait(void)
 {
        int i;
@@ -107,6 +78,7 @@ static inline void kb_wait(void)
 
 void machine_shutdown(void)
 {
+       unsigned long flags;
        /* Stop the cpus and apics */
 #ifdef CONFIG_SMP
        int reboot_cpu_id;
@@ -128,7 +100,7 @@ void machine_shutdown(void)
        smp_send_stop();
 #endif
 
-       local_irq_disable();
+       local_irq_save(flags);
 
 #ifndef CONFIG_SMP
        disable_local_APIC();
@@ -136,33 +108,21 @@ void machine_shutdown(void)
 
        disable_IO_APIC();
 
-       local_irq_enable();
+       local_irq_restore(flags);
 }
 
-void machine_restart(char * __unused)
+void machine_emergency_restart(void)
 {
        int i;
 
-       machine_shutdown();
-       
        /* Tell the BIOS if we want cold or warm reboot */
        *((unsigned short *)__va(0x472)) = reboot_mode;
        
        for (;;) {
                /* Could also try the reset bit in the Hammer NB */
                switch (reboot_type) { 
-               case BOOT_ACPI:
-                       if (machine_reset)
-                               (*machine_reset)();
-                       else
-                               reboot_type = BOOT_KBD;
-                       break;
-               
-               case BOOT_BIOS:
-                       reboot_warm();
-
                case BOOT_KBD:
-               for (i=0; i<100; i++) {
+               for (i=0; i<10; i++) {
                        kb_wait();
                        udelay(50);
                        outb(0xfe,0x64);         /* pulse reset low */
@@ -170,8 +130,8 @@ void machine_restart(char * __unused)
                }
 
                case BOOT_TRIPLE: 
-               __asm__ __volatile__("lidt (%0)": :"r" (&no_idt));
-               __asm__ __volatile__("int3");
+                       __asm__ __volatile__("lidt (%0)": :"r" (&no_idt));
+                       __asm__ __volatile__("int3");
 
                        reboot_type = BOOT_KBD;
                        break;
@@ -179,18 +139,27 @@ void machine_restart(char * __unused)
        }      
 }
 
-EXPORT_SYMBOL(machine_restart);
+void machine_restart(char * __unused)
+{
+       printk("machine restart\n");
+
+       if (!reboot_force) {
+               machine_shutdown();
+       }
+       machine_emergency_restart();
+}
 
 void machine_halt(void)
 {
 }
 
-EXPORT_SYMBOL(machine_halt);
-
 void machine_power_off(void)
 {
-       if (pm_power_off)
+       if (pm_power_off) {
+               if (!reboot_force) {
+                       machine_shutdown();
+               }
                pm_power_off();
+       }
 }
 
-EXPORT_SYMBOL(machine_power_off);