Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

idt: Move flush_irq() logic to stage 3

This commit is contained in:
mintsuki 2021-09-21 17:44:01 +02:00
parent c2e279db66
commit 21b926fb70
3 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stage23/sys/cpu.h
View File

@ -160,7 +160,7 @@ inline uint64_t rdtsc(void) {
return ((uint64_t)edx << 32) | eax;
}
static inline void delay(uint64_t cycles) {
inline void delay(uint64_t cycles) {
uint64_t next_stop = rdtsc() + cycles;
while (rdtsc() < next_stop);

55
stage23/sys/idt.c Normal file
View File

@ -0,0 +1,55 @@
#include <stdint.h>
#include <stddef.h>
#include <sys/idt.h>
#include <sys/cpu.h>
#include <sys/pic.h>
#include <sys/lapic.h>
#include <mm/pmm.h>
static struct idt_entry *dummy_idt = NULL;
__attribute__((interrupt))
static void dummy_isr(void *p) {
(void)p;
lapic_eoi();
}
void init_flush_irqs(void) {
dummy_idt = ext_mem_alloc(256 * sizeof(struct idt_entry));
for (size_t i = 0; i < 256; i++) {
dummy_idt[i].offset_lo = (uint16_t)(uintptr_t)dummy_isr;
dummy_idt[i].type_attr = 0x8e;
#if defined (__i386__)
dummy_idt[i].selector = 0x18;
dummy_idt[i].offset_hi = (uint16_t)((uintptr_t)dummy_isr >> 16);
#elif defined (__x86_64__)
dummy_idt[i].selector = 0x28;
dummy_idt[i].offset_mid = (uint16_t)((uintptr_t)dummy_isr >> 16);
dummy_idt[i].offset_hi = (uint32_t)((uintptr_t)dummy_isr >> 32);
#endif
}
}
void flush_irqs(void) {
struct idtr old_idt;
asm volatile ("sidt %0" : "=m"(old_idt) :: "memory");
struct idtr new_idt = {
256 * sizeof(struct idt_entry) - 1,
(uintptr_t)dummy_idt
};
asm volatile ("lidt %0" :: "m"(new_idt) : "memory");
// Flush the legacy PIC so we know the remaining ints come from the LAPIC
pic_flush();
asm volatile ("sti" ::: "memory");
// Delay a while to make sure we catch ALL pending IRQs
delay(10000000);
asm volatile ("cli" ::: "memory");
asm volatile ("lidt %0" :: "m"(old_idt) : "memory");
}

52
stage23/sys/idt.s2.c
View File

@ -1,11 +1,7 @@
#include <stddef.h>
#include <stdint.h>
#include <sys/idt.h>
#include <sys/cpu.h>
#include <sys/pic.h>
#include <sys/lapic.h>
#include <lib/blib.h>
#include <mm/pmm.h>
#if bios == 1
@ -37,51 +33,3 @@ void init_idt(void) {
}
#endif
static struct idt_entry *dummy_idt = NULL;
__attribute__((interrupt))
static void dummy_isr(void *p) {
(void)p;
lapic_eoi();
}
void init_flush_irqs(void) {
dummy_idt = ext_mem_alloc(256 * sizeof(struct idt_entry));
for (size_t i = 0; i < 256; i++) {
dummy_idt[i].offset_lo = (uint16_t)(uintptr_t)dummy_isr;
dummy_idt[i].type_attr = 0x8e;
#if defined (__i386__)
dummy_idt[i].selector = 0x18;
dummy_idt[i].offset_hi = (uint16_t)((uintptr_t)dummy_isr >> 16);
#elif defined (__x86_64__)
dummy_idt[i].selector = 0x28;
dummy_idt[i].offset_mid = (uint16_t)((uintptr_t)dummy_isr >> 16);
dummy_idt[i].offset_hi = (uint32_t)((uintptr_t)dummy_isr >> 32);
#endif
}
}
void flush_irqs(void) {
struct idtr old_idt;
asm volatile ("sidt %0" : "=m"(old_idt) :: "memory");
struct idtr new_idt = {
256 * sizeof(struct idt_entry) - 1,
(uintptr_t)dummy_idt
};
asm volatile ("lidt %0" :: "m"(new_idt) : "memory");
// Flush the legacy PIC so we know the remaining ints come from the LAPIC
pic_flush();
asm volatile ("sti" ::: "memory");
// Delay a while to make sure we catch ALL pending IRQs
delay(10000000);
asm volatile ("cli" ::: "memory");
asm volatile ("lidt %0" :: "m"(old_idt) : "memory");
}