Changeset 95c675b in mainline for kernel/arch/riscv64/src/mm/page.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• kernel/arch/riscv64/src/mm/page.c (modified) (4 diffs)

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

@@ -36 +36 @@
 #include <genarch/mm/page_pt.h>
 #include <arch/mm/frame.h>
+#include <arch/cpu.h>
 #include <mm/frame.h>
 #include <mm/page.h>
 #include <mm/as.h>
-#include <typedefs.h>
 #include <align.h>
 #include <config.h>
@@ -46 +46 @@
 #include <arch/asm.h>
 #include <debug.h>
-#include <memstr.h>
 #include <print.h>
 #include <interrupt.h>
@@ -52 +51 @@
 void page_arch_init(void)
 {
-        if (config.cpu_active == 1)
+        if (config.cpu_active == 1) {
                 page_mapping_operations = &pt_mapping_operations;
+                
+                page_table_lock(AS_KERNEL, true);
+                
+                /*
+                 * PA2KA(identity) mapping for all low-memory frames.
+                 */
+                for (uintptr_t cur = 0;
+                    cur < min(config.identity_size, config.physmem_end);
+                    cur += FRAME_SIZE)
+                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur,
+                            PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_EXEC | PAGE_WRITE | PAGE_READ);
+                
+                page_table_unlock(AS_KERNEL, true);
+                
+                // FIXME: register page fault extension handler
+                
+                write_satp((uintptr_t) AS_KERNEL->genarch.page_table);
+                
+                /* The boot page table is no longer needed. */
+                // FIXME: frame_mark_available(pt_frame, 1);
+        }
 }
 
@@ -60 +80 @@
 }
 
+void write_satp(uintptr_t ptl0)
+{
+        uint64_t satp = ((ptl0 >> FRAME_WIDTH) & SATP_PFN_MASK) |
+            SATP_MODE_SV48;
+        
+        asm volatile (
+                "csrw sptbr, %[satp]\n"
+                :: [satp] "r" (satp)
+        );
+}
+
 /** @}
  */