Changeset 164 for trunk/hal/x86_64/core

Timestamp:

Jul 7, 2017, 3:22:59 PM (7 years ago)

Author:

max@…

Message:

we're gonna use an array of TSSs

Location:

trunk/hal/x86_64/core

Files:

• hal_init.c (modified) (2 diffs)
• hal_segmentation.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_init.c

@@ -440 +440 @@
  * The gdt bitmap must be per-cluster.
  */
-int tss_alloc(struct tss *tss)
+int tss_alloc(struct tss *tss, size_t lid)
 {
         int slot;
 
         /* Once we have proper SMP support, we will change that */
-        slot = GDT_CPU0TSS_SEL;
+        slot = GDT_CPUTSS_SEL + lid;
 
         gdt_set_sysseg(GDT_ADDR_SYS(gdtstore, slot), tss,
@@ -466 +466 @@
         tss->tss_ist[2] = (uint64_t)cpu_nmfl_stack[lid] + STKSIZE;
         tss->tss_iobase = IOMAP_INVALOFF << 16;
-        sel = tss_alloc(tss);
+        sel = tss_alloc(tss, lid);
 
         /* Load it */

trunk/hal/x86_64/core/hal_segmentation.h

@@ -31 +31 @@
 #define NGDT_MEM        6       /* aligned */
 
-#define GDT_CPU0TSS_SEL 0       /* cpu0's tss */
-#define NGDT_DYN        (256 - (NGDT_MEM / 2) * 16)
+#define GDT_CPUTSS_SEL  0       /* cpu TSS base index */
+#define NGDT_DYN        CONFIG_MAX_LOCAL_CORES  /* one TSS per core */
 
 /*