Changeset c621f4aa in mainline for kernel/arch/arm32/src/mm/page.c

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

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

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

@@ -27 +27 @@
  */
 
-/** @addtogroup arm32mm 
+/** @addtogroup arm32mm
  * @{
  */
@@ -41 +41 @@
 #include <arch/exception.h>
 #include <typedefs.h>
-#include <arch/types.h>
 #include <interrupt.h>
 #include <arch/mm/frame.h>
@@ -54 +53 @@
         int flags = PAGE_CACHEABLE;
         page_mapping_operations = &pt_mapping_operations;
+
+        page_table_lock(AS_KERNEL, true);
         
         uintptr_t cur;
         /* Kernel identity mapping */
-        for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
+        for (cur = PHYSMEM_START_ADDR; cur < last_frame; cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         
@@ -67 +68 @@
 #error "Only high exception vector supported now"
 #endif
+        cur = ALIGN_DOWN(0x50008010, FRAME_SIZE);
+        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
+
+        page_table_unlock(AS_KERNEL, true);
         
         as_switch(NULL, AS_KERNEL);
@@ -93 +98 @@
         uintptr_t virtaddr = PA2KA(last_frame);
         pfn_t i;
+
+        page_table_lock(AS_KERNEL, true);
         for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
                 page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i),
@@ -98 +105 @@
                     PAGE_NOT_CACHEABLE | PAGE_READ | PAGE_WRITE | PAGE_KERNEL);
         }
+        page_table_unlock(AS_KERNEL, true);
         
         last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);