refactor: use a more decent physical memory map

[lunaix-os.git] / lunaix-os / kernel / proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 61a6dfc16164e44fe1e1ab318f558613f64c4020..3c7b2254484a871e184530cf7e1853fd94a7b129 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,53 +1,66 @@
-#include <arch/x86/boot/multiboot.h>
-#include <lunaix/common.h>
-#include <lunaix/lunistd.h>
+#include <lunaix/block.h>
+#include <lunaix/boot_generic.h>
+#include <lunaix/exec.h>
+#include <lunaix/foptions.h>
+#include <lunaix/fs.h>
+#include <lunaix/fs/probe_boot.h>
+#include <lunaix/fs/twifs.h>

 #include <lunaix/lxconsole.h>
 #include <lunaix/lxconsole.h>

+#include <lunaix/mm/cake.h>

 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/pmm.h>

+#include <lunaix/mm/valloc.h>

 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>

-#include <lunaix/proc.h>
+#include <lunaix/peripheral/serial.h>

 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>

-#include <stddef.h>
+#include <lunaix/types.h>

 
 

-#include <hal/acpi/acpi.h>
-#include <hal/apic.h>
-#include <hal/ioapic.h>
+#include <sdbg/protocol.h>

 
 

-LOG_MODULE("PROC0")
+#include <hal/pci.h>

 
 

-extern void
-_lxinit_main(); /* lxinit.c */
+#include <klibc/string.h>

 
 

-void
-init_platform();
+LOG_MODULE("PROC0")

 
 void
 
 void

-lock_reserved_memory();
+init_platform();

 
 

-void
-unlock_reserved_memory();
+int
+mount_bootmedium()
+{
+    struct v_dnode* dnode;
+    int errno = 0;
+    struct device* dev = probe_boot_medium();
+    if (!dev) {
+        kprintf(KERROR "fail to acquire device. (%d)", errno);
+        return 0;
+    }

 
 

-void
-__do_reserved_memory(int unlock);
+    if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {
+        kprintf(KERROR "fail to mount boot medium. (%d)", errno);
+        return 0;
+    }

 
 

-//#define DEMO_SIGNAL
+    return 1;
+}

 
 

-void __USER__
-__proc0_usr()
+int
+exec_initd()

 {
 {

-    if (!fork()) {
-#ifdef DEMO_SIGNAL
-        asm("jmp _signal_demo_main");
-#else
-        asm("jmp _lxinit_main");
-#endif
-    }
+    int errno = 0;

 
 

-    while (1) {
-        yield();
+    if ((errno = exec_kexecve("/mnt/lunaix-os/usr/bin/init", NULL, NULL))) {
+        goto fail;

     }
     }

+
+    fail("should not reach");
+
+fail:
+    kprintf(KERROR "fail to load initd. (%d)", errno);
+    return 0;

 }
 
 /**
 }
 
 /**


@@ -61,112 +74,47 @@ __proc0_usr()
 void
 __proc0()
 {
 void
 __proc0()
 {

+    /*
+     * We must defer boot code/data cleaning to here, after we successfully
+     * escape that area
+     */
+    boot_cleanup();
+

     init_platform();
 
     init_proc_user_space(__current);
 
     init_platform();
 
     init_proc_user_space(__current);
 

-    asm volatile("movw %0, %%ax\n"
-                 "movw %%ax, %%es\n"
-                 "movw %%ax, %%ds\n"
-                 "movw %%ax, %%fs\n"
-                 "movw %%ax, %%gs\n"
-                 "pushl %0\n"
-                 "pushl %1\n"
-                 "pushl %2\n"
-                 "pushl %3\n"
-                 "retf" ::"i"(UDATA_SEG),
-                 "i"(USTACK_TOP & ~0xf),
-                 "i"(UCODE_SEG),
-                 "r"(__proc0_usr)
-                 : "eax", "memory");
+    if (!mount_bootmedium() || !exec_initd()) {
+        while (1) {
+            asm("hlt");
+        }
+        // should not reach
+    }

 }
 
 }
 

