3d1229d6ae
This patch merges, to some extent, the PPC32 and PPC64 kexec implementations.
We adopt the PPC32 approach of having ppc_md callbacks for the kexec functions.
The current PPC64 implementation becomes the "default" implementation for PPC64
which platforms can select if they need no special treatment.
I've added these default callbacks to pseries/maple/cell/powermac, this means
iSeries no longer supports kexec - but it never worked anyway.
I've renamed PPC32's machine_kexec_simple to default_machine_kexec, inline with
PPC64. Judging by the comments it might be better named machine_kexec_non_of,
or something, but at the moment it's the only implementation for PPC32 so it's
the "default".
Kexec requires machine_shutdown(), which is in machine_kexec.c on PPC32, but we
already have in setup-common.c on powerpc. All this does is call
ppc_md.nvram_sync, which only powermac implements, so instead make
machine_shutdown a ppc_md member and have it call core99_nvram_sync directly
on powermac.
I've also stuck relocate_kernel.S into misc_32.S for powerpc.
Built for ARCH=ppc, and 32 & 64 bit ARCH=powerpc, with KEXEC=y/n. Booted on
P5 LPAR and successfully kexec'ed.
Should apply on top of 493f25ef40.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
51 lines
1.3 KiB
C
51 lines
1.3 KiB
C
#ifndef _ASM_POWERPC_KEXEC_H
|
|
#define _ASM_POWERPC_KEXEC_H
|
|
|
|
/*
|
|
* Maximum page that is mapped directly into kernel memory.
|
|
* XXX: Since we copy virt we can use any page we allocate
|
|
*/
|
|
#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
|
|
|
|
/*
|
|
* Maximum address we can reach in physical address mode.
|
|
* XXX: I want to allow initrd in highmem. Otherwise set to rmo on LPAR.
|
|
*/
|
|
#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
|
|
|
|
/* Maximum address we can use for the control code buffer */
|
|
#ifdef __powerpc64__
|
|
#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)
|
|
#else
|
|
/* TASK_SIZE, probably left over from use_mm ?? */
|
|
#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
|
|
#endif
|
|
|
|
#define KEXEC_CONTROL_CODE_SIZE 4096
|
|
|
|
/* The native architecture */
|
|
#ifdef __powerpc64__
|
|
#define KEXEC_ARCH KEXEC_ARCH_PPC64
|
|
#else
|
|
#define KEXEC_ARCH KEXEC_ARCH_PPC
|
|
#endif
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#define MAX_NOTE_BYTES 1024
|
|
typedef u32 note_buf_t[MAX_NOTE_BYTES / sizeof(u32)];
|
|
|
|
extern note_buf_t crash_notes[];
|
|
|
|
#ifdef __powerpc64__
|
|
extern void kexec_smp_wait(void); /* get and clear naca physid, wait for
|
|
master to copy new code to 0 */
|
|
extern void __init kexec_setup(void);
|
|
#endif
|
|
|
|
struct kimage;
|
|
extern void default_machine_kexec(struct kimage *image);
|
|
extern int default_machine_kexec_prepare(struct kimage *image);
|
|
|
|
#endif /* ! __ASSEMBLY__ */
|
|
#endif /* _ASM_POWERPC_KEXEC_H */
|