Changeset 9d4e170 in mainline

Timestamp:

2011-11-17T12:59:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6b326ea1

Parents:

80d301ab

Message:

Create the identity mapping for the smaller of config.identity_size and
the end of physical memory.

File:

• kernel/arch/arm32/src/mm/page.c (modified) (3 diffs)

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

@@ -37 +37 @@
 #include <genarch/mm/page_pt.h>
 #include <mm/page.h>
+#include <arch/mm/frame.h>
 #include <align.h>
 #include <config.h>
@@ -42 +43 @@
 #include <typedefs.h>
 #include <interrupt.h>
-#include <arch/mm/frame.h>
+#include <macros.h>
 
 /** Initializes page tables.
@@ -58 +59 @@
         uintptr_t cur;
         /* Kernel identity mapping */
-        for (cur = PHYSMEM_START_ADDR; cur < last_frame; cur += FRAME_SIZE)
+        for (cur = PHYSMEM_START_ADDR;
+            cur < min(config.identity_base, last_frame); cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         
         /* Create mapping for exception table at high offset */
 #ifdef HIGH_EXCEPTION_VECTORS
+        // XXX: fixme to use proper non-identity page
         void *virtaddr = frame_alloc(ONE_FRAME, FRAME_KA);
-        page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, KA2PA(virtaddr), flags);
+        page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, KA2PA(virtaddr),
+            flags);
 #else
 #error "Only high exception vector supported now"