Changeset ccc362a1 in mainline for kernel/arch/riscv64/src/mm/frame.c

Timestamp:

2017-08-21T18:46:34Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6c742f5e

Parents:

c16479e

Message:

riscv64: memory management routines, reflecting the latest Privileged Architecture specification (1.10)

File:

• kernel/arch/riscv64/src/mm/frame.c (modified) (3 diffs)

kernel/arch/riscv64/src/mm/frame.c

@@ -32 +32 @@
 
 #include <mm/frame.h>
+#include <arch/boot/boot.h>
 #include <arch/mm/frame.h>
+#include <arch/drivers/ucb.h>
 #include <mm/as.h>
 #include <config.h>
@@ -39 +41 @@
 #include <align.h>
 #include <macros.h>
-
 #include <print.h>
 
-size_t hardcoded_unmapped_ktext_size = 0;
-size_t hardcoded_unmapped_kdata_size = 0;
+uintptr_t physmem_start;
+uintptr_t htif_frame;
+uintptr_t pt_frame;
+memmap_t memmap;
 
 void physmem_print(void)
@@ -49 +52 @@
 }
 
+static void frame_common_arch_init(bool low)
+{
+        pfn_t minconf =
+            max3(ADDR2PFN(physmem_start), htif_frame + 1, pt_frame + 1);
+        
+        for (size_t i = 0; i < memmap.cnt; i++) {
+                /* To be safe, make the available zone possibly smaller */
+                uintptr_t base = ALIGN_UP((uintptr_t) memmap.zones[i].start,
+                    FRAME_SIZE);
+                size_t size = ALIGN_DOWN(memmap.zones[i].size -
+                    (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE);
+                
+                if (!frame_adjust_zone_bounds(low, &base, &size))
+                        return;
+                
+                pfn_t pfn = ADDR2PFN(base);
+                size_t count = SIZE2FRAMES(size);
+                pfn_t conf;
+                
+                if (low) {
+                        if ((minconf < pfn) || (minconf >= pfn + count))
+                                conf = pfn;
+                        else
+                                conf = minconf;
+                        
+                        zone_create(pfn, count, conf,
+                            ZONE_AVAILABLE | ZONE_LOWMEM);
+                } else {
+                        conf = zone_external_conf_alloc(count);
+                        if (conf != 0)
+                                zone_create(pfn, count, conf,
+                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                }
+        }
+}
 
 void frame_low_arch_init(void)
 {
+        frame_common_arch_init(true);
+        
+        frame_mark_unavailable(htif_frame, 1);
+        frame_mark_unavailable(pt_frame, 1);
 }
 
 void frame_high_arch_init(void)
 {
+        frame_common_arch_init(false);
 }