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

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -55 +55 @@
         xorw %ax, %ax
         movw %ax, %ds
-
-        lgdtl ap_gdtr           # initialize Global Descriptor Table register
+        
+        lgdtl ap_gdtr       # initialize Global Descriptor Table register
         
         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
-        
+
 jump_to_kernel:
 .code32
@@ -72 +72 @@
         movw %ax, %gs
         
-        # Enable 64-bit page transaltion entries - CR4.PAE = 1.
+        # Enable 64-bit page transaltion entries (CR4.PAE = 1).
         # Paging is not enabled until after long mode is enabled
         
@@ -78 +78 @@
         btsl $5, %eax
         movl %eax, %cr4
-
+        
         leal ptl_0, %eax
         movl %eax, %cr3
         
         # 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)
+        # Enable paging to activate long mode (set CR0.PG = 1)
         movl %cr0, %eax
         btsl $31, %eax
@@ -98 +98 @@
 .code64
 start64:
-        movq (ctx), %rsp
+        movabsq $ctx, %rsp
+        movq (%rsp), %rsp
+        
         pushq $0
         movq %rsp, %rbp
-        call main_ap - AP_BOOT_OFFSET + BOOT_OFFSET   # never returns
+        
+        movabsq $main_ap, %rax
+        callq *%rax   # never returns
 
 #endif /* CONFIG_SMP */