Changeset 3fe58d3c in mainline for kernel/arch

Timestamp:

2012-01-20T22:35:26Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e86b8f0

Parents:

321052f7 (diff), 7943c43 (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 from lp:~jakub/helenos/mm.

Location:

kernel/arch

Files:

• arm32/include/mm/km.h (modified) (1 diff)
• arm32/src/mm/page.c (modified) (1 diff)
• ia32/src/mm/frame.c (modified) (1 diff)

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

@@ -39 +39 @@
 
 #define KM_ARM32_IDENTITY_START         UINT32_C(0x80000000)
-#define KM_ARM32_IDENTITY_SIZE          UINT32_C(0x40000000)
+#define KM_ARM32_IDENTITY_SIZE          UINT32_C(0x70000000)
 
-#define KM_ARM32_NON_IDENTITY_START     UINT32_C(0xc0000000)
-#define KM_ARM32_NON_IDENTITY_SIZE      UINT32_C(0x40000000)
+#define KM_ARM32_NON_IDENTITY_START     UINT32_C(0xf0000000)
+/*
+ * The last virtual megabyte contains the high exception vectors (0xFFFF0000).
+ * Do not include this range into kernel non-identity.
+ */
+#define KM_ARM32_NON_IDENTITY_SIZE      UINT32_C(0x0ff00000)
 
 extern void km_identity_arch_init(void);

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

@@ -65 +65 @@
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         
+#ifdef HIGH_EXCEPTION_VECTORS
         /* 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);
+        uintptr_t ev_frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_NONE);
+        page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, ev_frame, flags);
 #else
 #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);

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

@@ -54 +54 @@
         
         for (i = 0; i < e820counter; i++) {
-                uintptr_t base = (uintptr_t) e820table[i].base_address;
-                size_t size = (size_t) e820table[i].size;
+                uint64_t base64 = e820table[i].base_address;
+                uint64_t size64 = e820table[i].size;
+
+#ifdef KARCH_ia32
+                /*
+                 * Restrict the e820 table entries to 32-bits.
+                 */
+                if (base64 >= 0x100000000ULL)
+                        continue;
+                if (base64 + size64 > 0x100000000ULL)
+                        size64 -= base64 + size64 - 0x100000000ULL;
+#endif
+
+                uintptr_t base = (uintptr_t) base64;
+                size_t size = (size_t) size64;
                 
                 if (!frame_adjust_zone_bounds(low, &base, &size))