Changeset 6b781c0 in mainline for kernel/genarch

Timestamp:

2007-06-08T15:02:49Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c03ee1c

Parents:

3ee8a075

Message:

Merge arm32 into trunk.

Location:

kernel/genarch

Files:

• include/mm/page_pt.h (modified) (1 diff)
• src/mm/as_pt.c (modified) (2 diffs)
• src/mm/page_pt.c (modified) (3 diffs)

kernel/genarch/include/mm/page_pt.h

@@ -55 +55 @@
 #define PTL2_ENTRIES                    PTL2_ENTRIES_ARCH
 #define PTL3_ENTRIES                    PTL3_ENTRIES_ARCH
+
+/* Table sizes in each level */
+#define PTL0_SIZE                       PTL0_SIZE_ARCH
+#define PTL1_SIZE                       PTL1_SIZE_ARCH
+#define PTL2_SIZE                       PTL2_SIZE_ARCH
+#define PTL3_SIZE                       PTL3_SIZE_ARCH
 
 /*

kernel/genarch/src/mm/as_pt.c

@@ -98 +98 @@
         pte_t *src_ptl0, *dst_ptl0;
         ipl_t ipl;
+        int table_size;
 
-        dst_ptl0 = (pte_t *) frame_alloc(ONE_FRAME, FRAME_KA);
+        dst_ptl0 = (pte_t *) frame_alloc(PTL0_SIZE, FRAME_KA);
+        table_size = FRAME_SIZE << PTL0_SIZE;
 
         if (flags & FLAG_AS_KERNEL) {
-                memsetb((uintptr_t) dst_ptl0, PAGE_SIZE, 0);
+                memsetb((uintptr_t) dst_ptl0, table_size, 0);
         } else {
                 uintptr_t src, dst;
@@ -117 +119 @@
                 dst = (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
 
-                memsetb((uintptr_t) dst_ptl0, PAGE_SIZE, 0);
-                memcpy((void *) dst, (void *) src, PAGE_SIZE - (src - (uintptr_t) src_ptl0));
+                memsetb((uintptr_t) dst_ptl0, table_size, 0);
+                memcpy((void *) dst, (void *) src, table_size - (src - (uintptr_t) src_ptl0));
                 mutex_unlock(&AS_KERNEL->lock);
                 interrupts_restore(ipl);

kernel/genarch/src/mm/page_pt.c

@@ -76 +76 @@
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-                memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(PTL1_SIZE, FRAME_KA);
+                memsetb((uintptr_t)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);
@@ -85 +85 @@
 
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-                memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(PTL2_SIZE, FRAME_KA);
+                memsetb((uintptr_t)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);
@@ -94 +94 @@
 
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-                memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(PTL3_SIZE, FRAME_KA);
+                memsetb((uintptr_t)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);