Changeset 149d14e5 in mainline

Timestamp:

2009-04-06T16:18:41Z (16 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

Files:

• arch/amd64/src/amd64.c (modified) (1 diff)
• arch/amd64/src/pm.c (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/ia32/src/pm.c (modified) (1 diff)
• genarch/include/drivers/i8042/i8042.h (modified) (1 diff)
• genarch/src/drivers/i8042/i8042.c (modified) (3 diffs)

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"
-        );
-}
-
 /** @}
  */

kernel/genarch/include/drivers/i8042/i8042.h

@@ -54 +54 @@
 
 extern indev_t *i8042_init(i8042_t *, inr_t);
+extern void i8042_cpu_reset(i8042_t *);
 
 #endif

kernel/genarch/src/drivers/i8042/i8042.c

@@ -51 +51 @@
 #define i8042_SET_COMMAND  0x60
 #define i8042_COMMAND      0x69
+#define i8042_CPU_RESET    0xfe
 
 #define i8042_BUFFER_FULL_MASK  0x01
@@ -98 +99 @@
         irq_register(&instance->irq);
         
-        /*
-         * Clear input buffer.
-         */
+        /* Clear input buffer */
         while (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)
                 (void) pio_read_8(&dev->data);
@@ -107 +106 @@
 }
 
+/* Reset CPU by pulsing pin 0 */
+void i8042_cpu_reset(i8042_t *dev)
+{
+        interrupts_disable();
+        
+        /* Clear input buffer */
+        while (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)
+                (void) pio_read_8(&dev->data);
+        
+        /* Reset CPU */
+        pio_write_8(&dev->status, i8042_CPU_RESET);
+}
+
 /** @}
  */