Changeset 237 for trunk/hal

Timestamp:

Jul 19, 2017, 2:57:03 PM (7 years ago)

Author:

max@…

Message:

Attach the secondary CPUs, and for now route the keyboard irq to
cpu1 - test only, but nice.

Location:

trunk/hal/x86_64/core

Files:

• hal_apic.c (modified) (2 diffs)
• hal_apic.h (modified) (1 diff)
• hal_init.c (modified) (3 diffs)
• hal_interrupt.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_apic.c

@@ -425 +425 @@
  * Only the Spurious and APIC Timer interrupts are enabled.
  */
-static void hal_lapic_init()
+void cpu_lapic_init()
 {
         if ((rdmsr(MSR_APICBASE) & APICBASE_PHYSADDR) != lapic_pa) {
@@ -524 +524 @@
         hal_pic_init();
 
-        /* Enable the LAPIC */
-        hal_lapic_init();
-
         /* Enable the IOAPIC */
         hal_ioapic_init();

trunk/hal/x86_64/core/hal_apic.h

@@ -33 +33 @@
 
 uint32_t hal_lapic_gid();
+void cpu_lapic_init();
 void hal_apic_init();
 

trunk/hal/x86_64/core/hal_init.c

@@ -50 +50 @@
 void cpu_tls_init(size_t lid);
 void cpu_identify();
-void cpu_attach();
+void cpu_attach(size_t lid);
 
 size_t mytest __in_kdata = 0;
@@ -303 +303 @@
 void init_x86_64_cpuN()
 {
+        lid_t lid = hal_lapic_gid();
+
+        cpu_attach(lid);
+        x86_printf("[cpu%z] cpu_attach called\n", (uint64_t)lid);
+
+        cpu_tls_init(lid);
+        x86_printf("[cpu%z] cput_tls_init called\n", (uint64_t)lid);
+
+        cpu_lapic_init();
+        x86_printf("[cpu%z] cpu_lapic_init called\n", (uint64_t)lid);
+
         cpuN_booted = 1;
-        x86_printf("-> cpu%z is alive!\n", hal_lapic_gid());
+
+        if (lid == 1) {
+                hal_ioapic_disable_irq(IRQ_KEYBOARD);
+                hal_ioapic_bind_irq(IRQ_KEYBOARD, IOAPIC_KEYBOARD_VECTOR, 1);
+                hal_ioapic_enable_irq(IRQ_KEYBOARD);
+        }
+
+        sti();
         while (1);
 }
@@ -360 +378 @@
 
         hal_apic_init();
+        cpu_lapic_init();
         x86_printf("[+] hal_apic_init called\n");
 

trunk/hal/x86_64/core/hal_interrupt.c

@@ -38 +38 @@
 void hal_timer_intr(hal_cpu_context_t *tf)
 {
-        x86_printf("-> got timer: rip=%Z (th=%Z)\n", tf->tf_rip,
-            hal_get_current_thread());
+        if (hal_get_gid() != 0) {
+                /* print the message only for cpu0 */
+                return;
+        }
+        x86_printf("-> got timer: cpu%z rip=%Z (th=%Z)\n", hal_get_gid(),
+            tf->tf_rip, hal_get_current_thread());
         return;
 }
@@ -132 +136 @@
         val = in8(PS2_DATA);
 
-        x86_printf("-> got keyboard: rip=%Z key=%c ", tf->tf_rip, scancode_US[val]);
+        x86_printf("-> got keyboard: cpu%z rip=%Z key=%c ", hal_get_gid(),
+            tf->tf_rip, scancode_US[val]);
 
         if (val & 0x80)