Reorganize boot code.

[seabios.git] / src / post.c

diff --git a/src/post.c b/src/post.c
index ec55ab2394d2b6425af87a4f34e65dde848110e6..5985a570bb37c2e909f56946772919793d567aa7 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -3,28 +3,25 @@
 // Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
 // Copyright (C) 2002  MandrakeSoft S.A.
 //
-// This file may be distributed under the terms of the GNU GPLv3 license.
+// This file may be distributed under the terms of the GNU LGPLv3 license.
 
 #include "ioport.h" // PORT_*
 #include "config.h" // CONFIG_*
 #include "cmos.h" // CMOS_*
 #include "util.h" // memset
 #include "biosvar.h" // struct bios_data_area_s
-#include "ata.h" // hard_drive_setup
 #include "disk.h" // floppy_drive_setup
 #include "memmap.h" // add_e820
 #include "pic.h" // pic_setup
 #include "pci.h" // create_pirtable
 #include "acpi.h" // acpi_bios_init
 #include "bregs.h" // struct bregs
-
-#define bda ((struct bios_data_area_s *)MAKE_FARPTR(SEG_BDA, 0))
+#include "boot.h" // IPL
 
 void
 __set_irq(int vector, void *loc)
 {
-    SET_BDA(ivecs[vector].seg, SEG_BIOS);
-    SET_BDA(ivecs[vector].offset, (u32)loc - BUILD_BIOS_ADDR);
+    SET_IVT(vector, SEG_BIOS, (u32)loc - BUILD_BIOS_ADDR);
 }
 
 #define set_irq(vector, func) do {              \
@@ -33,15 +30,14 @@ __set_irq(int vector, void *loc)
     } while (0)
 
 static void
-init_bda()
+init_ivt()
 {
-    dprintf(3, "init bda\n");
-    memset(bda, 0, sizeof(*bda));
+    dprintf(3, "init ivt\n");
 
-    // Initialize all vectors to a dummy handler.
+    // Initialize all vectors to the default handler.
     int i;
     for (i=0; i<256; i++)
-        set_irq(i, dummy_iret_handler);
+        set_irq(i, entry_iret_official);
 
     // Initialize all hw vectors to a default hw handler.
     for (i=0x08; i<=0x0f; i++)
@@ -61,34 +57,33 @@ init_bda()
     set_irq(0x18, entry_18);
     set_irq(0x19, entry_19_official);
     set_irq(0x1a, entry_1a);
-    set_irq(0x1c, entry_1c);
     set_irq(0x40, entry_40);
 
     // set vector 0x79 to zero
     // this is used by 'gardian angel' protection system
-    SET_BDA(ivecs[0x79].seg, 0);
-    SET_BDA(ivecs[0x79].offset, 0);
+    SET_IVT(0x79, 0, 0);
 
     __set_irq(0x1E, &diskette_param_table2);
 }
 
 static void
-init_ebda()
+init_bda()
 {
+    dprintf(3, "init bda\n");
+
+    struct bios_data_area_s *bda = MAKE_FLATPTR(SEG_BDA, 0);
+    memset(bda, 0, sizeof(*bda));
+
     int esize = DIV_ROUND_UP(sizeof(struct extended_bios_data_area_s), 1024);
     SET_BDA(mem_size_kb, 640 - esize);
-    u16 eseg = FARPTR_TO_SEG((640 - esize) * 1024);
+    u16 eseg = FLATPTR_TO_SEG((640 - esize) * 1024);
     SET_BDA(ebda_seg, eseg);
 
     struct extended_bios_data_area_s *ebda = get_ebda_ptr();
     memset(ebda, 0, sizeof(*ebda));
     ebda->size = esize;
-    SET_BDA(ivecs[0x41].seg, eseg);
-    SET_BDA(ivecs[0x41].offset
-            , offsetof(struct extended_bios_data_area_s, fdpt[0]));
-    SET_BDA(ivecs[0x46].seg, eseg);
-    SET_BDA(ivecs[0x46].offset
-            , offsetof(struct extended_bios_data_area_s, fdpt[1]));
+    SET_IVT(0x41, eseg, offsetof(struct extended_bios_data_area_s, fdpt[0]));
+    SET_IVT(0x46, eseg, offsetof(struct extended_bios_data_area_s, fdpt[1]));
 }
 
 static void
