X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fpost.c;h=bfa6562151335ac9e24031d01a5db7338c3feeb4;hb=b1b7c2a1c3b940b787fdb5da67fc37003e9d7b0e;hp=595164466d4bc357bcc32e548557a65db5d97e1d;hpb=4d7c37e12ef4ceb6903dd76ee700beb99fbf5f8e;p=seabios.git

diff --git a/src/post.c b/src/post.c
index 5951644..bfa6562 100644
--- 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,10 +30,9 @@ __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.
     int i;
@@ -66,15 +62,19 @@ init_bda()
 
     // 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_FARPTR(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);
@@ -83,12 +83,8 @@ init_ebda()
     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
@@ -107,14 +103,14 @@ ram_probe(void)
             rs = (((inb_cmos(CMOS_MEM_EXTMEM_LOW) << 10)
                    | (inb_cmos(CMOS_MEM_EXTMEM_HIGH) << 18))
                   + 1 * 1024 * 1024);
-        SET_EBDA(ram_size, rs);
+        RamSize = rs;
         add_e820(0, rs, E820_RAM);
 
         // Check for memory over 4Gig
         u64 high = ((inb_cmos(CMOS_MEM_HIGHMEM_LOW) << 16)
                     | (inb_cmos(CMOS_MEM_HIGHMEM_MID) << 24)
                     | ((u64)inb_cmos(CMOS_MEM_HIGHMEM_HIGH) << 32));
-        SET_EBDA(ram_size_over4G, high);
+        RamSizeOver4G = high;
         add_e820(0x100000000ull, high, E820_RAM);
 
         /* reserve 256KB BIOS area at the end of 4 GB */
@@ -125,11 +121,17 @@ 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_FARPTR(ebda_seg, 0), GET_EBDA2(ebda_seg, size) * 1024
              , E820_RESERVED);
     add_e820(BUILD_BIOS_ADDR, BUILD_BIOS_SIZE, E820_RESERVED);
 
-    dprintf(1, "ram_size=0x%08x\n", GET_EBDA(ram_size));
+    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);
 }
 
 static void
@@ -156,8 +158,7 @@ init_boot_vectors()
     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];
+    struct ipl_entry_s *ip = &IPL.table[0];
     ip->type = IPL_TYPE_FLOPPY;
     ip++;
 
@@ -171,18 +172,18 @@ init_boot_vectors()
         ip++;
     }
 
-    ebda->ipl.count = ip - ebda->ipl.table;
-    ebda->ipl.sequence = 0xffff;
+    IPL.count = ip - IPL.table;
+    SET_EBDA(boot_sequence, 0xffff);
     if (CONFIG_COREBOOT) {
         // XXX - hardcode defaults for coreboot.
-        ebda->ipl.bootorder = 0x00000231;
-        ebda->ipl.checkfloppysig = 1;
+        IPL.bootorder = 0x00000231;
+        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));
+        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;
+            IPL.checkfloppysig = 1;
     }
 }
 
@@ -190,8 +191,8 @@ init_boot_vectors()
 static void
 post()
 {
+    init_ivt();
     init_bda();
-    init_ebda();
 
     pic_setup();
     timer_setup();
@@ -201,6 +202,7 @@ post()
 
     memmap_setup();
     ram_probe();
+    mtrr_setup();
 
     pnp_setup();
     vga_setup();