X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fsystem.c;h=898c3ccc9f6c86b52af3ea6b11455e533a872254;hb=refs%2Fheads%2Fcoreboot;hp=8236cf0f47afb6b0a6a6f81b93f95a401d77b3aa;hpb=eaa2e55cc8385b993b1adba7c8babfb290c08983;p=seabios.git diff --git a/src/system.c b/src/system.c index 8236cf0..898c3cc 100644 --- a/src/system.c +++ b/src/system.c @@ -5,7 +5,7 @@ // // This file may be distributed under the terms of the GNU LGPLv3 license. -#include "util.h" // irq_restore +#include "util.h" // memcpy_far #include "biosvar.h" // BIOS_CONFIG_TABLE #include "ioport.h" // inb #include "memmap.h" // E820_RAM @@ -58,7 +58,7 @@ handle_152403(struct bregs *regs) static void handle_1524XX(struct bregs *regs) { - set_code_fail(regs, RET_EUNSUPPORTED); + set_code_unimplemented(regs, RET_EUNSUPPORTED); } static void @@ -111,8 +111,8 @@ handle_1587(struct bregs *regs) SET_FARVAR(gdt_seg, gdt_far[1], GDT_DATA | GDT_LIMIT((6*sizeof(u64))-1) | GDT_BASE(loc)); // Initialize CS descriptor - SET_FARVAR(gdt_seg, gdt_far[4], GDT_CODE | GDT_LIMIT(0x0ffff) - | GDT_BASE(0xf0000)); + SET_FARVAR(gdt_seg, gdt_far[4], GDT_CODE | GDT_LIMIT(BUILD_BIOS_SIZE-1) + | GDT_BASE(BUILD_BIOS_ADDR)); // Initialize SS descriptor loc = (u32)MAKE_FLATPTR(GET_SEG(SS), 0); SET_FARVAR(gdt_seg, gdt_far[5], GDT_DATA | GDT_LIMIT(0x0ffff) @@ -121,44 +121,47 @@ handle_1587(struct bregs *regs) u16 count = regs->cx; asm volatile( // Load new descriptor tables - "lgdtw %%es:(1<<3)(%%si)\n" - "lidtw %%cs:pmode_IDT_info\n" + " lgdtw %%es:(1<<3)(%%si)\n" + " lidtw %%cs:pmode_IDT_info\n" // Enable protected mode - "movl %%cr0, %%eax\n" - "orl $" __stringify(CR0_PE) ", %%eax\n" - "movl %%eax, %%cr0\n" + " movl %%cr0, %%eax\n" + " orl $" __stringify(CR0_PE) ", %%eax\n" + " movl %%eax, %%cr0\n" // far jump to flush CPU queue after transition to protected mode - "ljmpw $(4<<3), $1f\n" - "1:\n" + " ljmpw $(4<<3), $1f\n" // GDT points to valid descriptor table, now load DS, ES - "movw $(2<<3), %%ax\n" // 2nd descriptor in table, TI=GDT, RPL=00 - "movw %%ax, %%ds\n" - "movw $(3<<3), %%ax\n" // 3rd descriptor in table, TI=GDT, RPL=00 - "movw %%ax, %%es\n" + "1:movw $(2<<3), %%ax\n" // 2nd descriptor in table, TI=GDT, RPL=00 + " movw %%ax, %%ds\n" + " movw $(3<<3), %%ax\n" // 3rd descriptor in table, TI=GDT, RPL=00 + " movw %%ax, %%es\n" // move CX words from DS:SI to ES:DI - "xorw %%si, %%si\n" - "xorw %%di, %%di\n" - "rep movsw\n" + " xorw %%si, %%si\n" + " xorw %%di, %%di\n" + " rep movsw\n" + + // Restore DS and ES segment limits to 0xffff + " movw $(5<<3), %%ax\n" // 5th descriptor in table (SS) + " movw %%ax, %%ds\n" + " movw %%ax, %%es\n" // Disable protected mode - "movl %%cr0, %%eax\n" - "andl $~" __stringify(CR0_PE) ", %%eax\n" - "movl %%eax, %%cr0\n" + " movl %%cr0, %%eax\n" + " andl $~" __stringify(CR0_PE) ", %%eax\n" + " movl %%eax, %%cr0\n" // far jump to flush CPU queue after transition to real mode - "ljmpw $" __stringify(SEG_BIOS) ", $2f\n" - "2:\n" + " ljmpw $" __stringify(SEG_BIOS) ", $2f\n" // restore IDT to normal real-mode defaults - "lidtw %%cs:rmode_IDT_info\n" + "2:lidtw %%cs:rmode_IDT_info\n" // Restore %ds (from %ss) - "movw %%ss, %%ax\n" - "movw %%ax, %%ds\n" + " movw %%ss, %%ax\n" + " movw %%ax, %%ds\n" : "+c"(count), "+S"(si) : : "eax", "di", "cc"); // XXX - also clobbers %es @@ -182,6 +185,47 @@ handle_1588(struct bregs *regs) set_success(regs); } +// Switch to protected mode +static void +handle_1589(struct bregs *regs) +{ + set_a20(1); + + set_pics(regs->bl, regs->bh); + + u64 *gdt_far = (void*)(regs->si + 0); + u16 gdt_seg = regs->es; + SET_FARVAR(gdt_seg, gdt_far[7], GDT_CODE | GDT_LIMIT(BUILD_BIOS_SIZE-1) + | GDT_BASE(BUILD_BIOS_ADDR)); + + regs->ds = 3<<3; // 3rd gdt descriptor is %ds + regs->es = 4<<3; // 4th gdt descriptor is %es + regs->code.seg = 6<<3; // 6th gdt descriptor is %cs + + set_code_success(regs); + + asm volatile( + // Load new descriptor tables + " lgdtw %%es:(1<<3)(%%si)\n" + " lidtw %%es:(2<<3)(%%si)\n" + + // Enable protected mode + " movl %%cr0, %%eax\n" + " orl $" __stringify(CR0_PE) ", %%eax\n" + " movl %%eax, %%cr0\n" + + // far jump to flush CPU queue after transition to protected mode + " ljmpw $(7<<3), $1f\n" + + // GDT points to valid descriptor table, now load SS + "1:movw $(5<<3), %%ax\n" + " movw %%ax, %%ds\n" + " movw %%ax, %%ss\n" + : + : "S"(gdt_far) + : "eax", "cc"); +} + // Device busy interrupt. Called by Int 16h when no key available static void handle_1590(struct bregs *regs) @@ -198,7 +242,7 @@ handle_1591(struct bregs *regs) static void handle_154f(struct bregs *regs) { - set_fail_silent(regs); + set_invalid_silent(regs); } static void @@ -247,8 +291,8 @@ handle_15e801(struct bregs *regs) } // Info on e820 map location and size. -struct e820entry e820_list[CONFIG_MAX_E820] VAR16_32; -int e820_count VAR16_32; +struct e820entry e820_list[CONFIG_MAX_E820] VAR16VISIBLE; +int e820_count VAR16VISIBLE; static void handle_15e820(struct bregs *regs) @@ -256,7 +300,7 @@ handle_15e820(struct bregs *regs) int count = GET_GLOBAL(e820_count); if (regs->edx != 0x534D4150 || regs->bx >= count || regs->ecx < sizeof(e820_list[0])) { - set_code_fail(regs, RET_EUNSUPPORTED); + set_code_invalid(regs, RET_EUNSUPPORTED); return; } @@ -275,7 +319,7 @@ handle_15e820(struct bregs *regs) static void handle_15e8XX(struct bregs *regs) { - set_code_fail(regs, RET_EUNSUPPORTED); + set_code_unimplemented(regs, RET_EUNSUPPORTED); } static void @@ -291,7 +335,7 @@ handle_15e8(struct bregs *regs) static void handle_15XX(struct bregs *regs) { - set_code_fail(regs, RET_EUNSUPPORTED); + set_code_unimplemented(regs, RET_EUNSUPPORTED); } // INT 15h System Services Entry Point @@ -309,6 +353,7 @@ handle_15(struct bregs *regs) case 0x86: handle_1586(regs); break; case 0x87: handle_1587(regs); break; case 0x88: handle_1588(regs); break; + case 0x89: handle_1589(regs); break; case 0x90: handle_1590(regs); break; case 0x91: handle_1591(regs); break; case 0xc0: handle_15c0(regs); break;