Changeset 6b326ea1 in mainline

Timestamp:

2011-11-17T13:51:41Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a55ddc64

Parents:

9d4e170

Message:

Allocate page tables from low memory so that it will be still possible
to use PA2KA when walking it.

Location:

kernel/genarch/src/mm

Files:

• as_pt.c (modified) (2 diffs)
• page_pt.c (modified) (3 diffs)

kernel/genarch/src/mm/as_pt.c

@@ -73 +73 @@
 pte_t *ptl0_create(unsigned int flags)
 {
-        pte_t *dst_ptl0 = (pte_t *) frame_alloc(PTL0_SIZE, FRAME_KA);
+        pte_t *dst_ptl0 = (pte_t *) frame_alloc(PTL0_SIZE,
+            FRAME_LOWMEM | FRAME_KA);
         size_t table_size = FRAME_SIZE << PTL0_SIZE;
         
@@ -89 +90 @@
                     (pte_t *) PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
                 
-                uintptr_t src =
-                    (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
-                uintptr_t dst =
-                    (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
+                uintptr_t src = (uintptr_t)
+                    &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
+                uintptr_t dst = (uintptr_t)
+                    &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
                 
                 memsetb(dst_ptl0, table_size, 0);

kernel/genarch/src/mm/page_pt.c

@@ -75 +75 @@
         
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *) frame_alloc(PTL1_SIZE, FRAME_KA);
+                pte_t *newpt = (pte_t *) frame_alloc(PTL1_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
                 memsetb(newpt, FRAME_SIZE << PTL1_SIZE, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
-                SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
+                SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page),
+                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_WRITE);
         }
         
@@ -84 +87 @@
         
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *) frame_alloc(PTL2_SIZE, FRAME_KA);
+                pte_t *newpt = (pte_t *) frame_alloc(PTL2_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
                 memsetb(newpt, FRAME_SIZE << PTL2_SIZE, 0);
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
-                SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
+                SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page),
+                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_WRITE);
         }
         
@@ -93 +99 @@
         
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *) frame_alloc(PTL3_SIZE, FRAME_KA);
+                pte_t *newpt = (pte_t *) frame_alloc(PTL3_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
                 memsetb(newpt, FRAME_SIZE << PTL3_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
-                SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
+                SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page),
+                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_WRITE);
         }