refactor: add a simple ramfs for rootfs. Twifs should have more specific job in future.

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

diff --git a/lunaix-os/kernel/k_init.c b/lunaix-os/kernel/k_init.c
index 447bff7feed8040ef49e087913faed4f3018c1a5..1682859fe766e7ba78ede2f04376578a6eaa7bac 100644 (file)
--- a/lunaix-os/kernel/k_init.c
+++ b/lunaix-os/kernel/k_init.c
@@ -1,18 +1,15 @@
 #include <lunaix/common.h>
 #include <lunaix/tty/tty.h>
 
 #include <lunaix/common.h>
 #include <lunaix/tty/tty.h>
 

-#include <lunaix/clock.h>
-#include <lunaix/mm/kalloc.h>
+#include <lunaix/device.h>
+#include <lunaix/lxconsole.h>

 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/spike.h>
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/spike.h>

-#include <lunaix/syslog.h>
-#include <lunaix/timer.h>
-
-#include <hal/rtc.h>
+#include <lunaix/types.h>

 
 #include <arch/x86/boot/multiboot.h>
 #include <arch/x86/idt.h>
 
 #include <arch/x86/boot/multiboot.h>
 #include <arch/x86/idt.h>


@@ -21,9 +18,6 @@
 #include <klibc/stdio.h>
 #include <klibc/string.h>
 
 #include <klibc/stdio.h>
 #include <klibc/string.h>
 

-#include <stddef.h>
-#include <stdint.h>
-

 extern uint8_t __kernel_start;
 extern uint8_t __kernel_end;
 extern uint8_t __init_hhk_end;
 extern uint8_t __kernel_start;
 extern uint8_t __kernel_end;
 extern uint8_t __init_hhk_end;


@@ -37,8 +31,6 @@ x86_page_table* __kernel_ptd;
 
 struct proc_info tmp;
 
 
 struct proc_info tmp;
 

-LOG_MODULE("BOOT");
-

 extern void
 __proc0(); /* proc0.c */
 
 extern void
 __proc0(); /* proc0.c */
 


@@ -56,9 +48,13 @@ _kernel_pre_init()
 
     pmm_init(MEM_1MB + (_k_init_mb_info->mem_upper << 10));
     vmm_init();
 
     pmm_init(MEM_1MB + (_k_init_mb_info->mem_upper << 10));
     vmm_init();

-    rtc_init();

 
 

-    tty_init((void*)VGA_BUFFER_PADDR);
+    unsigned int map_size =
+      _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
+
+    setup_memory((multiboot_memory_map_t*)_k_init_mb_info->mmap_addr, map_size);
+
+    tty_init((void*)VGA_BUFFER_VADDR);

     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
 
     __kernel_ptd = cpu_rcr3();
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
 
     __kernel_ptd = cpu_rcr3();


