2007-02-07 03:29:00 +07:00
|
|
|
/*
|
|
|
|
* relocate_kernel.S - put the kernel image in place to boot
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <asm/kexec.h>
|
|
|
|
|
|
|
|
.globl relocate_new_kernel
|
|
|
|
relocate_new_kernel:
|
|
|
|
|
[ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
This patch resolves a kexec boot failure that can occur because
no ATAGs are passed in to the kexec'd kernel. Currently the
newly-kexec'd kernel may fail if it requires specific ATAGs, or
it may fail because the fixed memory location at which it expects
to find the ATAGs may contain random data instead of ATAGs.
The patch ensures that any ATAGs passed to the current kernel
at boot time are copied to a static buffer, and are copied back
when kexec copies the new kernel into place. Thus the new
kernel sees the same ATAGs from kexec and the boot loader.
The boot parameters are copied without regard to type, content,
or length -- this patch's scope is limited soley to saving and
restoring a fixed-size block of memory containing the kernel's
boot parameters. Additional functionality to examine, alter, or
replace the ATAGs (using kexec, for example) can be implemented
by manipulating the static buffer containing the preserved ATAGs.
Note: the size of the buffer (1.5KB) is selected to comfortably
hold one of each ATAG type, including a maximum-length command
line and the maximum number of ATAG_MEM structures currently
supported by the kernel. Should an ATAG list exceed that limit,
the list will be silently truncated to that limit (to do other-
wise at that point in the boot process would make a simple
problem exceedingly complicated).
[Note: this is the same patch as 4579, modified to accomodate
the ATAG changes introduced in 2.6.23]
Signed-off-by: Mike Westerhof <mwester at dls.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-10-11 09:18:14 +07:00
|
|
|
/* Move boot params back to where the kernel expects them */
|
|
|
|
|
|
|
|
ldr r0,kexec_boot_params_address
|
|
|
|
teq r0,#0
|
|
|
|
beq 8f
|
|
|
|
|
|
|
|
ldr r1,kexec_boot_params_copy
|
|
|
|
mov r6,#KEXEC_BOOT_PARAMS_SIZE/4
|
|
|
|
7:
|
|
|
|
ldr r5,[r1],#4
|
|
|
|
str r5,[r0],#4
|
|
|
|
subs r6,r6,#1
|
|
|
|
bne 7b
|
|
|
|
|
|
|
|
8:
|
|
|
|
/* Boot params moved, now go on with the kernel */
|
|
|
|
|
2007-02-07 03:29:00 +07:00
|
|
|
ldr r0,kexec_indirection_page
|
|
|
|
ldr r1,kexec_start_address
|
|
|
|
|
|
|
|
|
|
|
|
0: /* top, read another word for the indirection page */
|
|
|
|
ldr r3, [r0],#4
|
|
|
|
|
|
|
|
/* Is it a destination page. Put destination address to r4 */
|
|
|
|
tst r3,#1,0
|
|
|
|
beq 1f
|
|
|
|
bic r4,r3,#1
|
|
|
|
b 0b
|
|
|
|
1:
|
|
|
|
/* Is it an indirection page */
|
|
|
|
tst r3,#2,0
|
|
|
|
beq 1f
|
|
|
|
bic r0,r3,#2
|
|
|
|
b 0b
|
|
|
|
1:
|
|
|
|
|
|
|
|
/* are we done ? */
|
|
|
|
tst r3,#4,0
|
|
|
|
beq 1f
|
|
|
|
b 2f
|
|
|
|
|
|
|
|
1:
|
|
|
|
/* is it source ? */
|
|
|
|
tst r3,#8,0
|
|
|
|
beq 0b
|
|
|
|
bic r3,r3,#8
|
|
|
|
mov r6,#1024
|
|
|
|
9:
|
|
|
|
ldr r5,[r3],#4
|
|
|
|
str r5,[r4],#4
|
|
|
|
subs r6,r6,#1
|
|
|
|
bne 9b
|
|
|
|
b 0b
|
|
|
|
|
|
|
|
2:
|
|
|
|
/* Jump to relocated kernel */
|
|
|
|
mov lr,r1
|
|
|
|
mov r0,#0
|
|
|
|
ldr r1,kexec_mach_type
|
[ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
This patch resolves a kexec boot failure that can occur because
no ATAGs are passed in to the kexec'd kernel. Currently the
newly-kexec'd kernel may fail if it requires specific ATAGs, or
it may fail because the fixed memory location at which it expects
to find the ATAGs may contain random data instead of ATAGs.
The patch ensures that any ATAGs passed to the current kernel
at boot time are copied to a static buffer, and are copied back
when kexec copies the new kernel into place. Thus the new
kernel sees the same ATAGs from kexec and the boot loader.
The boot parameters are copied without regard to type, content,
or length -- this patch's scope is limited soley to saving and
restoring a fixed-size block of memory containing the kernel's
boot parameters. Additional functionality to examine, alter, or
replace the ATAGs (using kexec, for example) can be implemented
by manipulating the static buffer containing the preserved ATAGs.
Note: the size of the buffer (1.5KB) is selected to comfortably
hold one of each ATAG type, including a maximum-length command
line and the maximum number of ATAG_MEM structures currently
supported by the kernel. Should an ATAG list exceed that limit,
the list will be silently truncated to that limit (to do other-
wise at that point in the boot process would make a simple
problem exceedingly complicated).
[Note: this is the same patch as 4579, modified to accomodate
the ATAG changes introduced in 2.6.23]
Signed-off-by: Mike Westerhof <mwester at dls.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-10-11 09:18:14 +07:00
|
|
|
ldr r2,kexec_boot_params_address
|
2007-02-07 03:29:00 +07:00
|
|
|
mov pc,lr
|
|
|
|
|
|
|
|
.globl kexec_start_address
|
|
|
|
kexec_start_address:
|
|
|
|
.long 0x0
|
|
|
|
|
|
|
|
.globl kexec_indirection_page
|
|
|
|
kexec_indirection_page:
|
|
|
|
.long 0x0
|
|
|
|
|
|
|
|
.globl kexec_mach_type
|
|
|
|
kexec_mach_type:
|
|
|
|
.long 0x0
|
|
|
|
|
[ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
This patch resolves a kexec boot failure that can occur because
no ATAGs are passed in to the kexec'd kernel. Currently the
newly-kexec'd kernel may fail if it requires specific ATAGs, or
it may fail because the fixed memory location at which it expects
to find the ATAGs may contain random data instead of ATAGs.
The patch ensures that any ATAGs passed to the current kernel
at boot time are copied to a static buffer, and are copied back
when kexec copies the new kernel into place. Thus the new
kernel sees the same ATAGs from kexec and the boot loader.
The boot parameters are copied without regard to type, content,
or length -- this patch's scope is limited soley to saving and
restoring a fixed-size block of memory containing the kernel's
boot parameters. Additional functionality to examine, alter, or
replace the ATAGs (using kexec, for example) can be implemented
by manipulating the static buffer containing the preserved ATAGs.
Note: the size of the buffer (1.5KB) is selected to comfortably
hold one of each ATAG type, including a maximum-length command
line and the maximum number of ATAG_MEM structures currently
supported by the kernel. Should an ATAG list exceed that limit,
the list will be silently truncated to that limit (to do other-
wise at that point in the boot process would make a simple
problem exceedingly complicated).
[Note: this is the same patch as 4579, modified to accomodate
the ATAG changes introduced in 2.6.23]
Signed-off-by: Mike Westerhof <mwester at dls.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-10-11 09:18:14 +07:00
|
|
|
/* phy addr where new kernel will expect to find boot params */
|
|
|
|
.globl kexec_boot_params_address
|
|
|
|
kexec_boot_params_address:
|
|
|
|
.long 0x0
|
|
|
|
|
|
|
|
/* phy addr where old kernel put a copy of orig boot params */
|
|
|
|
.globl kexec_boot_params_copy
|
|
|
|
kexec_boot_params_copy:
|
|
|
|
.long 0x0
|
|
|
|
|
2007-02-07 03:29:00 +07:00
|
|
|
relocate_new_kernel_end:
|
|
|
|
|
|
|
|
.globl relocate_new_kernel_size
|
|
|
|
relocate_new_kernel_size:
|
|
|
|
.long relocate_new_kernel_end - relocate_new_kernel
|
|
|
|
|
|
|
|
|