memory setup using memblock

Author: zmshahaha

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/drivers/ofw/fdt.c

@@ -15,6 +15,8 @@
 #include <drivers/ofw_raw.h>
 #include <drivers/core/dm.h>
 
+#include <mm_memblock.h>
+
 #define DBG_TAG "rtdm.ofw"
 #define DBG_LVL DBG_INFO
 #include <rtdbg.h>
@@ -29,9 +31,6 @@ RT_OFW_SYMBOL_TYPE_RANGE(earlycon, struct rt_fdt_earlycon_id, _earlycon_start =
 #define ARCH_INIT_MEMREGION_NR 128
 #endif
 
-static rt_region_t _memregion[ARCH_INIT_MEMREGION_NR] rt_section(".bss.noclean.memregion");
-static int _memregion_front_idx = 0, _memregion_last_idx = RT_ARRAY_SIZE(_memregion) - 1;
-
 static void *_fdt = RT_NULL;
 static rt_phandle _phandle_min;
 static rt_phandle _phandle_max;
@@ -140,71 +139,6 @@ rt_bool_t rt_fdt_device_is_available(void *fdt, int nodeoffset)
     return ret;
 }
 
-rt_err_t rt_fdt_commit_memregion_early(rt_region_t *region, rt_bool_t is_reserved)
-{
-    rt_err_t err = RT_EOK;
-
-    if (region && region->name)
-    {
-        if (_memregion_front_idx < _memregion_last_idx)
-        {
-            int idx;
-
-            if (!_memregion_front_idx && _memregion_last_idx == RT_ARRAY_SIZE(_memregion) - 1)
-            {
-                for (int i = 0; i < RT_ARRAY_SIZE(_memregion); ++i)
-                {
-                    _memregion[i].name = RT_NULL;
-                }
-            }
-
-            idx = is_reserved ? _memregion_last_idx-- : _memregion_front_idx++;
-
-            rt_memcpy(&_memregion[idx], region, sizeof(*region));
-        }
-        else
-        {
-            err = -RT_EEMPTY;
-        }
-    }
-    else
-    {
-        err = -RT_EINVAL;
-    }
-
-    return err;
-}
-
-rt_err_t rt_fdt_commit_memregion_request(rt_region_t **out_region, rt_size_t *out_nr, rt_bool_t is_reserved)
-{
-    rt_err_t err = RT_EOK;
-
-    if (out_region && out_nr)
-    {
-        if (is_reserved)
-        {
-            *out_region = &_memregion[_memregion_last_idx + 1];
-            *out_nr = RT_ARRAY_SIZE(_memregion) - 1 - _memregion_last_idx;
-        }
-        else
-        {
-            *out_region = &_memregion[0];
-            *out_nr = _memregion_front_idx;
-        }
-
-        if (*out_nr == 0)
-        {
-            err = -RT_EEMPTY;
-        }
-    }
-    else
-    {
-        err = -RT_EINVAL;
-    }
-
-    return err;
-}
-
 rt_err_t rt_fdt_prefetch(void *fdt)
 {
     rt_err_t err = -RT_ERROR;
@@ -256,26 +190,6 @@ rt_err_t rt_fdt_scan_root(void)
     return err;
 }
 
-rt_inline rt_err_t commit_memregion(const char *name, rt_uint64_t base, rt_uint64_t size, rt_bool_t is_reserved)
-{
-    return rt_fdt_commit_memregion_early(&(rt_region_t)
-    {
-        .name = name,
-        .start = (rt_size_t)base,
-        .end = (rt_size_t)(base + size),
-    }, is_reserved);
-}
-
-static rt_err_t reserve_memregion(const char *name, rt_uint64_t base, rt_uint64_t size)
-{
-    if (commit_memregion(name, base, size, RT_TRUE) == -RT_EEMPTY)
-    {
-        LOG_W("Reserved memory: %p - %p%s", base, base + size, " unable to record");
-    }
-
-    return RT_EOK;
-}
-
 static rt_err_t fdt_reserved_mem_check_root(int nodeoffset)
 {
     rt_err_t err = RT_EOK;
@@ -331,8 +245,9 @@ static rt_err_t fdt_reserved_memory_reg(int nodeoffset, const char *uname)
                     continue;
                 }
 
+                rt_bool_t is_nomap = fdt_getprop(_fdt, nodeoffset, "no-map", RT_NULL) ? RT_TRUE : RT_FALSE;
                 base = rt_fdt_translate_address(_fdt, nodeoffset, base);
-                reserve_memregion(fdt_get_name(_fdt, nodeoffset, RT_NULL), base, size);
+                rt_memblock_reserve_memory(uname, base, base + size, is_nomap);
 
                 len -= t_len;
             }
@@ -371,7 +286,7 @@ static void fdt_scan_reserved_memory(void)
 
                 if (err == -RT_EEMPTY && fdt_getprop(_fdt, child, "size", RT_NULL))
                 {
-                    reserve_memregion(fdt_get_name(_fdt, child, RT_NULL), 0, 0);
+                    LOG_E("Allocating reserved memory in setup is not yet supported");
                 }
             }
         }
@@ -399,11 +314,9 @@ static rt_err_t fdt_scan_memory(void)
             break;
         }
 
-        reserve_memregion("memreserve", base, size);
+        rt_memblock_reserve_memory("memreserve", base, base + size, MEMBLOCK_NONE);
     }
 
-    no = 0;
-
     fdt_for_each_subnode(nodeoffset, _fdt, 0)
     {
         int len;
@@ -441,7 +354,8 @@ static rt_err_t fdt_scan_memory(void)
                 continue;
             }
 
