Changeset b7068da in mainline for kernel/arch/arm32/src/ras.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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 changes

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>
@@ -50 +51 @@
 void ras_init(void)
 {
-        ras_page = frame_alloc(ONE_FRAME, FRAME_KA);
-        memsetb(ras_page, FRAME_SIZE, 0); 
+        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[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);
 }