]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
[PATCH] powerpc: Merge kexec
authorMichael Ellerman <michael@ellerman.id.au>
Mon, 14 Nov 2005 12:35:00 +0000 (23:35 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 9 Jan 2006 03:48:52 +0000 (14:48 +1100)
commit3d1229d6ae92ed1994f4411b8493327ef8f4b76f
treea50dbd6b52f1d653897147c48c57db28cefb69c7
parentafcc2472d80569059b5fe71fcb67e618b9d83fa8
[PATCH] powerpc: Merge kexec

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 493f25ef4087395891c99fcfe2c72e62e293e89f.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
14 files changed:
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/machine_kexec.c [new file with mode: 0644]
arch/powerpc/kernel/machine_kexec_32.c [new file with mode: 0644]
arch/powerpc/kernel/machine_kexec_64.c
arch/powerpc/kernel/misc_32.S
arch/powerpc/kernel/setup-common.c
arch/powerpc/platforms/cell/setup.c
arch/powerpc/platforms/maple/setup.c
arch/powerpc/platforms/powermac/nvram.c
arch/powerpc/platforms/powermac/setup.c
arch/powerpc/platforms/pseries/setup.c
arch/ppc/kernel/Makefile
include/asm-powerpc/kexec.h
include/asm-powerpc/machdep.h