Changeset 19077a5 in mainline for kernel/arch/amd64/src/smp/ap.S

Timestamp:

2008-01-25T16:45:42Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9415601

Parents:

a7df23c

Message:

Grow the initial identity mapping from 64M to 4G.
We should not allocate GDT's from above 4G or the amd64 will occassionally
triple-fault again.

File:

• kernel/arch/amd64/src/smp/ap.S (modified) (5 diffs)

kernel/arch/amd64/src/smp/ap.S

@@ -1 +1 @@
 #
-# Copyright (c) 2001-2004 Jakub Jermar
+# Copyright (c) 2008 Jakub Jermar
 # Copyright (c) 2005-2006 Martin Decky
 # All rights reserved.
@@ -46 +46 @@
 
 # This piece of code is real-mode and is meant to be alligned at 4K boundary.
-# The requirement for such an alignment comes from MP Specification's STARTUP IPI
-# requirements.
+# The requirement for such an alignment comes from MP Specification's STARTUP
+# IPI requirements.
 
 .align 4096
@@ -60 +60 @@
         movl %cr0, %eax
         orl $1, %eax
-        movl %eax, %cr0                         # switch to protected mode
+        movl %eax, %cr0         # switch to protected mode
         jmpl $gdtselector(KTEXT32_DES), $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET
         
@@ -83 +83 @@
         
         # Enable long mode
-        movl $EFER_MSR_NUM, %ecx   # EFER MSR number
-        rdmsr                   # Read EFER
-        btsl $AMD_LME_FLAG, %eax            # Set LME=1
-        wrmsr                   # Write EFER
+        movl $EFER_MSR_NUM, %ecx        # EFER MSR number
+        rdmsr                           # Read EFER
+        btsl $AMD_LME_FLAG, %eax        # Set LME=1
+        wrmsr                           # Write EFER
         
         # Enable paging to activate long mode (set CR0.PG=1)
@@ -108 +108 @@
 
 .global unmapped_ap_gdtr
-
 unmapped_ap_gdtr:
         .word 0