Changeset 165

Timestamp:

Jul 10, 2017, 9:13:04 AM (7 years ago)

Author:

max@…

Message:

put the per-cpu structures into one structure

File:

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

trunk/hal/x86_64/core/hal_init.c

@@ -313 +313 @@
 /* -------------------------------------------------------------------------- */
 
+/* x86-specific per-cluster structures */
 uint8_t gdtstore[PAGE_SIZE] __in_kdata;
 uint8_t idtstore[PAGE_SIZE] __in_kdata;
-struct tss cpu_tss[CONFIG_MAX_LOCAL_CORES] __in_kdata;
-uint8_t cpu_intr_stack[CONFIG_MAX_LOCAL_CORES][STKSIZE] __in_kdata;
-uint8_t cpu_dbfl_stack[CONFIG_MAX_LOCAL_CORES][STKSIZE] __in_kdata;
-uint8_t cpu_nmfl_stack[CONFIG_MAX_LOCAL_CORES][STKSIZE] __in_kdata;
+
+/* x86-specific per-cpu structures */
+typedef struct {
+        struct tss tss;
+        uint8_t intr_stack[STKSIZE];
+        uint8_t dbfl_stack[STKSIZE];
+        uint8_t nmfl_stack[STKSIZE];
+} percpu_archdata_t;
+percpu_archdata_t cpudata[CONFIG_MAX_LOCAL_CORES] __in_kdata;
 
 static void
@@ -437 +443 @@
 /* -------------------------------------------------------------------------- */
 
-/*
- * The gdt bitmap must be per-cluster.
- */
 int tss_alloc(struct tss *tss, size_t lid)
 {
         int slot;
 
-        /* Once we have proper SMP support, we will change that */
         slot = GDT_CPUTSS_SEL + lid;
 
@@ -455 +457 @@
 void cpu_create_tss(size_t lid)
 {
-        struct tss *tss = &cpu_tss[lid];
+        percpu_archdata_t *data = &cpudata[lid];
+        struct tss *tss = &data->tss;
         int sel;
 
@@ -462 +465 @@
 
         /* tss->tss_rsp0 */
-        tss->tss_ist[0] = (uint64_t)cpu_intr_stack[lid] + STKSIZE;
-        tss->tss_ist[1] = (uint64_t)cpu_dbfl_stack[lid] + STKSIZE;
-        tss->tss_ist[2] = (uint64_t)cpu_nmfl_stack[lid] + STKSIZE;
+        tss->tss_ist[0] = (uint64_t)data->intr_stack[lid] + STKSIZE;
+        tss->tss_ist[1] = (uint64_t)data->dbfl_stack[lid] + STKSIZE;
+        tss->tss_ist[2] = (uint64_t)data->nmfl_stack[lid] + STKSIZE;
         tss->tss_iobase = IOMAP_INVALOFF << 16;
         sel = tss_alloc(tss, lid);