-            err = commit_memregion(name, base, size, RT_FALSE);
+            bool is_hotpluggable = fdt_getprop(_fdt, nodeoffset, "hotpluggable", RT_NULL) ? RT_TRUE : RT_FALSE;
+            err = rt_memblock_add_memory(name, base, base + size, is_hotpluggable);
 
             if (!err)
             {
@@ -451,8 +365,6 @@ static rt_err_t fdt_scan_memory(void)
             {
                 LOG_W("Memory node(%d) ranges: %p - %p%s", no, base, base + size, " unable to record");
             }
-
-            ++no;
         }
     }
 
@@ -461,95 +373,6 @@ static rt_err_t fdt_scan_memory(void)
         fdt_scan_reserved_memory();
     }
 
-    region = &_memregion[0];
-
-    for (no = 0; region->name; ++region)
-    {
-        /* We need check the memory region now. */
-        for (int i = RT_ARRAY_SIZE(_memregion) - 1; i > no; --i)
-        {
-            rt_region_t *res_region = &_memregion[i];
-
-            if (!res_region->name)
-            {
-                break;
-            }
-
-            /*
-             *  +--------+                                    +--------+
-             *  | memory |                                    | memory |
-             *  +--------+  +----------+        +----------+  +--------+
-             *              | reserved |        | reserved |
-             *              +----------+        +----------+
-             */
-            if (res_region->start >= region->end || res_region->end <= region->start)
-            {
-                /* No adjustments needed */
-                continue;
-            }
-
-            /*
-             * case 0:                      case 1:
-             *  +------------------+             +----------+
-             *  |      memory      |             |  memory  |
-             *  +---+----------+---+         +---+----------+---+
-             *      | reserved |             |     reserved     |
-             *      +----------+             +---+----------+---+
-             *
-             * case 2:                      case 3:
-             *  +------------------+                +------------------+
-             *  |      memory      |                |      memory      |
-             *  +--------------+---+------+  +------+---+--------------+
-             *                 | reserved |  | reserved |
-             *                 +----------+  +----------+
-             */
-            if (res_region->start > region->start)
-            {
-                if (res_region->end < region->end)
-                {
-                    /* case 0 */
-                    rt_size_t new_size = region->end - res_region->end;
-
-                    region->end = res_region->start;
-
-                    /* Commit part next block */
-                    err = commit_memregion(region->name, res_region->end, new_size, RT_FALSE);
-
-                    if (!err)
-                    {
-                        ++no;
-
-                        /* Scan again */
-                        region = &_memregion[0];
-                        --region;
-
-                        break;
-                    }
-                }
-                else
-                {
-                    /* case 2 */
-                    region->end = res_region->start;
-                }
-            }
-            else
-            {
-                if (res_region->end < region->end)
-                {
-                    /* case 3 */
-                    region->start = res_region->end;
-                }
-                else
-                {
-                    /* case 1 */
-                    region->name = RT_NULL;
-
-                    break;
-                }
-            }
-        }
-    }
-
     return err;
 }
 
@@ -649,7 +472,7 @@ static rt_err_t fdt_scan_initrd(rt_uint64_t *ranges, const char *name, const cha
 
         if (!err)
         {
-            commit_memregion("initrd", ranges[0], ranges[1] - ranges[0], RT_TRUE);
+            rt_memblock_reserve_memory("initrd", ranges[0], ranges[1], MEMBLOCK_NONE);
         }
     }
     else if (!ranges)

components/mm/mm_memblock.c

@@ -333,43 +333,71 @@ 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)
 {
+    struct rt_mmblk_reg *iter, *start_reg, *end_reg;
+    static struct mem_desc platform_mem_desc = {0};
+    rt_region_t platform_mem_region = {.start = ~0UL,
+                                       .end   = 0};
     rt_region_t reg;
     rt_size_t mem = 0;
     struct rt_mmblk_reg *m, *r;
 
-    for_each_free_region(m, r, MEMBLOCK_NONE, &reg.start, &reg.end)
+    _memblock_merge_memory();
+
+    LOG_I("System memory:");
+
+    rt_slist_for_each_entry(iter, &(mmblk_memory.reg_list), node)
     {
-        reg.start -= PV_OFFSET;
-        reg.end -= PV_OFFSET;
-        rt_page_install(reg);
+        LOG_I("  %-*.s [%p, %p]", RT_NAME_MAX, iter->memreg.name, iter->memreg.start, iter->memreg.end);
 
-        LOG_D("region [%p-%p) added to buddy system\n", reg.start, reg.end);
-        mem += reg.end - reg.start;
+        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;
+        }
     }
 
-    LOG_D("0x%lx(%ld) bytes memory added to buddy system\n", mem, mem);
-}
+    /* 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);
 
-void rt_memblock_setup_memory_environment(void)
-{
-    struct rt_mmblk_reg *reg, *start_reg, *end_reg;
-    rt_err_t err = RT_EOK;
+    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;
 
-    _memblock_merge_memory();
-    rt_slist_for_each_entry(reg, &(mmblk_reserved.reg_list), node)
+    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)
     {
-        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);
+        LOG_I("  %-*.s [%p, %p]", RT_NAME_MAX, iter->memreg.name, iter->memreg.start, iter->memreg.end);
 
-            _memblock_set_flag(start_reg, end_reg, reg->flags);
+        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);
         }
     }
-    _memblock_free_all();
+
+    /* install usable memory to system page */
+    for_each_free_region(m, r, MEMBLOCK_NONE, &reg.start, &reg.end)
+    {
+        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);
+        mem += reg.end - reg.start;
+    }
+
+    LOG_I("%ld MB memory installed to system page", mem/1000000);
 }
 
 #ifdef UTEST_MM_API_TC

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 0x8000000
+    config ARCH_INIT_PAGE_SIZE
+        hex "Size of init page region"
+        default 0x200000
     endmenu
 endif