Commit 033ef338 authored by Paul Mackerras's avatar Paul Mackerras

powerpc: Merge rtas.c into arch/powerpc/kernel

This splits arch/ppc64/kernel/rtas.c into arch/powerpc/kernel/rtas.c,
which contains generic RTAS functions useful on any CHRP platform,
and arch/powerpc/platforms/pseries/rtas-fw.[ch], which contain
some pSeries-specific firmware flashing bits.  The parts of rtas.c
that are to do with pSeries-specific error logging are protected
by a new CONFIG_RTAS_ERROR_LOGGING symbol.  The inclusion of rtas.o
is controlled by the CONFIG_PPC_RTAS symbol, and the relevant
platforms select that.
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent f9bd170a
...@@ -276,6 +276,8 @@ config PPC_PSERIES ...@@ -276,6 +276,8 @@ config PPC_PSERIES
depends on PPC_MULTIPLATFORM && PPC64 depends on PPC_MULTIPLATFORM && PPC64
bool " IBM pSeries & new (POWER5-based) iSeries" bool " IBM pSeries & new (POWER5-based) iSeries"
select PPC_I8259 select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
default y default y
config PPC_CHRP config PPC_CHRP
...@@ -283,6 +285,7 @@ config PPC_CHRP ...@@ -283,6 +285,7 @@ config PPC_CHRP
depends on PPC_MULTIPLATFORM && PPC32 depends on PPC_MULTIPLATFORM && PPC32
select PPC_I8259 select PPC_I8259
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
select PPC_RTAS
default y default y
config PPC_PMAC config PPC_PMAC
...@@ -317,6 +320,7 @@ config PPC_MAPLE ...@@ -317,6 +320,7 @@ config PPC_MAPLE
config PPC_BPA config PPC_BPA
bool " Broadband Processor Architecture" bool " Broadband Processor Architecture"
depends on PPC_MULTIPLATFORM && PPC64 depends on PPC_MULTIPLATFORM && PPC64
select PPC_RTAS
config PPC_OF config PPC_OF
bool bool
...@@ -338,6 +342,15 @@ config MPIC ...@@ -338,6 +342,15 @@ config MPIC
bool bool
default y default y
config PPC_RTAS
bool
default n
config RTAS_ERROR_LOGGING
bool
depends on PPC_RTAS
default n
config MPIC_BROKEN_U3 config MPIC_BROKEN_U3
bool bool
depends on PPC_MAPLE depends on PPC_MAPLE
......
...@@ -16,6 +16,7 @@ obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o ptrace32.o ...@@ -16,6 +16,7 @@ obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o ptrace32.o
obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
obj-$(CONFIG_POWER4) += idle_power4.o obj-$(CONFIG_POWER4) += idle_power4.o
obj-$(CONFIG_PPC_OF) += of_device.o obj-$(CONFIG_PPC_OF) += of_device.o
obj-$(CONFIG_PPC_RTAS) += rtas.o
obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_IBMVIO) += vio.o
ifeq ($(CONFIG_PPC_MERGE),y) ifeq ($(CONFIG_PPC_MERGE),y)
......
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/rtas.h>
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iSeries/HvLpEvent.h>
#include <asm/rtas.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
#include <asm/compat.h> #include <asm/compat.h>
...@@ -97,7 +97,7 @@ int main(void) ...@@ -97,7 +97,7 @@ int main(void)
DEFINE(TI_TASK, offsetof(struct thread_info, task)); DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain)); DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu)); DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC32 */
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
DEFINE(DCACHEL1LINESIZE, offsetof(struct ppc64_caches, dline_size)); DEFINE(DCACHEL1LINESIZE, offsetof(struct ppc64_caches, dline_size));
...@@ -142,11 +142,11 @@ int main(void) ...@@ -142,11 +142,11 @@ int main(void)
DEFINE(LPPACASRR1, offsetof(struct lppaca, saved_srr1)); DEFINE(LPPACASRR1, offsetof(struct lppaca, saved_srr1));
DEFINE(LPPACAANYINT, offsetof(struct lppaca, int_dword.any_int)); DEFINE(LPPACAANYINT, offsetof(struct lppaca, int_dword.any_int));
DEFINE(LPPACADECRINT, offsetof(struct lppaca, int_dword.fields.decr_int)); DEFINE(LPPACADECRINT, offsetof(struct lppaca, int_dword.fields.decr_int));
#endif /* CONFIG_PPC64 */
/* RTAS */ /* RTAS */
DEFINE(RTASBASE, offsetof(struct rtas_t, base)); DEFINE(RTASBASE, offsetof(struct rtas_t, base));
DEFINE(RTASENTRY, offsetof(struct rtas_t, entry)); DEFINE(RTASENTRY, offsetof(struct rtas_t, entry));
#endif /* CONFIG_PPC64 */
/* Interrupt register frame */ /* Interrupt register frame */
DEFINE(STACK_FRAME_OVERHEAD, STACK_FRAME_OVERHEAD); DEFINE(STACK_FRAME_OVERHEAD, STACK_FRAME_OVERHEAD);
......
...@@ -954,7 +954,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_601) ...@@ -954,7 +954,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
* here so it's easy to add arch-specific sections later. * here so it's easy to add arch-specific sections later.
* -- Cort * -- Cort
*/ */
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_RTAS
/* /*
* On CHRP, the Run-Time Abstraction Services (RTAS) have to be * On CHRP, the Run-Time Abstraction Services (RTAS) have to be
* called with the MMU off. * called with the MMU off.
...@@ -963,14 +963,13 @@ _GLOBAL(enter_rtas) ...@@ -963,14 +963,13 @@ _GLOBAL(enter_rtas)
stwu r1,-INT_FRAME_SIZE(r1) stwu r1,-INT_FRAME_SIZE(r1)
mflr r0 mflr r0
stw r0,INT_FRAME_SIZE+4(r1) stw r0,INT_FRAME_SIZE+4(r1)
lis r4,rtas_data@ha LOADADDR(r4, rtas)
lwz r4,rtas_data@l(r4)
lis r6,1f@ha /* physical return address for rtas */ lis r6,1f@ha /* physical return address for rtas */
addi r6,r6,1f@l addi r6,r6,1f@l
tophys(r6,r6) tophys(r6,r6)
tophys(r7,r1) tophys(r7,r1)
lis r8,rtas_entry@ha lwz r8,RTASENTRY(r4)
lwz r8,rtas_entry@l(r8) lwz r4,RTASBASE(r4)
mfmsr r9 mfmsr r9
stw r9,8(r1) stw r9,8(r1)
LOAD_MSR_KERNEL(r0,MSR_KERNEL) LOAD_MSR_KERNEL(r0,MSR_KERNEL)
...@@ -978,7 +977,6 @@ _GLOBAL(enter_rtas) ...@@ -978,7 +977,6 @@ _GLOBAL(enter_rtas)
MTMSRD(r0) /* don't get trashed */ MTMSRD(r0) /* don't get trashed */
li r9,MSR_KERNEL & ~(MSR_IR|MSR_DR) li r9,MSR_KERNEL & ~(MSR_IR|MSR_DR)
mtlr r6 mtlr r6
CLR_TOP32(r7)
mtspr SPRN_SPRG2,r7 mtspr SPRN_SPRG2,r7
mtspr SPRN_SRR0,r8 mtspr SPRN_SRR0,r8
mtspr SPRN_SRR1,r9 mtspr SPRN_SRR1,r9
...@@ -999,4 +997,4 @@ machine_check_in_rtas: ...@@ -999,4 +997,4 @@ machine_check_in_rtas:
twi 31,0,0 twi 31,0,0
/* XXX load up BATs and panic */ /* XXX load up BATs and panic */
#endif /* CONFIG_PPC_OF */ #endif /* CONFIG_PPC_RTAS */
...@@ -110,9 +110,6 @@ struct device_node *of_chosen; ...@@ -110,9 +110,6 @@ struct device_node *of_chosen;
struct device_node *dflt_interrupt_controller; struct device_node *dflt_interrupt_controller;
int num_interrupt_controllers; int num_interrupt_controllers;
u32 rtas_data;
u32 rtas_entry;
/* /*
* Wrapper for allocating memory for various data that needs to be * Wrapper for allocating memory for various data that needs to be
* attached to device nodes as they are processed at boot or when * attached to device nodes as they are processed at boot or when
......
...@@ -21,11 +21,6 @@ config EEH ...@@ -21,11 +21,6 @@ config EEH
depends on PPC_PSERIES depends on PPC_PSERIES
default y if !EMBEDDED default y if !EMBEDDED
config PPC_RTAS
bool
depends on PPC_PSERIES || PPC_BPA
default y
config RTAS_PROC config RTAS_PROC
bool "Proc interface to RTAS" bool "Proc interface to RTAS"
depends on PPC_RTAS depends on PPC_RTAS
......
obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \
setup.o iommu.o ras.o setup.o iommu.o rtas-fw.o ras.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_IBMVIO) += vio.o
/*
*
* Procedures for firmware flash updates on pSeries systems.
*
* Peter Bergner, IBM March 2001.
* Copyright (C) 2001 IBM.
*
* 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.
*/
#include <stdarg.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/module.h>
#include <linux/init.h>
#include <asm/prom.h>
#include <asm/rtas.h>
#include <asm/semaphore.h>
#include <asm/machdep.h>
#include <asm/page.h>
#include <asm/param.h>
#include <asm/system.h>
#include <asm/abs_addr.h>
#include <asm/udbg.h>
#include <asm/delay.h>
#include <asm/uaccess.h>
#include <asm/systemcfg.h>
#include "rtas-fw.h"
struct flash_block_list_header rtas_firmware_flash_list = {0, NULL};
#define FLASH_BLOCK_LIST_VERSION (1UL)
static void rtas_flash_firmware(void)
{
unsigned long image_size;
struct flash_block_list *f, *next, *flist;
unsigned long rtas_block_list;
int i, status, update_token;
update_token = rtas_token("ibm,update-flash-64-and-reboot");
if (update_token == RTAS_UNKNOWN_SERVICE) {
printk(KERN_ALERT "FLASH: ibm,update-flash-64-and-reboot is not available -- not a service partition?\n");
printk(KERN_ALERT "FLASH: firmware will not be flashed\n");
return;
}
/* NOTE: the "first" block list is a global var with no data
* blocks in the kernel data segment. We do this because
* we want to ensure this block_list addr is under 4GB.
*/
rtas_firmware_flash_list.num_blocks = 0;
flist = (struct flash_block_list *)&rtas_firmware_flash_list;
rtas_block_list = virt_to_abs(flist);
if (rtas_block_list >= 4UL*1024*1024*1024) {
printk(KERN_ALERT "FLASH: kernel bug...flash list header addr above 4GB\n");
return;
}
printk(KERN_ALERT "FLASH: preparing saved firmware image for flash\n");
/* Update the block_list in place. */
image_size = 0;
for (f = flist; f; f = next) {
/* Translate data addrs to absolute */
for (i = 0; i < f->num_blocks; i++) {
f->blocks[i].data = (char *)virt_to_abs(f->blocks[i].data);
image_size += f->blocks[i].length;
}
next = f->next;
/* Don't translate NULL pointer for last entry */
if (f->next)
f->next = (struct flash_block_list *)virt_to_abs(f->next);
else
f->next = NULL;
/* make num_blocks into the version/length field */
f->num_blocks = (FLASH_BLOCK_LIST_VERSION << 56) | ((f->num_blocks+1)*16);
}
printk(KERN_ALERT "FLASH: flash image is %ld bytes\n", image_size);
printk(KERN_ALERT "FLASH: performing flash and reboot\n");
rtas_progress("Flashing \n", 0x0);
rtas_progress("Please Wait... ", 0x0);
printk(KERN_ALERT "FLASH: this will take several minutes. Do not power off!\n");
status = rtas_call(update_token, 1, 1, NULL, rtas_block_list);
switch (status) { /* should only get "bad" status */
case 0:
printk(KERN_ALERT "FLASH: success\n");
break;
case -1:
printk(KERN_ALERT "FLASH: hardware error. Firmware may not be not flashed\n");
break;
case -3:
printk(KERN_ALERT "FLASH: image is corrupt or not correct for this platform. Firmware not flashed\n");
break;
case -4:
printk(KERN_ALERT "FLASH: flash failed when partially complete. System may not reboot\n");
break;
default:
printk(KERN_ALERT "FLASH: unknown flash return code %d\n", status);
break;
}
}
void rtas_flash_bypass_warning(void)
{
printk(KERN_ALERT "FLASH: firmware flash requires a reboot\n");
printk(KERN_ALERT "FLASH: the firmware image will NOT be flashed\n");
}
void rtas_fw_restart(char *cmd)
{
if (rtas_firmware_flash_list.next)
rtas_flash_firmware();
rtas_restart(cmd);
}
void rtas_fw_power_off(void)
{
if (rtas_firmware_flash_list.next)
rtas_flash_bypass_warning();
rtas_power_off();
}
void rtas_fw_halt(void)
{
if (rtas_firmware_flash_list.next)
rtas_flash_bypass_warning();
rtas_halt();
}
EXPORT_SYMBOL(rtas_firmware_flash_list);
void rtas_fw_restart(char *cmd);
void rtas_fw_power_off(void);
void rtas_fw_halt(void);
/* /*
* linux/arch/ppc/kernel/setup.c * 64-bit pSeries and RS/6000 setup code.
* *
* Copyright (C) 1995 Linus Torvalds * Copyright (C) 1995 Linus Torvalds
* Adapted from 'alpha' version by Gary Thomas * Adapted from 'alpha' version by Gary Thomas
...@@ -67,6 +67,8 @@ ...@@ -67,6 +67,8 @@
#include <asm/i8259.h> #include <asm/i8259.h>
#include <asm/udbg.h> #include <asm/udbg.h>
#include "rtas-fw.h"
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt...) udbg_printf(fmt) #define DBG(fmt...) udbg_printf(fmt)
#else #else
...@@ -589,9 +591,9 @@ struct machdep_calls __initdata pSeries_md = { ...@@ -589,9 +591,9 @@ struct machdep_calls __initdata pSeries_md = {
.pcibios_fixup = pSeries_final_fixup, .pcibios_fixup = pSeries_final_fixup,
.pci_probe_mode = pSeries_pci_probe_mode, .pci_probe_mode = pSeries_pci_probe_mode,
.irq_bus_setup = pSeries_irq_bus_setup, .irq_bus_setup = pSeries_irq_bus_setup,
.restart = rtas_restart, .restart = rtas_fw_restart,
.power_off = rtas_power_off, .power_off = rtas_fw_power_off,
.halt = rtas_halt, .halt = rtas_fw_halt,
.panic = rtas_os_term, .panic = rtas_os_term,
.cpu_die = pSeries_mach_cpu_die, .cpu_die = pSeries_mach_cpu_die,
.get_boot_time = rtas_get_boot_time, .get_boot_time = rtas_get_boot_time,
......
...@@ -318,6 +318,11 @@ config PPC_RTAS ...@@ -318,6 +318,11 @@ config PPC_RTAS
depends on PPC_PSERIES || PPC_BPA depends on PPC_PSERIES || PPC_BPA
default y default y
config RTAS_ERROR_LOGGING
bool
depends on PPC_RTAS
default y
config RTAS_PROC config RTAS_PROC
bool "Proc interface to RTAS" bool "Proc interface to RTAS"
depends on PPC_RTAS depends on PPC_RTAS
......
...@@ -43,7 +43,7 @@ obj-$(CONFIG_MODULES) += module.o ...@@ -43,7 +43,7 @@ obj-$(CONFIG_MODULES) += module.o
ifneq ($(CONFIG_PPC_MERGE),y) ifneq ($(CONFIG_PPC_MERGE),y)
obj-$(CONFIG_MODULES) += ppc_ksyms.o obj-$(CONFIG_MODULES) += ppc_ksyms.o
endif endif
obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o obj-$(CONFIG_PPC_RTAS) += rtas_pci.o
obj-$(CONFIG_RTAS_PROC) += rtas-proc.o obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
obj-$(CONFIG_SCANLOG) += scanlog.o obj-$(CONFIG_SCANLOG) += scanlog.o
obj-$(CONFIG_LPARCFG) += lparcfg.o obj-$(CONFIG_LPARCFG) += lparcfg.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment