X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/874b3b5a74d815aa91f325e5573052a3c8ce1d39..f05a333a0f27f401ff32cfd2e74364ee4ecc893a:/lunaix-os/kernel/proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 663eff2..dcd6bf4 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -2,7 +2,9 @@
 #include <lunaix/common.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>
+#include <lunaix/mm/cake.h>
 #include <lunaix/mm/pmm.h>
+#include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/proc.h>
@@ -12,8 +14,10 @@
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>
+#include <hal/ahci/ahci.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
+#include <hal/pci.h>
 
 LOG_MODULE("PROC0")
 
@@ -32,6 +36,7 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
+//#define USE_DEMO
 #define DEMO_SIGNAL
 
 extern void
@@ -52,14 +57,16 @@ __proc0_usr()
     }
 
     if (!(p = fork())) {
-#ifdef DEMO_SIGNAL
+#ifndef USE_DEMO
+        _exit(0);
+#elif defined DEMO_SIGNAL
         _signal_demo_main();
 #else
         _lxinit_main();
 #endif
     }
 
-    // waitpid(p, 0, 0);
+    waitpid(p, 0, 0);
 
     while (1) {
         yield();
@@ -105,31 +112,30 @@ extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 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);
+    cake_init();
 
-    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);
+    assert_msg(kalloc_init(), "Fail to initialize heap");
+    valloc_init();
 
+    acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();
+    pci_init();
+    ahci_init();
+    ahci_list_device();
+
+    cake_stats();
 
     syscall_install();
 
     console_start_flushing();
+    console_flush();
 
     unlock_reserved_memory();
 
@@ -175,6 +181,8 @@ __do_reserved_memory(int unlock)
                     break;
                 }
                 vmm_set_mapping(PD_REFERENCED, _pa, _pa, PG_PREM_R, VMAP_NULL);
+                pmm_mark_page_occupied(
+                  KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);
             }
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
@@ -182,6 +190,9 @@ __do_reserved_memory(int unlock)
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(PD_REFERENCED, _pa);
+                if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
+                    pmm_mark_page_free(_pa >> PG_SIZE_BITS);
+                }
             }
         }
     }