diff options
Diffstat (limited to 'arch/x86/kernel/relocate_kernel_32.S')
| -rw-r--r-- | arch/x86/kernel/relocate_kernel_32.S | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/arch/x86/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S index 6f50664b2ba5..a160f3119725 100644 --- a/arch/x86/kernel/relocate_kernel_32.S +++ b/arch/x86/kernel/relocate_kernel_32.S | |||
| @@ -10,15 +10,12 @@ | |||
| 10 | #include <asm/page.h> | 10 | #include <asm/page.h> |
| 11 | #include <asm/kexec.h> | 11 | #include <asm/kexec.h> |
| 12 | #include <asm/processor-flags.h> | 12 | #include <asm/processor-flags.h> |
| 13 | #include <asm/pgtable.h> | ||
| 14 | 13 | ||
| 15 | /* | 14 | /* |
| 16 | * Must be relocatable PIC code callable as a C function | 15 | * Must be relocatable PIC code callable as a C function |
| 17 | */ | 16 | */ |
| 18 | 17 | ||
| 19 | #define PTR(x) (x << 2) | 18 | #define PTR(x) (x << 2) |
| 20 | #define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY) | ||
| 21 | #define PAE_PGD_ATTR (_PAGE_PRESENT) | ||
| 22 | 19 | ||
| 23 | /* control_page + KEXEC_CONTROL_CODE_MAX_SIZE | 20 | /* control_page + KEXEC_CONTROL_CODE_MAX_SIZE |
| 24 | * ~ control_page + PAGE_SIZE are used as data storage and stack for | 21 | * ~ control_page + PAGE_SIZE are used as data storage and stack for |
| @@ -39,7 +36,6 @@ | |||
| 39 | #define CP_PA_BACKUP_PAGES_MAP DATA(0x1c) | 36 | #define CP_PA_BACKUP_PAGES_MAP DATA(0x1c) |
| 40 | 37 | ||
| 41 | .text | 38 | .text |
| 42 | .align PAGE_SIZE | ||
| 43 | .globl relocate_kernel | 39 | .globl relocate_kernel |
| 44 | relocate_kernel: | 40 | relocate_kernel: |
| 45 | /* Save the CPU context, used for jumping back */ | 41 | /* Save the CPU context, used for jumping back */ |
| @@ -60,117 +56,6 @@ relocate_kernel: | |||
| 60 | movl %cr4, %eax | 56 | movl %cr4, %eax |
| 61 | movl %eax, CR4(%edi) | 57 | movl %eax, CR4(%edi) |
| 62 | 58 | ||
| 63 | #ifdef CONFIG_X86_PAE | ||
| 64 | /* map the control page at its virtual address */ | ||
| 65 | |||
| 66 | movl PTR(VA_PGD)(%ebp), %edi | ||
| 67 | movl PTR(VA_CONTROL_PAGE)(%ebp), %eax | ||
| 68 | andl $0xc0000000, %eax | ||
| 69 | shrl $27, %eax | ||
| 70 | addl %edi, %eax | ||
| 71 | |||
| 72 | movl PTR(PA_PMD_0)(%ebp), %edx | ||
| 73 | orl $PAE_PGD_ATTR, %edx | ||
| 74 | movl %edx, (%eax) | ||
| 75 | |||
| 76 | movl PTR(VA_PMD_0)(%ebp), %edi | ||
| 77 | movl PTR(VA_CONTROL_PAGE)(%ebp), %eax | ||
| 78 | andl $0x3fe00000, %eax | ||
| 79 | shrl $18, %eax | ||
| 80 | addl %edi, %eax | ||
| 81 | |||
| 82 | movl PTR(PA_PTE_0)(%ebp), %edx | ||
| 83 | orl $PAGE_ATTR, %edx | ||
| 84 | movl %edx, (%eax) | ||
| 85 | |||
| 86 | movl PTR(VA_PTE_0)(%ebp), %edi | ||
| 87 | movl PTR(VA_CONTROL_PAGE)(%ebp), %eax | ||
| 88 | andl $0x001ff000, %eax | ||
| 89 | shrl $9, %eax | ||
| 90 | addl %edi, %eax | ||
| 91 | |||
| 92 | movl PTR(PA_CONTROL_PAGE)(%ebp), %edx | ||
| 93 | orl $PAGE_ATTR, %edx | ||
| 94 | movl %edx, (%eax) | ||
| 95 | |||
| 96 | /* identity map the control page at its physical address */ | ||
| 97 | |||
| 98 | movl PTR(VA_PGD)(%ebp), %edi | ||
| 99 | movl PTR(PA_CONTROL_PAGE)(%ebp), %eax | ||
| 100 | andl $0xc0000000, %eax | ||
| 101 | shrl $27, %eax | ||
| 102 | addl %edi, %eax | ||
| 103 | |||
| 104 | movl PTR(PA_PMD_1)(%ebp), %edx | ||
| 105 | orl $PAE_PGD_ATTR, %edx | ||
| 106 | movl %edx, (%eax) | ||
| 107 | |||
| 108 | movl PTR(VA_PMD_1)(%ebp), %edi | ||
| 109 | movl PTR(PA_CONTROL_PAGE)(%ebp), %eax | ||
| 110 | andl $0x3fe00000, %eax | ||
| 111 | shrl $18, %eax | ||
| 112 | addl %edi, %eax | ||
| 113 | |||
| 114 | movl PTR(PA_PTE_1)(%ebp), %edx | ||
| 115 | orl $PAGE_ATTR, %edx | ||
| 116 | movl %edx, (%eax) | ||
| 117 | |||
| 118 | movl PTR(VA_PTE_1)(%ebp), %edi | ||
| 119 | movl PTR(PA_CONTROL_PAGE)(%ebp), %eax | ||
| 120 | andl $0x001ff000, %eax | ||
| 121 | shrl $9, %eax | ||
| 122 | addl %edi, %eax | ||
| 123 | |||
| 124 | movl PTR(PA_CONTROL_PAGE)(%ebp), %edx | ||
| 125 | orl $PAGE_ATTR, %edx | ||
| 126 | movl %edx, (%eax) | ||
| 127 | #else | ||
| 128 | /* map the control page at its virtual address */ | ||
| 129 | |||
| 130 | movl PTR(VA_PGD)(%ebp), %edi | ||
| 131 | movl PTR(VA_CONTROL_PAGE)(%ebp), %eax | ||
| 132 | andl $0xffc00000, %eax | ||
| 133 | shrl $20, %eax | ||
| 134 | addl %edi, %eax | ||
| 135 | |||
| 136 | movl PTR(PA_PTE_0)(%ebp), %edx | ||
| 137 | orl $PAGE_ATTR, %edx | ||
| 138 | movl %edx, (%eax) | ||
| 139 | |||
| 140 | movl PTR(VA_PTE_0)(%ebp), %edi | ||
| 141 | movl PTR(VA_CONTROL_PAGE)(%ebp), %eax | ||
| 142 | andl $0x003ff000, %eax | ||
| 143 | shrl $10, %eax | ||
| 144 | addl %edi, %eax | ||
| 145 | |||
| 146 | movl PTR(PA_CONTROL_PAGE)(%ebp), %edx | ||
| 147 | orl $PAGE_ATTR, %edx | ||
| 148 | movl %edx, (%eax) | ||
| 149 | |||
| 150 | /* identity map the control page at its physical address */ | ||
| 151 | |||
| 152 | movl PTR(VA_PGD)(%ebp), %edi | ||
| 153 | movl PTR(PA_CONTROL_PAGE)(%ebp), %eax | ||
| 154 | andl $0xffc00000, %eax | ||
| 155 | shrl $20, %eax | ||
| 156 | addl %edi, %eax | ||
| 157 | |||
| 158 | movl PTR(PA_PTE_1)(%ebp), %edx | ||
| 159 | orl $PAGE_ATTR, %edx | ||
| 160 | movl %edx, (%eax) | ||
| 161 | |||
| 162 | movl PTR(VA_PTE_1)(%ebp), %edi | ||
| 163 | movl PTR(PA_CONTROL_PAGE)(%ebp), %eax | ||
| 164 | andl $0x003ff000, %eax | ||
| 165 | shrl $10, %eax | ||
| 166 | addl %edi, %eax | ||
| 167 | |||
| 168 | movl PTR(PA_CONTROL_PAGE)(%ebp), %edx | ||
| 169 | orl $PAGE_ATTR, %edx | ||
| 170 | movl %edx, (%eax) | ||
| 171 | #endif | ||
| 172 | |||
| 173 | relocate_new_kernel: | ||
| 174 | /* read the arguments and say goodbye to the stack */ | 59 | /* read the arguments and say goodbye to the stack */ |
| 175 | movl 20+4(%esp), %ebx /* page_list */ | 60 | movl 20+4(%esp), %ebx /* page_list */ |
| 176 | movl 20+8(%esp), %ebp /* list of pages */ | 61 | movl 20+8(%esp), %ebp /* list of pages */ |