@@ -125,10 +120,16 @@ ram_probe(void)
     add_e820(0xa0000, 0x50000, E820_HOLE);
 
     // Mark known areas as reserved.
-    add_e820((u32)MAKE_FARPTR(GET_BDA(ebda_seg), 0), GET_EBDA(size) * 1024
+    u16 ebda_seg = get_ebda_seg();
+    add_e820((u32)MAKE_FLATPTR(ebda_seg, 0), GET_EBDA2(ebda_seg, size) * 1024
              , E820_RESERVED);
     add_e820(BUILD_BIOS_ADDR, BUILD_BIOS_SIZE, E820_RESERVED);
 
+    if (CONFIG_KVM)
+        // 4 pages before the bios, 3 pages for vmx tss pages, the
+        // other page for EPT real mode pagetable
+        add_e820(0xfffbc000, 4*4096, E820_RESERVED);
+
     dprintf(1, "Ram Size=0x%08x\n", RamSize);
 }
 
@@ -148,50 +149,12 @@ init_bios_tables(void)
     acpi_bios_init();
 }
 
-static void
-init_boot_vectors()
-{
-    if (! CONFIG_BOOT)
-        return;
-    dprintf(3, "init boot device ordering\n");
-
-    // Floppy drive
-    struct extended_bios_data_area_s *ebda = get_ebda_ptr();
-    struct ipl_entry_s *ip = &ebda->ipl.table[0];
-    ip->type = IPL_TYPE_FLOPPY;
-    ip++;
-
-    // First HDD
-    ip->type = IPL_TYPE_HARDDISK;
-    ip++;
-
-    // CDROM
-    if (CONFIG_CDROM_BOOT) {
-        ip->type = IPL_TYPE_CDROM;
-        ip++;
-    }
-
-    ebda->ipl.count = ip - ebda->ipl.table;
-    ebda->ipl.sequence = 0xffff;
-    if (CONFIG_COREBOOT) {
-        // XXX - hardcode defaults for coreboot.
-        ebda->ipl.bootorder = 0x00000231;
-        ebda->ipl.checkfloppysig = 1;
-    } else {
-        // On emulators, get boot order from nvram.
-        ebda->ipl.bootorder = (inb_cmos(CMOS_BIOS_BOOTFLAG2)
-                               | ((inb_cmos(CMOS_BIOS_BOOTFLAG1) & 0xf0) << 4));
-        if (!(inb_cmos(CMOS_BIOS_BOOTFLAG1) & 1))
-            ebda->ipl.checkfloppysig = 1;
-    }
-}
-
 // Main setup code.
 static void
 post()
 {
+    init_ivt();
     init_bda();
-    init_ebda();
 
     pic_setup();
     timer_setup();
@@ -201,6 +164,7 @@ post()
 
     memmap_setup();
     ram_probe();
+    mtrr_setup();
 
     pnp_setup();
     vga_setup();
@@ -216,11 +180,11 @@ post()
     init_bios_tables();
     memmap_finalize();
 
+    boot_setup();
+
     floppy_drive_setup();
     hard_drive_setup();
 
-    init_boot_vectors();
-
     optionrom_setup();
 }
 
@@ -243,8 +207,7 @@ _start()
     interactive_bootmenu();
 
     // Setup bios checksum.
-    extern char bios_checksum;
-    bios_checksum = -checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE - 1);
+    BiosChecksum = -checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE - 1);
 
     // Prep for boot process.
     make_bios_readonly();