Changeset 77b52f0 in mainline

Timestamp:

2012-03-07T16:09:02Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

609cbf8

Parents:

161fbda

Message:

kernel/frame, arm32/page: PA might start on other addresses than 0, handle it.

Add comments about possible issues.

Location:

kernel

Files:

• arch/arm32/src/mm/page.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (1 diff)

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

@@ -57 +57 @@
         page_table_lock(AS_KERNEL, true);
         
-        uintptr_t cur;
-
         /* Kernel identity mapping */
-        for (cur = PHYSMEM_START_ADDR;
-            cur < min(config.identity_size, config.physmem_end);
+        //FIXME: We need to consider the possibility that
+        //identity_base > identity_size and physmem_end.
+        //This might lead to overflow if identity_size is too big.
+        for (uintptr_t cur = PHYSMEM_START_ADDR;
+            cur < min(KA2PA(config.identity_base) +
+                config.identity_size, config.physmem_end);
             cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);

kernel/generic/src/mm/frame.c

@@ -1282 +1282 @@
 bool frame_adjust_zone_bounds(bool low, uintptr_t *basep, size_t *sizep)
 {
-        uintptr_t limit = config.identity_size;
+        // FIXME: This might lead to overflow if the identity_size is too big
+        // but it is necessary if the PA identity_base > identity_size
+        const uintptr_t limit =
+            KA2PA(config.identity_base) + config.identity_size;
 
         if (low) {