x64, x2apic/intr-remap: Interrupt-remapping and x2apic support, fix

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / relocate_kernel_64.S

diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
index e252c0ed953968656229c279cd5f32906638cf64..f5afe665a82b27f4aed8503b2ae4478b834a805a 100644 (file)
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -9,13 +9,15 @@
 #include <linux/linkage.h>
 #include <asm/page.h>
 #include <asm/kexec.h>
+#include <asm/processor-flags.h>
+#include <asm/pgtable.h>
 
 /*
  * Must be relocatable PIC code callable as a C function
  */
 
 #define PTR(x) (x << 3)
-#define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */
+#define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
 
        .text
        .align PAGE_SIZE
@@ -159,7 +161,7 @@ relocate_new_kernel:
        movq    %r9, %cr3
 
        /* setup a new stack at the end of the physical control page */
-       lea     4096(%r8), %rsp
+       lea     PAGE_SIZE(%r8), %rsp
 
        /* jump to identity mapped page */
        addq    $(identity_mapped - relocate_kernel), %r8
@@ -171,33 +173,22 @@ identity_mapped:
        pushq   %rdx
 
        /* Set cr0 to a known state:
-        * 31 1 == Paging enabled
-        * 18 0 == Alignment check disabled
-        * 16 0 == Write protect disabled
-        * 3  0 == No task switch
-        * 2  0 == Don't do FP software emulation.
-        * 0  1 == Proctected mode enabled
+        *  - Paging enabled
+        *  - Alignment check disabled
+        *  - Write protect disabled
+        *  - No task switch
+        *  - Don't do FP software emulation.
+        *  - Proctected mode enabled
         */
        movq    %cr0, %rax
-       andq    $~((1<<18)|(1<<16)|(1<<3)|(1<<2)), %rax
-       orl     $((1<<31)|(1<<0)), %eax
+       andq    $~(X86_CR0_AM | X86_CR0_WP | X86_CR0_TS | X86_CR0_EM), %rax
+       orl     $(X86_CR0_PG | X86_CR0_PE), %eax
        movq    %rax, %cr0
 
        /* Set cr4 to a known state:
-        * 10 0 == xmm exceptions disabled
-        * 9  0 == xmm registers instructions disabled
-        * 8  0 == performance monitoring counter disabled
-        * 7  0 == page global disabled
-        * 6  0 == machine check exceptions disabled
-        * 5  1 == physical address extension enabled
-        * 4  0 == page size extensions disabled
-        * 3  0 == Debug extensions disabled
-        * 2  0 == Time stamp disable (disabled)
-        * 1  0 == Protected mode virtual interrupts disabled
-        * 0  0 == VME disabled
+        *  - physical address extension enabled
         */
-
-       movq    $((1<<5)), %rax
+       movq    $X86_CR4_PAE, %rax
        movq    %rax, %cr4
 
        jmp 1f