Boot framework rework (#45)

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

diff --git a/lunaix-os/kernel/boot_helper.c b/lunaix-os/kernel/boot_helper.c
index 7f324e486aee5ae9565eb5a3fe935313c268984d..ebc60d75cd88da21fe81d8dadafd1b5903a23468 100644 (file)
--- a/lunaix-os/kernel/boot_helper.c
+++ b/lunaix-os/kernel/boot_helper.c
@@ -4,10 +4,9 @@
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 #include <lunaix/kcmd.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 #include <lunaix/kcmd.h>

+#include <lunaix/sections.h>

 #include <sys/mm/mm_defs.h>
 
 #include <sys/mm/mm_defs.h>
 

-extern unsigned char __kexec_end[], __kexec_start[];
-

 /**
  * @brief Reserve memory for kernel bootstrapping initialization
  *
 /**
  * @brief Reserve memory for kernel bootstrapping initialization
  *


@@ -17,16 +16,11 @@ void
 boot_begin(struct boot_handoff* bhctx)
 {
     bhctx->prepare(bhctx);
 boot_begin(struct boot_handoff* bhctx)
 {
     bhctx->prepare(bhctx);

-    
-    // Identity-map the first 3GiB address spaces
-    pte_t* ptep  = mkl0tep(mkptep_va(VMS_SELF, 0));
-    pte_t pte    = mkpte_prot(KERNEL_DATA);
-    size_t count = page_count(KERNEL_RESIDENT, L0T_SIZE);
-
-    vmm_set_ptes_contig(ptep, pte_mkhuge(pte), L0T_SIZE, count);

 
 

+    boot_begin_arch_reserve(bhctx);
+    

     // 将内核占据的页，包括前1MB，hhk_init 设为已占用
     // 将内核占据的页，包括前1MB，hhk_init 设为已占用

-    size_t pg_count = leaf_count(to_kphysical(__kexec_end));
+    size_t pg_count = leaf_count(to_kphysical(kernel_load_end));

     pmm_onhold_range(0, pg_count);
 
     size_t i;
     pmm_onhold_range(0, pg_count);
 
     size_t i;


@@ -49,7 +43,20 @@ boot_begin(struct boot_handoff* bhctx)
     }
 }
 
     }
 }
 

-extern u8_t __kboot_end; /* link/linker.ld */
+static void
+__free_reclaimable()
+{
+    ptr_t start;
+    pfn_t pgs;
+    pte_t* ptep;
+
+    start = reclaimable_start;
+    pgs   = leaf_count(reclaimable_end - start);
+    ptep  = mkptep_va(VMS_SELF, start);
+
+    pmm_unhold_range(pfn(to_kphysical(start)), pgs);
+    vmm_unset_ptes(ptep, pgs);
+}

 
 /**
  * @brief Release memory for kernel bootstrapping initialization
 
 /**
  * @brief Release memory for kernel bootstrapping initialization


@@ -70,18 +77,10 @@ boot_end(struct boot_handoff* bhctx)
     }
 
     bhctx->release(bhctx);
     }
 
     bhctx->release(bhctx);

-}

 
 

-/**
- * @brief Clean up the boot stage code and data
- *
- */
-void
-boot_cleanup()
-{
-    pte_t* ptep  = mkl0tep(mkptep_va(VMS_SELF, 0));
-    size_t count = page_count(KERNEL_RESIDENT, L0T_SIZE);
-    vmm_unset_ptes(ptep, count);
+    boot_clean_arch_reserve(bhctx);
+
+    __free_reclaimable();

 }
 
 void
 }
 
 void