SMP and timer interrupts
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#include <amd64/init.h>
|
||||
#include <amd64/intr.h>
|
||||
#include <amd64/tss.h>
|
||||
#include <amd64/smp.h>
|
||||
#include <aux/compiler.h>
|
||||
#include <libk/std.h>
|
||||
#include <libk/string.h>
|
||||
@@ -14,33 +14,6 @@
|
||||
#define TSS 0x80
|
||||
#define TSS_PRESENT 0x89
|
||||
|
||||
#define KSTACK_SIZE (8 * 1024)
|
||||
|
||||
struct gdt_entry {
|
||||
uint16_t limitlow;
|
||||
uint16_t baselow;
|
||||
uint8_t basemid;
|
||||
uint8_t access;
|
||||
uint8_t gran;
|
||||
uint8_t basehigh;
|
||||
} PACKED;
|
||||
|
||||
struct gdt_ptr {
|
||||
uint16_t limit;
|
||||
uint64_t base;
|
||||
} PACKED;
|
||||
|
||||
struct gdt_extended {
|
||||
struct gdt_entry old[5];
|
||||
struct gdt_entry tsslow;
|
||||
struct gdt_entry tsshigh;
|
||||
} PACKED;
|
||||
|
||||
ALIGNED (16) static volatile uint8_t kernel_stack[KSTACK_SIZE];
|
||||
ALIGNED (16) static volatile uint8_t except_stack[KSTACK_SIZE];
|
||||
ALIGNED (16) static volatile uint8_t irq_stack[KSTACK_SIZE];
|
||||
ALIGNED (16) static volatile struct gdt_extended gdt;
|
||||
|
||||
static void amd64_gdt_set (volatile struct gdt_entry* ent, uint32_t base, uint32_t limit,
|
||||
uint8_t acc, uint8_t gran) {
|
||||
ent->baselow = (base & 0xFFFF);
|
||||
@@ -51,39 +24,39 @@ static void amd64_gdt_set (volatile struct gdt_entry* ent, uint32_t base, uint32
|
||||
ent->access = acc;
|
||||
}
|
||||
|
||||
static void amd64_gdt_init (void) {
|
||||
volatile struct tss* tss = amd64_get_tss ();
|
||||
static void amd64_gdt_init (struct cpu* cpu) {
|
||||
volatile struct tss* tss = &cpu->tss;
|
||||
volatile struct gdt_extended* gdt = &cpu->gdt;
|
||||
|
||||
memset ((void*)&gdt, 0, sizeof (gdt));
|
||||
memset ((void*)kernel_stack, 0, sizeof (kernel_stack));
|
||||
memset ((void*)gdt, 0, sizeof (*gdt));
|
||||
memset ((void*)tss, 0, sizeof (*tss));
|
||||
|
||||
tss->iopb_off = sizeof (*tss);
|
||||
tss->rsp0 = (uint64_t)((uintptr_t)kernel_stack + sizeof (kernel_stack));
|
||||
tss->ist[0] = (uint64_t)((uintptr_t)except_stack + sizeof (except_stack));
|
||||
tss->ist[1] = (uint64_t)((uintptr_t)irq_stack + sizeof (irq_stack));
|
||||
tss->rsp0 = (uint64_t)((uintptr_t)cpu->kernel_stack + sizeof (cpu->kernel_stack));
|
||||
tss->ist[0] = (uint64_t)((uintptr_t)cpu->except_stack + sizeof (cpu->except_stack));
|
||||
tss->ist[1] = (uint64_t)((uintptr_t)cpu->irq_stack + sizeof (cpu->irq_stack));
|
||||
|
||||
uint64_t tssbase = (uint64_t)&tss;
|
||||
uint64_t tssbase = (uint64_t)tss;
|
||||
uint64_t tsslimit = sizeof (*tss) - 1;
|
||||
|
||||
amd64_gdt_set (&gdt.old[0], 0, 0, 0, 0);
|
||||
amd64_gdt_set (&gdt.old[1], 0, 0xFFFFF, 0x9A, 0xA0);
|
||||
amd64_gdt_set (&gdt.old[2], 0, 0xFFFFF, 0x92, 0xC0);
|
||||
amd64_gdt_set (&gdt.old[3], 0, 0xFFFFF, 0xFA, 0xA0);
|
||||
amd64_gdt_set (&gdt.old[4], 0, 0xFFFFF, 0xF2, 0xC0);
|
||||
amd64_gdt_set (&gdt.tsslow, (tssbase & 0xFFFFFFFF), tsslimit, TSS_PRESENT | TSS, 0);
|
||||
amd64_gdt_set (&gdt->old[0], 0, 0, 0, 0);
|
||||
amd64_gdt_set (&gdt->old[1], 0, 0xFFFFF, 0x9A, 0xA0);
|
||||
amd64_gdt_set (&gdt->old[2], 0, 0xFFFFF, 0x92, 0xC0);
|
||||
amd64_gdt_set (&gdt->old[3], 0, 0xFFFFF, 0xFA, 0xA0);
|
||||
amd64_gdt_set (&gdt->old[4], 0, 0xFFFFF, 0xF2, 0xC0);
|
||||
amd64_gdt_set (&gdt->tsslow, (tssbase & 0xFFFFFFFF), tsslimit, TSS_PRESENT | TSS, 0);
|
||||
|
||||
uint32_t tssbasehigh = (tssbase >> 32);
|
||||
gdt.tsshigh.limitlow = (tssbasehigh & 0xFFFF);
|
||||
gdt.tsshigh.baselow = (tssbasehigh >> 16) & 0xFFFF;
|
||||
gdt.tsshigh.basemid = 0;
|
||||
gdt.tsshigh.basehigh = 0;
|
||||
gdt.tsshigh.access = 0;
|
||||
gdt.tsshigh.gran = 0;
|
||||
gdt->tsshigh.limitlow = (tssbasehigh & 0xFFFF);
|
||||
gdt->tsshigh.baselow = (tssbasehigh >> 16) & 0xFFFF;
|
||||
gdt->tsshigh.basemid = 0;
|
||||
gdt->tsshigh.basehigh = 0;
|
||||
gdt->tsshigh.access = 0;
|
||||
gdt->tsshigh.gran = 0;
|
||||
|
||||
struct gdt_ptr gdtr;
|
||||
gdtr.limit = sizeof (gdt) - 1;
|
||||
gdtr.base = (uint64_t)&gdt;
|
||||
gdtr.limit = sizeof (*gdt) - 1;
|
||||
gdtr.base = (uint64_t)gdt;
|
||||
__asm__ volatile ("lgdt %0" ::"m"(gdtr) : "memory");
|
||||
|
||||
__asm__ volatile ("pushq %[kcode]\n"
|
||||
@@ -102,7 +75,10 @@ static void amd64_gdt_init (void) {
|
||||
__asm__ volatile ("ltr %0" ::"r"((uint16_t)GDT_TSS));
|
||||
}
|
||||
|
||||
void amd64_init (void) {
|
||||
amd64_gdt_init ();
|
||||
amd64_intr_init ();
|
||||
void amd64_init (struct cpu* cpu, bool load_idt) {
|
||||
amd64_gdt_init (cpu);
|
||||
if (load_idt)
|
||||
amd64_load_idt ();
|
||||
else
|
||||
amd64_intr_init ();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user