@@ -71,18 +67,23 @@ _kernel_pre_init()
 void
 _kernel_init()
 {
 void
 _kernel_init()
 {

-    kprintf("[MM] Mem: %d KiB, Extended Mem: %d KiB\n",
-            _k_init_mb_info->mem_lower,
-            _k_init_mb_info->mem_upper);
+    int errno = 0;
+    cake_init();
+    valloc_init();

 
 

-    unsigned int map_size =
-      _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
+    vfs_init();
+    fsm_init();

 
 

-    setup_memory((multiboot_memory_map_t*)_k_init_mb_info->mmap_addr, map_size);
+    device_init();
+
+    if ((errno = vfs_mount_root("ramfs", NULL))) {
+        panickf("Fail to mount root. (errno=%d)", errno);
+    }

 
 

-    kprintf(KINFO "[MM] Allocated %d pages for stack start at %p\n",
-            KSTACK_SIZE >> PG_SIZE_BITS,
-            KSTACK_START);
+    // FIXME replace with more specific fs for device.
+    vfs_mount("/dev", "twifs", NULL);
+
+    lxconsole_init();

 
     sched_init();
 
 
     sched_init();
 


@@ -162,7 +163,7 @@ spawn_proc0()
     commit_process(proc0);
 
     // 由于时钟中断与APIC未就绪，我们需要手动进行第一次调度。这里也会同时隐式地恢复我们的eflags.IF位
     commit_process(proc0);
 
     // 由于时钟中断与APIC未就绪，我们需要手动进行第一次调度。这里也会同时隐式地恢复我们的eflags.IF位

-    proc0->state = PROC_RUNNING;
+    proc0->state = PS_RUNNING;

     asm volatile("pushl %0\n"
                  "jmp switch_to\n" ::"r"(proc0));
 
     asm volatile("pushl %0\n"
                  "jmp switch_to\n" ::"r"(proc0));
 


@@ -181,31 +182,23 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size)
     // First pass, to mark the physical pages
     for (unsigned int i = 0; i < map_size; i++) {
         multiboot_memory_map_t mmap = map[i];
     // First pass, to mark the physical pages
     for (unsigned int i = 0; i < map_size; i++) {
         multiboot_memory_map_t mmap = map[i];

-        kprintf("[MM] Base: 0x%x, len: %u KiB, type: %u\n",
-                map[i].addr_low,
-                map[i].len_low >> 10,
-                map[i].type);

         if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE) {
             // 整数向上取整除法
             uintptr_t pg = map[i].addr_low + 0x0fffU;
             pmm_mark_chunk_free(pg >> PG_SIZE_BITS,
                                 map[i].len_low >> PG_SIZE_BITS);
         if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE) {
             // 整数向上取整除法
             uintptr_t pg = map[i].addr_low + 0x0fffU;
             pmm_mark_chunk_free(pg >> PG_SIZE_BITS,
                                 map[i].len_low >> PG_SIZE_BITS);

-            kprintf(KINFO "[MM] Freed %u pages start from 0x%x\n",
-                    map[i].len_low >> PG_SIZE_BITS,
-                    pg & ~0x0fffU);

         }
     }
 
     // 将内核占据的页，包括前1MB，hhk_init 设为已占用
     size_t pg_count = V2P(&__kernel_end) >> PG_SIZE_BITS;
     pmm_mark_chunk_occupied(KERNEL_PID, 0, pg_count, 0);
         }
     }
 
     // 将内核占据的页，包括前1MB，hhk_init 设为已占用
     size_t pg_count = V2P(&__kernel_end) >> PG_SIZE_BITS;
     pmm_mark_chunk_occupied(KERNEL_PID, 0, pg_count, 0);

-    kprintf(KINFO "[MM] Allocated %d pages for kernel.\n", pg_count);

 
     size_t vga_buf_pgs = VGA_BUFFER_SIZE >> PG_SIZE_BITS;
 
 
     size_t vga_buf_pgs = VGA_BUFFER_SIZE >> PG_SIZE_BITS;
 

-    // 首先，标记VGA部分为已占用
+    // 首先，标记VGA部分为已占用，并且锁定

     pmm_mark_chunk_occupied(
     pmm_mark_chunk_occupied(

-      KERNEL_PID, VGA_BUFFER_PADDR >> PG_SIZE_BITS, vga_buf_pgs, 0);
+      KERNEL_PID, VGA_BUFFER_PADDR >> PG_SIZE_BITS, vga_buf_pgs, PP_FGLOCKED);

 
     // 重映射VGA文本缓冲区（以后会变成显存，i.e., framebuffer）
     for (size_t i = 0; i < vga_buf_pgs; i++) {
 
     // 重映射VGA文本缓冲区（以后会变成显存，i.e., framebuffer）
     for (size_t i = 0; i < vga_buf_pgs; i++) {


@@ -216,16 +209,7 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size)
                         VMAP_NULL);
     }
 
                         VMAP_NULL);
     }
 

-    assert_msg(!((uintptr_t)&__usrtext_start & 0xfff) &&
-                 !((uintptr_t)&__usrtext_end & 0xfff),
-               "Bad usrtext alignment");
-

     for (uintptr_t i = &__usrtext_start; i < &__usrtext_end; i += PG_SIZE) {
         vmm_set_mapping(PD_REFERENCED, i, V2P(i), PG_PREM_UR, VMAP_NULL);
     }
     for (uintptr_t i = &__usrtext_start; i < &__usrtext_end; i += PG_SIZE) {
         vmm_set_mapping(PD_REFERENCED, i, V2P(i), PG_PREM_UR, VMAP_NULL);
     }

-
-    // 更新VGA缓冲区位置至虚拟地址
-    tty_set_buffer((void*)VGA_BUFFER_VADDR);
-
-    kprintf(KINFO "[MM] Mapped VGA to %p.\n", VGA_BUFFER_VADDR);

 }
 }