Enhance experimental option rom "threading" - enable preemption.

[seabios.git] / src / post.c

diff --git a/src/post.c b/src/post.c
index 32d22c88e89df459beea28a1b1504aa1a987a0c9..42a27bcbd0471ba27d32c75f4c6a8dd318fadee6 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -11,6 +11,7 @@
 #include "util.h" // memset
 #include "biosvar.h" // struct bios_data_area_s
 #include "disk.h" // floppy_drive_setup
+#include "ata.h" // ata_setup
 #include "memmap.h" // add_e820
 #include "pic.h" // pic_setup
 #include "pci.h" // create_pirtable
@@ -18,11 +19,15 @@
 #include "bregs.h" // struct bregs
 #include "mptable.h" // mptable_init
 #include "boot.h" // IPL
+#include "usb.h" // usb_setup
+#include "smbios.h" // smbios_init
+#include "paravirt.h" // qemu_cfg_port_probe
+#include "ps2port.h" // ps2port_setup
 
 void
 __set_irq(int vector, void *loc)
 {
-    SET_IVT(vector, SEG_BIOS, (u32)loc - BUILD_BIOS_ADDR);
+    SET_IVT(vector, SEGOFF(SEG_BIOS, (u32)loc - BUILD_BIOS_ADDR));
 }
 
 #define set_irq(vector, func) do {              \
@@ -63,7 +68,7 @@ init_ivt()
 
     // set vector 0x79 to zero
     // this is used by 'gardian angel' protection system
-    SET_IVT(0x79, 0, 0);
+    SET_IVT(0x79, SEGOFF(0, 0));
 
     __set_irq(0x1E, &diskette_param_table2);
 }
@@ -77,7 +82,7 @@ init_bda()
     memset(bda, 0, sizeof(*bda));
 
     int esize = EBDA_SIZE_START;
-    SET_BDA(mem_size_kb, 640 - esize);
+    SET_BDA(mem_size_kb, BUILD_LOWRAM_END/1024 - esize);
     u16 eseg = EBDA_SEGMENT_START;
     SET_BDA(ebda_seg, eseg);
 
@@ -118,7 +123,7 @@ ram_probe(void)
     }
 
     // Don't declare any memory between 0xa0000 and 0x100000
-    add_e820(0xa0000, 0x50000, E820_HOLE);
+    add_e820(BUILD_LOWRAM_END, BUILD_BIOS_ADDR-BUILD_LOWRAM_END, E820_HOLE);
 
     // Mark known areas as reserved.
     u16 ebda_seg = get_ebda_seg();
@@ -126,7 +131,7 @@ ram_probe(void)
              , E820_RESERVED);
     add_e820(BUILD_BIOS_ADDR, BUILD_BIOS_SIZE, E820_RESERVED);
 
-    if (CONFIG_KVM)
+    if (kvm_para_available())
         // 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);
@@ -155,44 +160,69 @@ init_bios_tables(void)
 static void
 post()
 {
+    // Detect and init ram.
     init_ivt();
     init_bda();
+    memmap_setup();
+    ram_probe();
+    malloc_setup();
+    thread_setup();
 
+    // Init base pc hardware.
     pic_setup();
     timer_setup();
     mathcp_setup();
 
+    // Initialize smp
+    qemu_cfg_port_probe();
     smp_probe_setup();
-    memmap_setup();
-    ram_probe();
     mtrr_setup();
     smp_probe();
-    malloc_setup();
-    pmm_setup();
 
-    pnp_setup();
-    vga_setup();
+    // Initialize pci
+    pci_setup();
+    smm_init();
 
+    // Setup interfaces that option roms may need
+    pmm_setup();
+    pnp_setup();
     kbd_setup();
-    lpt_setup();
-    serial_setup();
     mouse_setup();
-
-    pci_bios_setup();
-    smm_init();
-
     init_bios_tables();
 
-    boot_setup();
+    // Run vga option rom (if running synchronously)
+    if (!CONFIG_THREADS || !CONFIG_THREAD_OPTIONROMS)
+        vga_setup();
 
-    floppy_drive_setup();
-    hard_drive_setup();
+    // Initialize hardware devices
+    usb_setup();
+    ps2port_setup();
+    lpt_setup();
+    serial_setup();
 
-    optionrom_setup();
+    boot_setup();
+    drive_setup();
+    cdemu_setup();
+    floppy_setup();
+    ata_setup();
+    ramdisk_setup();
+
+    // Run option roms
+    if (CONFIG_THREADS && CONFIG_THREAD_OPTIONROMS) {
+        // Run option roms while hw init still in progress.
+        vga_setup();
+        optionrom_setup();
+        wait_threads();
+    } else {
+        // Wait for hw init to finish and run non-vga option roms.
+        wait_threads();
+        optionrom_setup();
+    }
 
-    // Run BCVs
+    // Run BCVs and show optional boot menu
     boot_prep();
 
+    // Finalize data structures before boot
     pmm_finalize();
     malloc_finalize();
     memmap_finalize();
@@ -223,5 +253,6 @@ _start()
     dprintf(3, "Jump to int19\n");
     struct bregs br;
     memset(&br, 0, sizeof(br));
+    br.flags = F_IF;
     call16_int(0x19, &br);
 }