Changeset 237 for trunk/hal/x86_64/core/hal_init.c

Timestamp:

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

Author:

max@…

Message:

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

File:

• trunk/hal/x86_64/core/hal_init.c (modified) (3 diffs)

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");