diff options
| author | Suzuki K. Poulose <suzuki@in.ibm.com> | 2011-07-12 15:20:40 +0530 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-07-13 11:39:58 +0900 |
| commit | 13f6d71bdf9836b90ae4ec21209383f1a3c56b0f (patch) | |
| tree | 21eb51a4571b379ca52942fd41e304afb367a681 /purgatory | |
| parent | 9ec3fac7e8840fb31891ba49a626c5dd33e09e86 (diff) | |
| download | kexec-tools-13f6d71bdf9836b90ae4ec21209383f1a3c56b0f.tar.gz | |
kexec-tools: ppc32: Fixup ThreadPointer for purgatory code
PPC32 ELF ABI expects r2 to be loaded with Thread Pointer, which is 0x7000
bytes past the end of TCB. Though the purgatory is single threaded, it uses
TCB scratch space in vsnprintf(). This patch allocates a 1024byte TCB
and populates the TP with the address accordingly.
Changes from V2: Avoid address overflow in TP allocation.
Changes from V1: Fixed the addr calculation for uImage support.
Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
Cc: Ryan S. Arnold <rsa@us.ibm.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'purgatory')
| -rw-r--r-- | purgatory/arch/ppc/purgatory-ppc.c | 2 | ||||
| -rw-r--r-- | purgatory/arch/ppc/v2wrap_32.S | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/purgatory/arch/ppc/purgatory-ppc.c b/purgatory/arch/ppc/purgatory-ppc.c index 349e7505..3e6b354a 100644 --- a/purgatory/arch/ppc/purgatory-ppc.c +++ b/purgatory/arch/ppc/purgatory-ppc.c @@ -26,7 +26,7 @@ unsigned int panic_kernel = 0; unsigned long backup_start = 0; unsigned long stack = 0; unsigned long dt_offset = 0; -unsigned long my_toc = 0; +unsigned long my_thread_ptr = 0; unsigned long kernel = 0; void setup_arch(void) diff --git a/purgatory/arch/ppc/v2wrap_32.S b/purgatory/arch/ppc/v2wrap_32.S index 8442d162..8b60677d 100644 --- a/purgatory/arch/ppc/v2wrap_32.S +++ b/purgatory/arch/ppc/v2wrap_32.S @@ -56,6 +56,10 @@ master: mr 17,3 # save cpu id to r17 mr 15,4 # save physical address in reg15 + lis 6,my_thread_ptr@h + ori 6,6,my_thread_ptr@l + lwz 2,0(6) # setup ThreadPointer(TP) + lis 6,stack@h ori 6,6,stack@l lwz 1,0(6) #setup stack |