Changes in kernel/arch/arm32/src/ras.c [9d58539:818fffe] in mainline

File:

• kernel/arch/arm32/src/ras.c (modified) (2 diffs)

kernel/arch/arm32/src/ras.c

@@ -38 +38 @@
 #include <mm/frame.h>
 #include <mm/page.h>
-#include <mm/km.h>
 #include <mm/tlb.h>
 #include <mm/asid.h>
@@ -51 +50 @@
 void ras_init(void)
 {
-        uintptr_t frame;
-
-        frame = (uintptr_t) frame_alloc(ONE_FRAME,
-            FRAME_ATOMIC | FRAME_HIGHMEM);
-        if (!frame)
-                frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_LOWMEM);
-        ras_page = (uintptr_t *) km_map(frame,
-            PAGE_SIZE, PAGE_READ | PAGE_WRITE | PAGE_USER | PAGE_CACHEABLE);
-
-        memsetb(ras_page, PAGE_SIZE, 0); 
+        ras_page = frame_alloc(ONE_FRAME, FRAME_KA);
+        memsetb(ras_page, FRAME_SIZE, 0); 
         ras_page[RAS_START] = 0;
         ras_page[RAS_END] = 0xffffffff;
+        /*
+         * Userspace needs to be able to write to this page. The page is 
+         * cached in TLB as PAGE_KERNEL. Purge it from TLB and map it
+         * read/write PAGE_USER.
+         */
+        tlb_invalidate_pages(ASID_KERNEL, (uintptr_t)ras_page, 1);
+        page_table_lock(AS, true);
+        page_mapping_insert(AS, (uintptr_t)ras_page, (uintptr_t)KA2PA(ras_page),
+            PAGE_READ | PAGE_WRITE | PAGE_USER);
+        page_table_unlock(AS, true);
 }