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>
66 lines
1.9 KiB
C
66 lines
1.9 KiB
C
/*
|
|
* PPC32 code to handle Linux booting another kernel.
|
|
*
|
|
* Copyright (C) 2002-2003 Eric Biederman <ebiederm@xmission.com>
|
|
* GameCube/ppc32 port Copyright (C) 2004 Albert Herranz
|
|
* Copyright (C) 2005 IBM Corporation.
|
|
*
|
|
* This source code is licensed under the GNU General Public License,
|
|
* Version 2. See the file COPYING for more details.
|
|
*/
|
|
|
|
#include <linux/kexec.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/string.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/hw_irq.h>
|
|
#include <asm/io.h>
|
|
|
|
typedef NORET_TYPE void (*relocate_new_kernel_t)(
|
|
unsigned long indirection_page,
|
|
unsigned long reboot_code_buffer,
|
|
unsigned long start_address) ATTRIB_NORET;
|
|
|
|
/*
|
|
* This is a generic machine_kexec function suitable at least for
|
|
* non-OpenFirmware embedded platforms.
|
|
* It merely copies the image relocation code to the control page and
|
|
* jumps to it.
|
|
* A platform specific function may just call this one.
|
|
*/
|
|
void default_machine_kexec(struct kimage *image)
|
|
{
|
|
const extern unsigned char relocate_new_kernel[];
|
|
const extern unsigned int relocate_new_kernel_size;
|
|
unsigned long page_list;
|
|
unsigned long reboot_code_buffer, reboot_code_buffer_phys;
|
|
relocate_new_kernel_t rnk;
|
|
|
|
/* Interrupts aren't acceptable while we reboot */
|
|
local_irq_disable();
|
|
|
|
page_list = image->head;
|
|
|
|
/* we need both effective and real address here */
|
|
reboot_code_buffer =
|
|
(unsigned long)page_address(image->control_code_page);
|
|
reboot_code_buffer_phys = virt_to_phys((void *)reboot_code_buffer);
|
|
|
|
/* copy our kernel relocation code to the control code page */
|
|
memcpy((void *)reboot_code_buffer, relocate_new_kernel,
|
|
relocate_new_kernel_size);
|
|
|
|
flush_icache_range(reboot_code_buffer,
|
|
reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);
|
|
printk(KERN_INFO "Bye!\n");
|
|
|
|
/* now call it */
|
|
rnk = (relocate_new_kernel_t) reboot_code_buffer;
|
|
(*rnk)(page_list, reboot_code_buffer_phys, image->start);
|
|
}
|
|
|
|
int default_machine_kexec_prepare(struct kimage *image)
|
|
{
|
|
return 0;
|
|
}
|