Enhance experimental option rom "threading" - enable preemption.

[seabios.git] / src / post.c

diff --git a/src/post.c b/src/post.c
index 45a319df2f9e074b4f51c449ff6c1061dc040a3b..42a27bcbd0471ba27d32c75f4c6a8dd318fadee6 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -19,6 +19,10 @@
 #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)
@@ -127,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);
@@ -156,47 +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();
 
+    // Initialize pci
     pci_setup();
     smm_init();
 
+    // Setup interfaces that option roms may need
+    pmm_setup();
     pnp_setup();
-    vga_setup();
-
     kbd_setup();
-    lpt_setup();
-    serial_setup();
     mouse_setup();
-
     init_bios_tables();
 
-    boot_setup();
+    // Run vga option rom (if running synchronously)
+    if (!CONFIG_THREADS || !CONFIG_THREAD_OPTIONROMS)
+        vga_setup();
 
+    // Initialize hardware devices
+    usb_setup();
+    ps2port_setup();
+    lpt_setup();
+    serial_setup();
+
+    boot_setup();
     drive_setup();
     cdemu_setup();
     floppy_setup();
     ata_setup();
     ramdisk_setup();
 
-    optionrom_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();