2005-04-17 02:20:36 +04:00
|
|
|
/*
|
2005-10-29 16:07:56 +04:00
|
|
|
* Maple (970 eval board) setup code
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* (c) Copyright 2004 Benjamin Herrenschmidt (benh@kernel.crashing.org),
|
|
|
|
* IBM Corp.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2006-07-03 11:22:05 +04:00
|
|
|
#undef DEBUG
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/stddef.h>
|
|
|
|
#include <linux/unistd.h>
|
|
|
|
#include <linux/ptrace.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/user.h>
|
|
|
|
#include <linux/a.out.h>
|
|
|
|
#include <linux/tty.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/ioport.h>
|
|
|
|
#include <linux/major.h>
|
|
|
|
#include <linux/initrd.h>
|
|
|
|
#include <linux/vt_kern.h>
|
|
|
|
#include <linux/console.h>
|
|
|
|
#include <linux/pci.h>
|
|
|
|
#include <linux/adb.h>
|
|
|
|
#include <linux/cuda.h>
|
|
|
|
#include <linux/pmu.h>
|
|
|
|
#include <linux/irq.h>
|
|
|
|
#include <linux/seq_file.h>
|
|
|
|
#include <linux/root_dev.h>
|
|
|
|
#include <linux/serial.h>
|
|
|
|
#include <linux/smp.h>
|
2007-10-19 10:40:25 +04:00
|
|
|
#include <linux/bitops.h>
|
2008-01-07 21:07:15 +03:00
|
|
|
#include <linux/of_device.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#include <asm/processor.h>
|
|
|
|
#include <asm/sections.h>
|
|
|
|
#include <asm/prom.h>
|
|
|
|
#include <asm/system.h>
|
|
|
|
#include <asm/pgtable.h>
|
|
|
|
#include <asm/io.h>
|
[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>
2005-11-14 15:35:00 +03:00
|
|
|
#include <asm/kexec.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <asm/pci-bridge.h>
|
|
|
|
#include <asm/iommu.h>
|
|
|
|
#include <asm/machdep.h>
|
|
|
|
#include <asm/dma.h>
|
|
|
|
#include <asm/cputable.h>
|
|
|
|
#include <asm/time.h>
|
|
|
|
#include <asm/lmb.h>
|
2005-09-27 07:51:59 +04:00
|
|
|
#include <asm/mpic.h>
|
2006-12-07 03:50:46 +03:00
|
|
|
#include <asm/rtas.h>
|
2005-10-10 16:50:37 +04:00
|
|
|
#include <asm/udbg.h>
|
2007-02-06 05:01:15 +03:00
|
|
|
#include <asm/nvram.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-10-29 16:07:56 +04:00
|
|
|
#include "maple.h"
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifdef DEBUG
|
|
|
|
#define DBG(fmt...) udbg_printf(fmt)
|
|
|
|
#else
|
|
|
|
#define DBG(fmt...)
|
|
|
|
#endif
|
|
|
|
|
2006-01-14 08:35:35 +03:00
|
|
|
static unsigned long maple_find_nvram_base(void)
|
|
|
|
{
|
|
|
|
struct device_node *rtcs;
|
|
|
|
unsigned long result = 0;
|
|
|
|
|
|
|
|
/* find NVRAM device */
|
|
|
|
rtcs = of_find_compatible_node(NULL, "nvram", "AMD8111");
|
|
|
|
if (rtcs) {
|
|
|
|
struct resource r;
|
|
|
|
if (of_address_to_resource(rtcs, 0, &r)) {
|
|
|
|
printk(KERN_EMERG "Maple: Unable to translate NVRAM"
|
|
|
|
" address\n");
|
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
if (!(r.flags & IORESOURCE_IO)) {
|
|
|
|
printk(KERN_EMERG "Maple: NVRAM address isn't PIO!\n");
|
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
result = r.start;
|
|
|
|
} else
|
|
|
|
printk(KERN_EMERG "Maple: Unable to find NVRAM\n");
|
|
|
|
bail:
|
|
|
|
of_node_put(rtcs);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
static void maple_restart(char *cmd)
|
|
|
|
{
|
2005-06-23 11:14:39 +04:00
|
|
|
unsigned int maple_nvram_base;
|
2006-07-12 09:40:17 +04:00
|
|
|
const unsigned int *maple_nvram_offset, *maple_nvram_command;
|
2006-01-14 08:35:35 +03:00
|
|
|
struct device_node *sp;
|
2005-06-23 11:14:39 +04:00
|
|
|
|
2006-01-14 08:35:35 +03:00
|
|
|
maple_nvram_base = maple_find_nvram_base();
|
|
|
|
if (maple_nvram_base == 0)
|
|
|
|
goto fail;
|
2005-06-23 11:14:39 +04:00
|
|
|
|
|
|
|
/* find service processor device */
|
2006-01-14 08:35:35 +03:00
|
|
|
sp = of_find_node_by_name(NULL, "service-processor");
|
|
|
|
if (!sp) {
|
2005-06-23 11:14:39 +04:00
|
|
|
printk(KERN_EMERG "Maple: Unable to find Service Processor\n");
|
2006-01-14 08:35:35 +03:00
|
|
|
goto fail;
|
2005-06-23 11:14:39 +04:00
|
|
|
}
|
2007-04-03 16:26:41 +04:00
|
|
|
maple_nvram_offset = of_get_property(sp, "restart-addr", NULL);
|
|
|
|
maple_nvram_command = of_get_property(sp, "restart-value", NULL);
|
2006-01-14 08:35:35 +03:00
|
|
|
of_node_put(sp);
|
2005-06-23 11:14:39 +04:00
|
|
|
|
|
|
|
/* send command */
|
2006-07-12 09:40:17 +04:00
|
|
|
outb_p(*maple_nvram_command, maple_nvram_base + *maple_nvram_offset);
|
2005-06-23 11:14:39 +04:00
|
|
|
for (;;) ;
|
2006-01-14 08:35:35 +03:00
|
|
|
fail:
|
|
|
|
printk(KERN_EMERG "Maple: Manual Restart Required\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void maple_power_off(void)
|
|
|
|
{
|
2005-06-23 11:14:39 +04:00
|
|
|
unsigned int maple_nvram_base;
|
2006-07-12 09:40:17 +04:00
|
|
|
const unsigned int *maple_nvram_offset, *maple_nvram_command;
|
2006-01-14 08:35:35 +03:00
|
|
|
struct device_node *sp;
|
2005-06-23 11:14:39 +04:00
|
|
|
|
2006-01-14 08:35:35 +03:00
|
|
|
maple_nvram_base = maple_find_nvram_base();
|
|
|
|
if (maple_nvram_base == 0)
|
|
|
|
goto fail;
|
2005-06-23 11:14:39 +04:00
|
|
|
|
|
|
|
/* find service processor device */
|
2006-01-14 08:35:35 +03:00
|
|
|
sp = of_find_node_by_name(NULL, "service-processor");
|
|
|
|
if (!sp) {
|
2005-06-23 11:14:39 +04:00
|
|
|
printk(KERN_EMERG "Maple: Unable to find Service Processor\n");
|
2006-01-14 08:35:35 +03:00
|
|
|
goto fail;
|
2005-06-23 11:14:39 +04:00
|
|
|
}
|
2007-04-03 16:26:41 +04:00
|
|
|
maple_nvram_offset = of_get_property(sp, "power-off-addr", NULL);
|
|
|
|
maple_nvram_command = of_get_property(sp, "power-off-value", NULL);
|
2006-01-14 08:35:35 +03:00
|
|
|
of_node_put(sp);
|
2005-06-23 11:14:39 +04:00
|
|
|
|
|
|
|
/* send command */
|
2006-07-12 09:40:17 +04:00
|
|
|
outb_p(*maple_nvram_command, maple_nvram_base + *maple_nvram_offset);
|
2005-06-23 11:14:39 +04:00
|
|
|
for (;;) ;
|
2006-01-14 08:35:35 +03:00
|
|
|
fail:
|
|
|
|
printk(KERN_EMERG "Maple: Manual Power-Down Required\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void maple_halt(void)
|
|
|
|
{
|
2005-06-23 11:14:39 +04:00
|
|
|
maple_power_off();
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
struct smp_ops_t maple_smp_ops = {
|
|
|
|
.probe = smp_mpic_probe,
|
|
|
|
.message_pass = smp_mpic_message_pass,
|
|
|
|
.kick_cpu = smp_generic_kick_cpu,
|
|
|
|
.setup_cpu = smp_mpic_setup_cpu,
|
|
|
|
.give_timebase = smp_generic_give_timebase,
|
|
|
|
.take_timebase = smp_generic_take_timebase,
|
|
|
|
};
|
|
|
|
#endif /* CONFIG_SMP */
|
|
|
|
|
2006-12-07 03:50:46 +03:00
|
|
|
static void __init maple_use_rtas_reboot_and_halt_if_present(void)
|
|
|
|
{
|
|
|
|
if (rtas_service_present("system-reboot") &&
|
|
|
|
rtas_service_present("power-off")) {
|
|
|
|
ppc_md.restart = rtas_restart;
|
|
|
|
ppc_md.power_off = rtas_power_off;
|
|
|
|
ppc_md.halt = rtas_halt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
void __init maple_setup_arch(void)
|
|
|
|
{
|
|
|
|
/* init to some ~sane value until calibrate_delay() runs */
|
|
|
|
loops_per_jiffy = 50000000;
|
|
|
|
|
|
|
|
/* Setup SMP callback */
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
smp_ops = &maple_smp_ops;
|
|
|
|
#endif
|
|
|
|
/* Lookup PCI hosts */
|
|
|
|
maple_pci_init();
|
|
|
|
|
|
|
|
#ifdef CONFIG_DUMMY_CONSOLE
|
|
|
|
conswitchp = &dummy_con;
|
|
|
|
#endif
|
2006-12-07 03:50:46 +03:00
|
|
|
maple_use_rtas_reboot_and_halt_if_present();
|
2005-07-08 04:56:30 +04:00
|
|
|
|
2006-04-13 00:23:22 +04:00
|
|
|
printk(KERN_DEBUG "Using native/NAP idle loop\n");
|
2007-02-06 05:01:15 +03:00
|
|
|
|
|
|
|
mmio_nvram_init();
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Early initialization.
|
|
|
|
*/
|
|
|
|
static void __init maple_init_early(void)
|
|
|
|
{
|
|
|
|
DBG(" -> maple_init_early\n");
|
|
|
|
|
2005-12-14 05:10:10 +03:00
|
|
|
iommu_init_early_dart();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
DBG(" <- maple_init_early\n");
|
|
|
|
}
|
|
|
|
|
2006-07-03 15:36:01 +04:00
|
|
|
/*
|
|
|
|
* This is almost identical to pSeries and CHRP. We need to make that
|
|
|
|
* code generic at one point, with appropriate bits in the device-tree to
|
|
|
|
* identify the presence of an HT APIC
|
|
|
|
*/
|
|
|
|
static void __init maple_init_IRQ(void)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-07-03 15:36:01 +04:00
|
|
|
struct device_node *root, *np, *mpic_node = NULL;
|
2006-07-12 09:40:17 +04:00
|
|
|
const unsigned int *opprop;
|
2006-07-03 15:36:01 +04:00
|
|
|
unsigned long openpic_addr = 0;
|
|
|
|
int naddr, n, i, opplen, has_isus = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct mpic *mpic;
|
2006-07-03 15:36:01 +04:00
|
|
|
unsigned int flags = MPIC_PRIMARY;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-07-03 15:36:01 +04:00
|
|
|
/* Locate MPIC in the device-tree. Note that there is a bug
|
|
|
|
* in Maple device-tree where the type of the controller is
|
|
|
|
* open-pic and not interrupt-controller
|
|
|
|
*/
|
2006-07-08 04:37:20 +04:00
|
|
|
|
|
|
|
for_each_node_by_type(np, "interrupt-controller")
|
2007-05-03 11:26:52 +04:00
|
|
|
if (of_device_is_compatible(np, "open-pic")) {
|
2006-07-08 04:37:20 +04:00
|
|
|
mpic_node = np;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (mpic_node == NULL)
|
|
|
|
for_each_node_by_type(np, "open-pic") {
|
|
|
|
mpic_node = np;
|
|
|
|
break;
|
|
|
|
}
|
2006-07-03 15:36:01 +04:00
|
|
|
if (mpic_node == NULL) {
|
|
|
|
printk(KERN_ERR
|
|
|
|
"Failed to locate the MPIC interrupt controller\n");
|
|
|
|
return;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-07-03 15:36:01 +04:00
|
|
|
/* Find address list in /platform-open-pic */
|
2005-04-17 02:20:36 +04:00
|
|
|
root = of_find_node_by_path("/");
|
2007-04-03 04:56:50 +04:00
|
|
|
naddr = of_n_addr_cells(root);
|
2007-04-03 16:26:41 +04:00
|
|
|
opprop = of_get_property(root, "platform-open-pic", &opplen);
|
2006-07-03 15:36:01 +04:00
|
|
|
if (opprop != 0) {
|
|
|
|
openpic_addr = of_read_number(opprop, naddr);
|
|
|
|
has_isus = (opplen > naddr);
|
|
|
|
printk(KERN_DEBUG "OpenPIC addr: %lx, has ISUs: %d\n",
|
|
|
|
openpic_addr, has_isus);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-07-03 15:36:01 +04:00
|
|
|
BUG_ON(openpic_addr == 0);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-07-03 15:36:01 +04:00
|
|
|
/* Check for a big endian MPIC */
|
2007-04-03 16:26:41 +04:00
|
|
|
if (of_get_property(np, "big-endian", NULL) != NULL)
|
2006-07-03 15:36:01 +04:00
|
|
|
flags |= MPIC_BIG_ENDIAN;
|
|
|
|
|
|
|
|
/* XXX Maple specific bits */
|
2007-04-23 12:47:08 +04:00
|
|
|
flags |= MPIC_U3_HT_IRQS | MPIC_WANTS_RESET;
|
2006-07-08 04:37:23 +04:00
|
|
|
/* All U3/U4 are big-endian, older SLOF firmware doesn't encode this */
|
|
|
|
flags |= MPIC_BIG_ENDIAN;
|
2006-07-03 15:36:01 +04:00
|
|
|
|
|
|
|
/* Setup the openpic driver. More device-tree junks, we hard code no
|
|
|
|
* ISUs for now. I'll have to revisit some stuffs with the folks doing
|
|
|
|
* the firmware for those
|
|
|
|
*/
|
|
|
|
mpic = mpic_alloc(mpic_node, openpic_addr, flags,
|
|
|
|
/*has_isus ? 16 :*/ 0, 0, " MPIC ");
|
2005-04-17 02:20:36 +04:00
|
|
|
BUG_ON(mpic == NULL);
|
|
|
|
|
2006-07-03 15:36:01 +04:00
|
|
|
/* Add ISUs */
|
|
|
|
opplen /= sizeof(u32);
|
|
|
|
for (n = 0, i = naddr; i < opplen; i += naddr, n++) {
|
|
|
|
unsigned long isuaddr = of_read_number(opprop + i, naddr);
|
|
|
|
mpic_assign_isu(mpic, n, isuaddr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* All ISUs are setup, complete initialization */
|
|
|
|
mpic_init(mpic);
|
|
|
|
ppc_md.get_irq = mpic_get_irq;
|
|
|
|
of_node_put(mpic_node);
|
|
|
|
of_node_put(root);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __init maple_progress(char *s, unsigned short hex)
|
|
|
|
{
|
|
|
|
printk("*** %04x : %s\n", hex, s ? s : "");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Called very early, MMU is off, device-tree isn't unflattened
|
|
|
|
*/
|
2006-03-28 16:15:54 +04:00
|
|
|
static int __init maple_probe(void)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-03-28 16:15:54 +04:00
|
|
|
unsigned long root = of_get_flat_dt_root();
|
2006-07-03 11:22:05 +04:00
|
|
|
|
|
|
|
if (!of_flat_dt_is_compatible(root, "Momentum,Maple") &&
|
|
|
|
!of_flat_dt_is_compatible(root, "Momentum,Apache"))
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
|
|
|
/*
|
|
|
|
* On U3, the DART (iommu) must be allocated now since it
|
|
|
|
* has an impact on htab_initialize (due to the large page it
|
|
|
|
* occupies having to be broken up so the DART itself is not
|
|
|
|
* part of the cacheable linar mapping
|
|
|
|
*/
|
2005-12-14 05:10:10 +03:00
|
|
|
alloc_dart_table();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-23 12:16:38 +04:00
|
|
|
hpte_init_native();
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-03-28 16:15:54 +04:00
|
|
|
define_machine(maple_md) {
|
|
|
|
.name = "Maple",
|
2005-04-17 02:20:36 +04:00
|
|
|
.probe = maple_probe,
|
|
|
|
.setup_arch = maple_setup_arch,
|
|
|
|
.init_early = maple_init_early,
|
|
|
|
.init_IRQ = maple_init_IRQ,
|
2006-11-11 09:24:51 +03:00
|
|
|
.pci_irq_fixup = maple_pci_irq_fixup,
|
2005-04-17 02:20:36 +04:00
|
|
|
.pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq,
|
|
|
|
.restart = maple_restart,
|
|
|
|
.power_off = maple_power_off,
|
|
|
|
.halt = maple_halt,
|
|
|
|
.get_boot_time = maple_get_boot_time,
|
|
|
|
.set_rtc_time = maple_set_rtc_time,
|
|
|
|
.get_rtc_time = maple_get_rtc_time,
|
2005-06-23 03:43:07 +04:00
|
|
|
.calibrate_decr = generic_calibrate_decr,
|
2005-04-17 02:20:36 +04:00
|
|
|
.progress = maple_progress,
|
2006-03-27 08:03:03 +04:00
|
|
|
.power_save = power4_idle,
|
[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>
2005-11-14 15:35:00 +03:00
|
|
|
#ifdef CONFIG_KEXEC
|
|
|
|
.machine_kexec = default_machine_kexec,
|
|
|
|
.machine_kexec_prepare = default_machine_kexec_prepare,
|
2005-12-04 10:39:43 +03:00
|
|
|
.machine_crash_shutdown = default_machine_crash_shutdown,
|
[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>
2005-11-14 15:35:00 +03:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|