Changeset 6250c37 in mainline for kernel/arch

Timestamp:

2010-06-27T10:20:01Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f1fc83a

Parents:

12b0d51

Message:

Fix first physical frame number computation. Only create kernel identity mapping from beginning of physical memory, not from zero.

Location:

kernel/arch/arm32

Files:

• include/mm/frame.h (modified) (1 diff)
• src/mach/gta02/gta02.c (modified) (1 diff)
• src/mm/frame.c (modified) (1 diff)
• src/mm/page.c (modified) (1 diff)

kernel/arch/arm32/include/mm/frame.h

@@ -46 +46 @@
 
 #define BOOT_PAGE_TABLE_SIZE     0x4000
-#define BOOT_PAGE_TABLE_ADDRESS  0x8000
+
+#ifdef MACHINE_gta02
+#define BOOT_PAGE_TABLE_ADDRESS  0x30010000
+#else
+#define BOOT_PAGE_TABLE_ADDRESS  0x00008000
+#endif
 
 #define BOOT_PAGE_TABLE_START_FRAME     (BOOT_PAGE_TABLE_ADDRESS >> FRAME_WIDTH)
 #define BOOT_PAGE_TABLE_SIZE_IN_FRAMES  (BOOT_PAGE_TABLE_SIZE >> FRAME_WIDTH)
+
+#ifdef MACHINE_gta02
+#define PHYSMEM_START_ADDR      0x30008000
+#else
+#define PHYSMEM_START_ADDR      0x00000000
+#endif
 
 extern uintptr_t last_frame;

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -76 +76 @@
 /** Get extents of available memory.
  *
- * @param start         Place to store memory start address.
+ * @param start         Place to store memory start address (physical).
  * @param size          Place to store memory size.
  */
 static void gta02_get_memory_extents(uintptr_t *start, uintptr_t *size)
 {
-        *start = PA2KA(GTA02_MEMORY_START) + GTA02_MEMORY_SKIP;
+        *start = GTA02_MEMORY_START + GTA02_MEMORY_SKIP;
         *size  = GTA02_MEMORY_SIZE - GTA02_MEMORY_SKIP;
 }

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

@@ -56 +56 @@
         
         /* All memory as one zone */
-        zone_create(first_frame, num_frames,
+        zone_create(first_frame >> FRAME_WIDTH, num_frames,
             BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
         

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

@@ -58 +58 @@
         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);