diff options
| author | Vivek Goyal <vgoyal@in.ibm.com> | 2007-05-02 17:27:07 (GMT) |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 17:27:07 (GMT) |
| commit | 1ab60e0f72f71ec54831e525a3e1154f1c092408 (patch) | |
| tree | bd7dd8bbff43e3e2e3597f2b7780e82a856bb9d7 /arch/x86_64/kernel/suspend_asm.S | |
| parent | 0dbf7028c0c1f266c9631139450a1502d3cd457e (diff) | |
| download | linux-fsl-qoriq-1ab60e0f72f71ec54831e525a3e1154f1c092408.tar.xz | |
[PATCH] x86-64: Relocatable Kernel Support
This patch modifies the x86_64 kernel so that it can be loaded and run
at any 2M aligned address, below 512G. The technique used is to
compile the decompressor with -fPIC and modify it so the decompressor
is fully relocatable. For the main kernel the page tables are
modified so the kernel remains at the same virtual address. In
addition a variable phys_base is kept that holds the physical address
the kernel is loaded at. __pa_symbol is modified to add that when
we take the address of a kernel symbol.
When loaded with a normal bootloader the decompressor will decompress
the kernel to 2M and it will run there. This both ensures the
relocation code is always working, and makes it easier to use 2M
pages for the kernel and the cpu.
AK: changed to not make RELOCATABLE default in Kconfig
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/suspend_asm.S')
| -rw-r--r-- | arch/x86_64/kernel/suspend_asm.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/suspend_asm.S b/arch/x86_64/kernel/suspend_asm.S index bfbe007..16d183f 100644 --- a/arch/x86_64/kernel/suspend_asm.S +++ b/arch/x86_64/kernel/suspend_asm.S @@ -71,9 +71,10 @@ loop: jmp loop done: /* go back to the original page tables */ - leaq init_level4_pgt(%rip), %rax - subq $__START_KERNEL_map, %rax - movq %rax, %cr3 + movq $(init_level4_pgt - __START_KERNEL_map), %rax + addq phys_base(%rip), %rax + movq %rax, %cr3 + /* Flush TLB, including "global" things (vmalloc) */ movq mmu_cr4_features(%rip), %rax movq %rax, %rdx |