Changeset 149d14e5 in mainline for kernel/arch

Timestamp:

2009-04-06T16:18:41Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

13a638d

Parents:

415d272

Message:

ia32, amd64: do not reboot via a triple fault (which is nasty), but use the i8042 controller to trigger CPU reset

Location:

kernel/arch

Files:

• amd64/src/amd64.c (modified) (1 diff)
• amd64/src/pm.c (modified) (1 diff)
• ia32/src/ia32.c (modified) (1 diff)
• ia32/src/pm.c (modified) (1 diff)

kernel/arch/amd64/src/amd64.c

@@ -282 +282 @@
 }
 
+void arch_reboot(void)
+{
+#ifdef CONFIG_PC_KBD
+        i8042_cpu_reset((i8042_t *) I8042_BASE);
+#endif
+}
+
 /** @}
  */

kernel/arch/amd64/src/pm.c

@@ -231 +231 @@
 }
 
-/* Reboot the machine by initiating
- * a triple fault
- */
-void arch_reboot(void)
-{
-        preemption_disable();
-        ipl_t ipl = interrupts_disable();
-        
-        memsetb(idt, sizeof(idt), 0);
-        idtr_load(&idtr);
-        
-        interrupts_restore(ipl);
-        asm volatile (
-                "int $0x03\n"
-                "cli\n"
-                "hlt\n"
-        );
-}
-
 /** @}
  */

kernel/arch/ia32/src/ia32.c

@@ -238 +238 @@
 }
 
+void arch_reboot(void)
+{
+#ifdef CONFIG_PC_KBD
+        i8042_cpu_reset((i8042_t *) I8042_BASE);
+#endif
+}
+
 /** @}
  */

kernel/arch/ia32/src/pm.c

@@ -233 +233 @@
 }
 
-/* Reboot the machine by initiating
- * a triple fault
- */
-void arch_reboot(void)
-{
-        preemption_disable();
-        ipl_t ipl = interrupts_disable();
-        
-        memsetb(idt, sizeof(idt), 0);
-        
-        ptr_16_32_t idtr;
-        idtr.limit = sizeof(idt);
-        idtr.base = (uintptr_t) idt;
-        idtr_load(&idtr);
-        
-        interrupts_restore(ipl);
-        asm volatile (
-                "int $0x03\n"
-                "cli\n"
-                "hlt\n"
-        );
-}
-
 /** @}
  */