[libcpu][aarch64]memory setup using memblock (#9092)

* memory setup using memblock

* map pages later

bsp/qemu-virt64-aarch64/drivers/board.c

@@ -21,12 +21,5 @@ extern size_t MMUTable[];
 
 void rt_hw_board_init(void)
 {
-    rt_fdt_commit_memregion_early(&(rt_region_t)
-    {
-        .name  = "memheap",
-        .start = (rt_size_t)rt_kmem_v2p(HEAP_BEGIN),
-        .end   = (rt_size_t)rt_kmem_v2p(HEAP_END),
-    }, RT_TRUE);
-
     rt_hw_common_setup();
 }

components/drivers/core/mnt.c

@@ -21,10 +21,10 @@
 #include <msh.h>
 #endif
 #include <ioremap.h>
+#include <mm_memblock.h>
 
 #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
@@ -41,23 +41,16 @@ 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;
 
-        if (!memregion_request(&mem_region, &mem_region_nr, RT_TRUE))
+        rt_slist_for_each_entry(iter, &(rt_memblock_get_reserved()->reg_list), node)
         {
-            while (mem_region_nr-- > 0)
+            if (rt_strcmp(iter->memreg.name, name) == 0)
             {
-                if (mem_region->name == name || !rt_strcmp(mem_region->name, name))
-                {
-                    initrd_start = mem_region->start;
-                    initrd_end = mem_region->end;
-
-                    break;
-                }
-
-                mem_region++;
+                initrd_start = iter->memreg.start;
+                initrd_end = iter->memreg.end;
+                break;
             }
         }
 

components/drivers/ofw/Kconfig

@@ -3,6 +3,7 @@ menuconfig RT_USING_OFW
     select RT_USING_ADT
     select RT_USING_ADT_REF
     select RT_USING_ADT_BITMAP
+    select RT_USING_MEMBLOCK
     depends on RT_USING_DM
     default n
 

components/mm/mm_memblock.c

@@ -112,9 +112,9 @@ rt_inline void _reg_remove_after(struct rt_mmblk_reg *prev)
 
 /* adding overlapped regions is banned */
 static rt_err_t _memblock_add_range(struct rt_memblock *memblock,
-                    char *name, rt_size_t start, rt_size_t end, mm_flag_t flag)
+                    const char *name, rt_size_t start, rt_size_t end, mm_flag_t flag)
 {
-    struct rt_mmblk_reg *reg, *reg_next;
+    struct rt_mmblk_reg *reg = RT_NULL, *reg_next = RT_NULL;
     rt_slist_t sentinel;
     rt_region_t new_region;
 
@@ -153,7 +153,7 @@ static rt_err_t _memblock_add_range(struct rt_memblock *memblock,
     return _reg_insert_after(reg, &new_region, flag);
 }
 
-rt_err_t rt_memblock_add_memory(char *name, rt_size_t start, rt_size_t end, mmblk_flag_t flags)
+rt_err_t rt_memblock_add_memory(const char *name, rt_size_t start, rt_size_t end, mmblk_flag_t flags)
 {
     LOG_D("add physical address range [%p-%p) with flag 0x%x" \
             " to overall memory regions\n", base, base + size, flag);
@@ -161,7 +161,7 @@ rt_err_t rt_memblock_add_memory(char *name, rt_size_t start, rt_size_t end, mmbl
     return _memblock_add_range(&mmblk_memory, name, start, end, flags);
 }
 
-rt_err_t rt_memblock_reserve_memory(char *name, rt_size_t start, rt_size_t end, mmblk_flag_t flags)
+rt_err_t rt_memblock_reserve_memory(const char *name, rt_size_t start, rt_size_t end, mmblk_flag_t flags)
 {
     LOG_D("add physical address range [%p-%p) to reserved memory regions\n",\
                                         base, base + size);
@@ -319,7 +319,7 @@ static void _next_free_region(struct rt_mmblk_reg **m, struct rt_mmblk_reg **r,
 /* merge normal memory regions */
 static void _memblock_merge_memory(void)
 {
-    struct rt_mmblk_reg *reg;
+    struct rt_mmblk_reg *reg = RT_NULL;
 
     rt_slist_for_each_entry(reg, &(mmblk_memory.reg_list), node)
     {
@@ -333,43 +333,62 @@ static void _memblock_merge_memory(void)
     }
 }
 
-/* free all available memory to buddy system */
-static void _memblock_free_all(void)
+void rt_memblock_setup_memory_environment(void)
 {
-    rt_region_t reg;
+    struct rt_mmblk_reg *iter = RT_NULL, *start_reg = RT_NULL, *end_reg = RT_NULL;
+    rt_region_t reg = {0};
     rt_size_t mem = 0;
     struct rt_mmblk_reg *m, *r;
+    void *err;
 
+    _memblock_merge_memory();
+
+    LOG_I("System memory:");
+
+    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);
+    }
+
+    LOG_I("Reserved memory:");
+
+    rt_slist_for_each_entry(iter, &(mmblk_reserved.reg_list), node)
+    {
+        LOG_I("  %-*.s [%p, %p]", RT_NAME_MAX, iter->memreg.name, iter->memreg.start, iter->memreg.end);
+
+        if (iter->flags != MEMBLOCK_NONE)
+        {
+            _memblock_separate_range(&mmblk_memory, iter->memreg.start, iter->memreg.end, &start_reg, &end_reg);
+            _memblock_set_flag(start_reg, end_reg, iter->flags);
+        }
+    }
+
+    /* 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;
-        rt_page_install(reg);
 
-        LOG_D("region [%p-%p) added to buddy system\n", reg.start, reg.end);
+        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;
     }
 
-    LOG_D("0x%lx(%ld) bytes memory added to buddy system\n", mem, mem);
-}
-
-void rt_memblock_setup_memory_environment(void)
-{
-    struct rt_mmblk_reg *reg, *start_reg, *end_reg;
-    rt_err_t err = RT_EOK;
-
-    _memblock_merge_memory();
-    rt_slist_for_each_entry(reg, &(mmblk_reserved.reg_list), node)
-    {
-        if (reg->flags != MEMBLOCK_NONE)
-        {
-            err = _memblock_separate_range(&mmblk_memory, reg->memreg.start, reg->memreg.end, &start_reg, &end_reg);
-            RT_ASSERT(err == RT_EOK);
-
-            _memblock_set_flag(start_reg, end_reg, reg->flags);
-        }
-    }
-    _memblock_free_all();
+    LOG_I("%ld MB memory installed to system page", mem/1000000);
 }
 
 #ifdef UTEST_MM_API_TC

components/mm/mm_memblock.h

@@ -56,7 +56,7 @@ struct rt_memblock
  * @param end the size of the physical address range
  * @param flags the flags of the region
  */
-rt_err_t rt_memblock_add_memory(char *name, rt_size_t start, rt_size_t end, mmblk_flag_t flags);
+rt_err_t rt_memblock_add_memory(const char *name, rt_size_t start, rt_size_t end, mmblk_flag_t flags);
 
 /**
  * @brief Add a physical address range to the reserved memory region
@@ -68,7 +68,7 @@ rt_err_t rt_memblock_add_memory(char *name, rt_size_t start, rt_size_t end, mmbl
  * @param end the size of the physical address range
  * @param flags the flags of the region
  */
-rt_err_t rt_memblock_reserve_memory(char *name, rt_size_t start, rt_size_t end, mmblk_flag_t flags);
+rt_err_t rt_memblock_reserve_memory(const char *name, rt_size_t start, rt_size_t end, mmblk_flag_t flags);
 
 /**
  * @brief To conclude the management of memory by the memblock.

libcpu/Kconfig

@@ -17,6 +17,12 @@ if ARCH_ARMV8 && ARCH_CPU_64BIT
         select ARCH_USING_HW_THREAD_SELF
         default y if RT_USING_OFW
         default n
+    config ARCH_HEAP_SIZE
+        hex "Size of system heap"
+        default 0x4000000
+    config ARCH_INIT_PAGE_SIZE
+        hex "Size of init page region"
+        default 0x200000
     endmenu
 endif
 

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);