| 39,6 → 39,7 |
|---|
| #include <config.h> |
| |
| #include <proc/thread.h> |
| #include <genarch/multiboot/multiboot.h> |
| #include <genarch/drivers/legacy/ia32/io.h> |
| #include <genarch/drivers/ega/ega.h> |
| #include <arch/drivers/vesa.h> |
| 45,6 → 46,7 |
|---|
| #include <genarch/kbd/i8042.h> |
| #include <arch/drivers/i8254.h> |
| #include <arch/drivers/i8259.h> |
| #include <arch/boot/boot.h> |
| |
| #ifdef CONFIG_SMP |
| #include <arch/smp/apic.h> |
| 65,7 → 67,6 |
|---|
| #include <ddi/device.h> |
| #include <sysinfo/sysinfo.h> |
| |
| |
| /** Disable I/O on non-privileged levels |
| * |
| * Clean IOPL(12,13) and NT(14) flags in EFLAGS register |
| 72,15 → 73,13 |
|---|
| */ |
| static void clean_IOPL_NT_flags(void) |
| { |
| asm ( |
| asm volatile ( |
| "pushfq\n" |
| "pop %%rax\n" |
| "and $~(0x7000), %%rax\n" |
| "pushq %%rax\n" |
| "popfq\n" |
| : |
| : |
| : "%rax" |
| ::: "%rax" |
| ); |
| } |
| |
| 90,16 → 89,31 |
|---|
| */ |
| static void clean_AM_flag(void) |
| { |
| asm ( |
| asm volatile ( |
| "mov %%cr0, %%rax\n" |
| "and $~(0x40000), %%rax\n" |
| "mov %%rax, %%cr0\n" |
| : |
| : |
| : "%rax" |
| ::: "%rax" |
| ); |
| } |
| |
| /** Perform amd64-specific initialization before main_bsp() is called. |
| * |
| * @param signature Should contain the multiboot signature. |
| * @param mi Pointer to the multiboot information structure. |
| */ |
| void arch_pre_main(uint32_t signature, const multiboot_info_t *mi) |
| { |
| /* Parse multiboot information obtained from the bootloader. */ |
| multiboot_info_parse(signature, mi); |
| |
| #ifdef CONFIG_SMP |
| /* Copy AP bootstrap routines below 1 MB. */ |
| memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET, |
| (size_t) &_hardcoded_unmapped_size); |
| #endif |
| } |
| |
| void arch_pre_mm_init(void) |
| { |
| /* Enable no-execute pages */ |
| 185,6 → 199,10 |
|---|
| sysinfo_set_item_val("kbd", NULL, true); |
| sysinfo_set_item_val("kbd.devno", NULL, devno); |
| sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD); |
| sysinfo_set_item_val("kbd.address.physical", NULL, |
| (uintptr_t) I8042_BASE); |
| sysinfo_set_item_val("kbd.address.kernel", NULL, |
| (uintptr_t) I8042_BASE); |
| } |
| |
| void calibrate_delay_loop(void) |