Changeset 4cc2ddd in mainline

Timestamp:

2008-01-15T13:19:35Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

62da45a

Parents:

22e8166d

Message:

amd64: shorten kernel address space by 2 GB to support proper mapping of more than 2 GB of physical memory

Location:

kernel

Files:

• arch/amd64/include/mm/as.h (modified) (1 diff)
• arch/amd64/src/amd64.c (modified) (5 diffs)
• arch/amd64/src/mm/page.c (modified) (2 diffs)
• arch/ia32/src/mm/frame.c (modified) (3 diffs)
• generic/src/console/console.c (modified) (1 diff)

kernel/arch/amd64/include/mm/as.h

@@ -39 +39 @@
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         (unsigned long) 0xffff800000000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH           (unsigned long) 0xffffffffffffffff
+#define KERNEL_ADDRESS_SPACE_END_ARCH           (unsigned long) 0xffffffff80000000
 #define USER_ADDRESS_SPACE_START_ARCH           (unsigned long) 0x0000000000000000
 #define USER_ADDRESS_SPACE_END_ARCH             (unsigned long) 0x00007fffffffffff

kernel/arch/amd64/src/amd64.c

@@ -72 +72 @@
 static void clean_IOPL_NT_flags(void)
 {
-        asm
-        (
-                "pushfq;"
-                "pop %%rax;"
-                "and $~(0x7000),%%rax;"
-                "pushq %%rax;"
-                "popfq;"
-                :
-                :
-                :"%rax"
+        asm (
+                "pushfq\n"
+                "pop %%rax\n"
+                "and $~(0x7000), %%rax\n"
+                "pushq %%rax\n"
+                "popfq\n"
+                :
+                :
+                : "%rax"
         );
 }
@@ -91 +90 @@
 static void clean_AM_flag(void)
 {
-        asm
-        (
-                "mov %%cr0,%%rax;"
-                "and $~(0x40000),%%rax;"
-                "mov %%rax,%%cr0;"
-                :
-                :
-                :"%rax"
+        asm (
+                "mov %%cr0, %%rax\n"
+                "and $~(0x40000), %%rax\n"
+                "mov %%rax, %%cr0\n"
+                :
+                :
+                : "%rax"
         );
 }
@@ -128 +126 @@
 }
 
+
 void arch_post_mm_init(void)
 {
@@ -136 +135 @@
                 /* hard clock */
                 i8254_init();
-
+                                
 #ifdef CONFIG_FB
                 if (vesa_present()) 
@@ -149 +148 @@
                 zone_merge_all();
         }
+        
         /* Setup fast SYSCALL/SYSRET */
         syscall_setup_cpu();
-        
 }
 

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

@@ -88 +88 @@
         if (config.cpu_active == 1) {
                 page_mapping_operations = &pt_mapping_operations;
-                
+
                 /*
                  * PA2KA(identity) mapping for all frames.
@@ -96 +96 @@
                         page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, identity_flags);
                 }
+                
                 /* Upper kernel mapping
                  * - from zero to top of kernel (include bottom addresses
-                 *   because some are needed for init )
+                 *   because some are needed for init)
                  */
                 for (cur = PA2KA_CODE(0); cur < config.base + config.kernel_size; cur += FRAME_SIZE)

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

@@ -62 +62 @@
         for (i = 0; i < e820counter; i++) {
                 if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
-                        start = ADDR2PFN(ALIGN_UP(e820table[i].base_address,
-                                                  FRAME_SIZE));
-                        size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size,
-                                                   FRAME_SIZE));
-                        if (minconf < start || minconf >= start + size)
+                        start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE));
+                        size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE));
+                        if ((minconf < start) || (minconf >= start + size))
                                 conf = start;
                         else
@@ -112 +110 @@
 {
         static pfn_t minconf;
-
+        
         if (config.cpu_active == 1) {
                 cmd_initialize(&e820_info);
                 cmd_register(&e820_info);
 
-
                 minconf = 1;
 #ifdef CONFIG_SMP
                 minconf = max(minconf,
-                              ADDR2PFN(AP_BOOT_OFFSET+hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size));
+                        ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size));
 #endif
 #ifdef CONFIG_SIMICS_FIX
@@ -134 +131 @@
                 /* Reserve AP real mode bootstrap memory */
                 frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH, 
-                                       (hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
+                        (hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
                 
 #ifdef CONFIG_SIMICS_FIX
                 /* Don't know why, but these addresses help */
-                frame_mark_unavailable(0xd000 >> FRAME_WIDTH,3);
+                frame_mark_unavailable(0xd000 >> FRAME_WIDTH, 3);
 #endif
 #endif

kernel/generic/src/console/console.c

@@ -61 +61 @@
         .write = null_putchar
 };
+
 chardev_t null_stdout = {
         .name = "null",