-extern uint8_t __kernel_start;            /* link/linker.ld */
-extern uint8_t __kernel_end;              /* link/linker.ld */
-extern uint8_t __init_hhk_end;            /* link/linker.ld */
-extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
-

 void
 init_platform()
 {
 void
 init_platform()
 {

-    assert_msg(kalloc_init(), "Fail to initialize heap");
-
-    // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
-    lock_reserved_memory();
-
-    acpi_init(_k_init_mb_info);
-    uintptr_t ioapic_addr = acpi_get_context()->madt.ioapic->ioapic_addr;
-    pmm_mark_page_occupied(
-      KERNEL_PID, FLOOR(__APIC_BASE_PADDR, PG_SIZE_BITS), 0);
-    pmm_mark_page_occupied(KERNEL_PID, FLOOR(ioapic_addr, PG_SIZE_BITS), 0);
-
-    vmm_set_mapping(
-      PD_REFERENCED, MMIO_APIC, __APIC_BASE_PADDR, PG_PREM_RW, VMAP_NULL);
-    vmm_set_mapping(
-      PD_REFERENCED, MMIO_IOAPIC, ioapic_addr, PG_PREM_RW, VMAP_NULL);
-
-    apic_init();
-    ioapic_init();
-    timer_init(SYS_TIMER_FREQUENCY_HZ);
-    clock_init();
-    ps2_kbd_init();
+    kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
+            __VERSION__,
+            __TIME__);

 
 

-    syscall_install();
+    twifs_register_plugins();

 
 

-    console_start_flushing();
+    /*
+     * all device registering and loading must defered to here!
+     * due to limited stack size and partial scheduling context
+     */
+    pci_load_devices();

 
 

-    unlock_reserved_memory();
+    // debugger
+    serial_init();
+    sdbg_init();

 
 

-    for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
-        vmm_del_mapping(PD_REFERENCED, (void*)i);
-        pmm_free_page(KERNEL_PID, (void*)i);
-    }
-}
-
-void
-lock_reserved_memory()
-{
-    __do_reserved_memory(0);
-}
-
-void
-unlock_reserved_memory()
-{
-    __do_reserved_memory(1);
-}
+    // FIXME ps2 kbd is a device, must not be here
+    ps2_kbd_init();

 
 

-void
-__do_reserved_memory(int unlock)
-{
-    multiboot_memory_map_t* mmaps = _k_init_mb_info->mmap_addr;
-    size_t map_size =
-      _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
-    // v_mapping mapping;
-    for (unsigned int i = 0; i < map_size; i++) {
-        multiboot_memory_map_t mmap = mmaps[i];
-        uint8_t* pa = PG_ALIGN(mmap.addr_low);
-        if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE || pa <= MEM_4MB) {
-            // Don't fuck up our kernel code or any free area!
-            continue;
-        }
-        size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
-        size_t j = 0;
-        if (!unlock) {
-            for (; j < pg_num; j++) {
-                uintptr_t _pa = pa + (j << PG_SIZE_BITS);
-                if (_pa >= KERNEL_MM_BASE) {
-                    // Don't fuck up our kernel space!
-                    break;
-                }
-                vmm_set_mapping(PD_REFERENCED, _pa, _pa, PG_PREM_R, VMAP_NULL);
-            }
-            // Save the progress for later unmapping.
-            mmaps[i].len_low = j * PG_SIZE;
-        } else {
-            for (; j < pg_num; j++) {
-                uintptr_t _pa = pa + (j << PG_SIZE_BITS);
-                vmm_del_mapping(PD_REFERENCED, _pa);
-            }
-        }
-    }
+    // console
+    console_start_flushing();
+    console_flush();

 }
\ No newline at end of file
 }
\ No newline at end of file