map pages later

Author: zmshahaha

Diff for: components/drivers/core/mnt.c

@@ -25,7 +25,6 @@
 
 #ifdef RT_USING_OFW
 #define bootargs_select rt_ofw_bootargs_select
-#define memregion_request rt_fdt_commit_memregion_request
 #else
 #error Platform have not kernel parameters select interfaces!
 #endif
@@ -42,9 +41,8 @@ static int rootfs_mnt_init(void)
     if (!dev || !fstype)
     {
         const char *name = "initrd";
-        rt_size_t mem_region_nr;
-        rt_region_t *mem_region;
         rt_uint64_t initrd_start = 0, initrd_end = 0;
+        struct rt_mmblk_reg *iter = RT_NULL;
 
         rt_slist_for_each_entry(iter, &(rt_memblock_get_reserved()->reg_list), node)
         {

Diff for: components/drivers/ofw/fdt.c

@@ -300,7 +300,6 @@ static void fdt_scan_reserved_memory(void)
 static rt_err_t fdt_scan_memory(void)
 {
     int nodeoffset, no;
-    rt_region_t *region;
     rt_uint64_t base, size;
     rt_err_t err = -RT_EEMPTY;
 

Diff for: components/mm/mm_memblock.c

@@ -336,12 +336,10 @@ static void _memblock_merge_memory(void)
 void rt_memblock_setup_memory_environment(void)
 {
     struct rt_mmblk_reg *iter = RT_NULL, *start_reg = RT_NULL, *end_reg = RT_NULL;
-    static struct mem_desc platform_mem_desc = {0};
-    rt_region_t platform_mem_region = {.start = ~0UL,
-                                       .end   = 0};
     rt_region_t reg = {0};
     rt_size_t mem = 0;
     struct rt_mmblk_reg *m, *r;
+    void *err;
 
     _memblock_merge_memory();
 
@@ -350,29 +348,8 @@ void rt_memblock_setup_memory_environment(void)
     rt_slist_for_each_entry(iter, &(mmblk_memory.reg_list), node)
     {
         LOG_I("  %-*.s [%p, %p]", RT_NAME_MAX, iter->memreg.name, iter->memreg.start, iter->memreg.end);
-
-        if (platform_mem_region.start > iter->memreg.start)
-        {
-            platform_mem_region.start = iter->memreg.start;
-        }
-
-        if (platform_mem_region.end < iter->memreg.end)
-        {
-            platform_mem_region.end = iter->memreg.end;
-        }
     }
 
-    /* create MMU mapping of system memory */
-    platform_mem_region.start = RT_ALIGN_DOWN(platform_mem_region.start, ARCH_PAGE_SIZE);
-    platform_mem_region.end   = RT_ALIGN(platform_mem_region.end, ARCH_PAGE_SIZE);
-
-    platform_mem_desc.paddr_start = platform_mem_region.start;
-    platform_mem_desc.vaddr_start = platform_mem_region.start - PV_OFFSET;
-    platform_mem_desc.vaddr_end = platform_mem_region.end - PV_OFFSET - 1;
-    platform_mem_desc.attr = NORMAL_MEM;
-
-    rt_hw_mmu_setup(&rt_kernel_space, &platform_mem_desc, 1);
-
     LOG_I("Reserved memory:");
 
     rt_slist_for_each_entry(iter, &(mmblk_reserved.reg_list), node)
@@ -389,10 +366,24 @@ void rt_memblock_setup_memory_environment(void)
     /* install usable memory to system page */
     for_each_free_region(m, r, MEMBLOCK_NONE, &reg.start, &reg.end)
     {
+        reg.start = RT_ALIGN(reg.start, ARCH_PAGE_SIZE);
+        reg.end   = RT_ALIGN_DOWN(reg.end, ARCH_PAGE_SIZE);
+
+        if (reg.start >= reg.end)
+            continue;
+
         LOG_I("physical memory region [%p-%p] installed to system page", reg.start, reg.end);
 
         reg.start -= PV_OFFSET;
         reg.end -= PV_OFFSET;
+
+        struct rt_mm_va_hint hint = {.flags = MMF_MAP_FIXED,
+                                    .limit_start = rt_kernel_space.start,
+                                    .limit_range_size = rt_kernel_space.size,
+                                    .map_size = reg.end - reg.start,
+                                    .prefer = (void *)reg.start};
+
+        rt_aspace_map_phy(&rt_kernel_space, &hint, MMU_MAP_K_RWCB, (reg.start + PV_OFFSET) >> MM_PAGE_SHIFT, &err);
         rt_page_install(reg);
         mem += reg.end - reg.start;
     }

Diff for: examples/utest/configs/rtsmart/base.conf

@@ -1,5 +1,4 @@
 CONFIG_UTEST_MEMHEAP_TC=y
-CONFIG_UTEST_MM_API_TC=y
 
 # dependencies
 CONFIG_RT_USING_SMART=y

Diff for: libcpu/aarch64/common/mmu.c

@@ -828,14 +828,9 @@ void rt_hw_mem_setup_early(unsigned long *tbl0, unsigned long *tbl1,
     int ret;
     unsigned long count = (size + ARCH_SECTION_MASK) >> ARCH_SECTION_SHIFT;
     unsigned long normal_attr = MMU_MAP_CUSTOM(MMU_AP_KAUN, NORMAL_MEM);
-
-#ifdef RT_USING_SMART
-    unsigned long va = KERNEL_VADDR_START;
-#else
     extern unsigned char _start;
-    unsigned long va = (unsigned long) &_start;
+    unsigned long va = (unsigned long) &_start - pv_off;
     va = RT_ALIGN_DOWN(va, 0x200000);
-#endif
 
     /* setup pv off */
     rt_kmem_pvoff_set(pv_off);

Diff for: libcpu/aarch64/common/setup.c

@@ -206,6 +206,8 @@ void rt_hw_common_setup(void)
     rt_size_t init_page_start, init_page_end;
     rt_size_t fdt_start, fdt_end;
     rt_region_t init_page_region = { 0 };
+    rt_region_t platform_mem_region = { 0 };
+    static struct mem_desc platform_mem_desc;
 
     system_vectors_init();
 
@@ -224,6 +226,9 @@ void rt_hw_common_setup(void)
     fdt_start       = init_page_end;
     fdt_end         = RT_ALIGN(fdt_start + fdt_size, ARCH_PAGE_SIZE);
 
+    platform_mem_region.start = kernel_start;
+    platform_mem_region.end   = fdt_end;
+
     rt_memblock_reserve_memory("kernel", kernel_start, kernel_end, MEMBLOCK_NONE);
     rt_memblock_reserve_memory("memheap", heap_start, heap_end, MEMBLOCK_NONE);
     rt_memblock_reserve_memory("init-page", init_page_start, init_page_end, MEMBLOCK_NONE);
@@ -238,6 +243,17 @@ void rt_hw_common_setup(void)
     init_page_region.end = init_page_end - PV_OFFSET;
     rt_page_init(init_page_region);
 
+    /* create MMU mapping of kernel memory */
+    platform_mem_region.start = RT_ALIGN_DOWN(platform_mem_region.start, ARCH_PAGE_SIZE);
+    platform_mem_region.end   = RT_ALIGN(platform_mem_region.end, ARCH_PAGE_SIZE);
+
+    platform_mem_desc.paddr_start = platform_mem_region.start;
+    platform_mem_desc.vaddr_start = platform_mem_region.start - PV_OFFSET;
+    platform_mem_desc.vaddr_end = platform_mem_region.end - PV_OFFSET - 1;
+    platform_mem_desc.attr = NORMAL_MEM;
+
+    rt_hw_mmu_setup(&rt_kernel_space, &platform_mem_desc, 1);
+
     if (rt_fdt_prefetch(fdt_ptr))
     {
         /* Platform cannot be initialized */