Changeset 240 for trunk

Timestamp:

Jul 20, 2017, 9:55:05 AM (7 years ago)

Author:

max@…

Message:

Make the secondary CPUs jump into kernel_init().

Location:

trunk/hal/x86_64/core

Files:

• hal_acpi.c (modified) (1 diff)
• hal_init.c (modified) (8 diffs)
• hal_irqmask.c (modified) (3 diffs)
• hal_segmentation.h (modified) (2 diffs)

trunk/hal/x86_64/core/hal_acpi.c

@@ -116 +116 @@
         subheader_t *sub;
         size_t nioapic = 0;
-        size_t ncpu = 0;
+        extern size_t ncpu;
 
         extern paddr_t lapic_pa;

trunk/hal/x86_64/core/hal_init.c

@@ -58 +58 @@
 uint8_t mb_mmap[PAGE_SIZE] __in_kdata;
 
+size_t ncpu __in_kdata = 0;
+static boot_info_t btinfo __in_kdata;
+
 /* x86-specific per-cluster structures */
 uint8_t gdtstore[PAGE_SIZE] __in_kdata;
@@ -160 +163 @@
 static void init_bootinfo_core(boot_core_t *core)
 {
-        memset(core, 0, sizeof(boot_core_t));
-
-        core->gid = hal_lapic_gid();
-        core->lid = 0;
-        core->cxy = 0;
+        size_t i;
+
+        // XXX: not necessarily contiguous
+        for (i = 0; i < ncpu; i++) {
+                memset(&core[i], 0, sizeof(boot_core_t));
+
+                core[i].gid = i;
+                core[i].lid = i;
+                core[i].cxy = 0;
+        }
 }
 
@@ -240 +248 @@
 
         info->cxy = 0;
-        info->cores_nr = 1;
-        init_bootinfo_core(&info->core[0]);
+        info->cores_nr = ncpu;
+        init_bootinfo_core((boot_core_t *)&info->core);
 
         info->rsvd_nr = init_bootinfo_rsvd((boot_rsvd_t *)&info->rsvd);
@@ -303 +311 @@
 void init_x86_64_cpuN()
 {
-        lid_t lid = hal_lapic_gid();
+        lid_t lid;
+
+        cli();
+
+        lid = hal_lapic_gid();
 
         cpu_attach(lid);
@@ -322 +334 @@
         }
 
-        sti();
+        kernel_init(&btinfo);
+
+        reg_t dummy;
+        hal_enable_irq(&dummy);
+
         while (1);
 }
@@ -342 +358 @@
 void init_x86_64(paddr_t firstpa)
 {
-        boot_info_t btinfo;
+        cli();
 
         /* Initialize the serial port */
@@ -396 +412 @@
         start_secondary_cpus();
 
+        kernel_init(&btinfo);
+
+        x86_printf("[+] kernel_init called\n");
+
         reg_t dummy;
         hal_enable_irq(&dummy);
-
-while (1);
-
-        kernel_init(&btinfo);
-
-        x86_printf("[+] kernel_init called\n");
 /*
         void *ptr;
@@ -623 +637 @@
         cputls->tls_gid = hal_lapic_gid();
         cputls->tls_lid = lid;
+        cputls->tls_intr = INTRS_DISABLED;
 
         wrmsr(MSR_FSBASE, 0);

trunk/hal/x86_64/core/hal_irqmask.c

@@ -22 +22 @@
 #include <hal_types.h>
 #include <hal_internal.h>
-
-#define INTRS_ENABLED   0xFFEFAAAA
-#define INTRS_DISABLED  0xD0CCCCC0
-
-static uint32_t intrs_state __in_kdata = INTRS_DISABLED;
+#include <hal_segmentation.h>
 
 inline void hal_disable_irq(uint32_t *old)
 {
-        *old = intrs_state;
-        intrs_state = INTRS_DISABLED;
+        tls_t *tls = curcpu();
+
+        *old = tls->tls_intr;
+        tls->tls_intr = INTRS_DISABLED;
+
         cli();
 }
@@ -37 +36 @@
 inline void hal_enable_irq(uint32_t *old)
 {
-        *old = intrs_state;
-        intrs_state = INTRS_ENABLED;
+        tls_t *tls = curcpu();
+
+        *old = tls->tls_intr;
+        tls->tls_intr = INTRS_ENABLED;
+
         sti();
 }
@@ -44 +46 @@
 inline void hal_restore_irq(uint32_t old)
 {
-        intrs_state = old;
+        tls_t *tls = curcpu();
 
-        if (intrs_state == INTRS_ENABLED)
+        tls->tls_intr = old;
+
+        if (old == INTRS_ENABLED)
                 sti();
-        else if(intrs_state == INTRS_DISABLED)
+        else if(old == INTRS_DISABLED)
                 cli();
         else

trunk/hal/x86_64/core/hal_segmentation.h

@@ -154 +154 @@
         uint32_t tls_lid;
         void *tls_thr;
+        reg_t tls_intr;
 } __packed;
 typedef struct tls tls_t;
@@ -160 +161 @@
 void lidt(struct region_descriptor *);
 void ltr(uint16_t);
+tls_t *curcpu();
+
+#define INTRS_ENABLED   0xFFEFAAAA
+#define INTRS_DISABLED  0xD0CCCCC0
 
 #endif /* !x86_ASM */