diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-09-24 15:17:34 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-09-24 15:17:52 +0200 |
| commit | ab631cbf316b04a29c35e71161975db83559ffb0 (patch) | |
| tree | 4f97b81ce7232df4cd5c9a8ebb6bc5096dbfeaec | |
| parent | cb1a760864262ad81b85ee8685e493df62894165 (diff) | |
boothdr: Also set up %gs for percpu access
So we can use it very early.
| -rw-r--r-- | i386/i386/i386asm.sym | 2 | ||||
| -rw-r--r-- | i386/i386at/boothdr.S | 69 |
2 files changed, 61 insertions, 10 deletions
diff --git a/i386/i386/i386asm.sym b/i386/i386/i386asm.sym index d96b8be8..1c4654db 100644 --- a/i386/i386/i386asm.sym +++ b/i386/i386/i386asm.sym @@ -55,6 +55,8 @@ offset ApicLocalUnit lu apic_id APIC_ID offset percpu pc cpu_id PERCPU_CPU_ID +size percpu pcs + offset pcb pcb iss offset thread th pcb diff --git a/i386/i386at/boothdr.S b/i386/i386at/boothdr.S index d1d1fa51..327d5c8e 100644 --- a/i386/i386at/boothdr.S +++ b/i386/i386at/boothdr.S @@ -1,6 +1,7 @@ #include <mach/machine/asm.h> #include <i386/apic.h> +#include <i386/seg.h> #include <i386/i386asm.h> /* @@ -39,19 +40,28 @@ boot_hdr: #endif /* __ELF__ */ boot_entry: + movl $percpu_array - KERNELBASE, %eax + movw %ax, boot_percpu_low - KERNELBASE + shr $16, %eax + movb %al, boot_percpu_med - KERNELBASE + shr $8, %ax + movb %al, boot_percpu_high - KERNELBASE + /* use segmentation to offset ourself. */ lgdt boot_gdt_descr - KERNELBASE - ljmp $8,$0f + ljmp $0x8,$0f 0: - movw $0,%ax + movw $0x0,%ax movw %ax,%ds movw %ax,%es movw %ax,%fs movw %ax,%gs - movw $16,%ax + movw $0x10,%ax movw %ax,%ds movw %ax,%es movw %ax,%ss + movw $0x68,%ax + movw %ax,%gs /* Switch to our own interrupt stack. */ movl $solid_intstack+INTSTACK_SIZE-4, %esp @@ -105,24 +115,63 @@ iplt_done: .align 16 .word 0 boot_gdt_descr: - .word 3*8+7 + .word 13*8+7 .long boot_gdt - KERNELBASE .align 16 boot_gdt: /* 0 */ .quad 0 - /* boot CS = 8 */ + + /* boot CS = 0x08 */ .word 0xffff .word (-KERNELBASE) & 0xffff .byte ((-KERNELBASE) >> 16) & 0xff - .byte 0x9a - .byte 0xcf + .byte ACC_PL_K | ACC_CODE_R | ACC_P + .byte ((SZ_32 | SZ_G) << 4) | 0xf .byte ((-KERNELBASE) >> 24) & 0xff - /* boot DS = 8 */ + + /* boot DS = 0x10 */ .word 0xffff .word (-KERNELBASE) & 0xffff .byte ((-KERNELBASE) >> 16) & 0xff - .byte 0x92 - .byte 0xcf + .byte ACC_PL_K | ACC_DATA_W | ACC_P + .byte ((SZ_32 | SZ_G) << 4) | 0xf .byte ((-KERNELBASE) >> 24) & 0xff + /* LDT = 0x18 */ + .quad 0 + + /* TSS = 0x20 */ + .quad 0 + + /* USER_LDT = 0x28 */ + .quad 0 + + /* USER_TSS = 0x30 */ + .quad 0 + + /* LINEAR = 0x38 */ + .quad 0 + + /* FPREGS = 0x40 */ + .quad 0 + + /* USER_GDT = 0x48 and 0x50 */ + .quad 0 + + /* USER_TSS64 = 0x58 */ + .quad 0 + + /* USER_TSS64 = 0x60 */ + .quad 0 + + /* boot GS = 0x68 */ + .word PCS_SIZE +boot_percpu_low: + .word 0 +boot_percpu_med: + .byte 0 + .byte ACC_PL_K | ACC_DATA_W | ACC_P + .byte ((SZ_32 | SZ_G) << 4) | 0xf +boot_percpu_high: + .byte 0 |