Changeset 80d301ab in mainline for kernel/arch/ia32/src/mm/page.c

Timestamp:

2011-11-17T12:45:37Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9d4e170

Parents:

ce940da

Message:

Add amd64 and ia32 support for frame_low/high_arch_init().

File:

• kernel/arch/ia32/src/mm/page.c (modified) (2 diffs)

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

@@ -49 +49 @@
 #include <print.h>
 #include <interrupt.h>
+#include <macros.h>
 
 void page_arch_init(void)
@@ -55 +56 @@
         int flags;
         
-        if (config.cpu_active == 1) {
-                page_mapping_operations = &pt_mapping_operations;
+        if (config.cpu_active > 1) {
+                /* Fast path for non-boot CPUs */
+                write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
+                paging_on();
+                return;
+        }
+
+        page_mapping_operations = &pt_mapping_operations;
         
-                /*
-                 * PA2KA(identity) mapping for all frames until last_frame.
-                 */
-                page_table_lock(AS_KERNEL, true);
-                for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
-                        flags = PAGE_CACHEABLE | PAGE_WRITE;
-                        if ((PA2KA(cur) >= config.base) && (PA2KA(cur) < config.base + config.kernel_size))
-                                flags |= PAGE_GLOBAL;
-                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
-                }
-                page_table_unlock(AS_KERNEL, true);
+        /*
+         * PA2KA(identity) mapping for all frames until last_frame.
+         */
+        page_table_lock(AS_KERNEL, true);
+        for (cur = 0; cur < min(config.identity_size, last_frame);
+            cur += FRAME_SIZE) {
+                flags = PAGE_CACHEABLE | PAGE_WRITE;
+                if ((PA2KA(cur) >= config.base) && (PA2KA(cur) <
+                    config.base + config.kernel_size))
+                        flags |= PAGE_GLOBAL;
+                page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
+        }
+        page_table_unlock(AS_KERNEL, true);
                 
-                exc_register(14, "page_fault", true, (iroutine_t) page_fault);
-                write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
-        } else
-                write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
+        exc_register(14, "page_fault", true, (iroutine_t) page_fault);
+        write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
         
         paging_on();