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: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
f9bd170a87
commit
033ef338b6
|
@ -276,6 +276,8 @@ config PPC_PSERIES
|
|||
depends on PPC_MULTIPLATFORM && PPC64
|
||||
bool " IBM pSeries & new (POWER5-based) iSeries"
|
||||
select PPC_I8259
|
||||
select PPC_RTAS
|
||||
select RTAS_ERROR_LOGGING
|
||||
default y
|
||||
|
||||
config PPC_CHRP
|
||||
|
@ -283,6 +285,7 @@ config PPC_CHRP
|
|||
depends on PPC_MULTIPLATFORM && PPC32
|
||||
select PPC_I8259
|
||||
select PPC_INDIRECT_PCI
|
||||
select PPC_RTAS
|
||||
default y
|
||||
|
||||
config PPC_PMAC
|
||||
|
@ -317,6 +320,7 @@ config PPC_MAPLE
|
|||
config PPC_BPA
|
||||
bool " Broadband Processor Architecture"
|
||||
depends on PPC_MULTIPLATFORM && PPC64
|
||||
select PPC_RTAS
|
||||
|
||||
config PPC_OF
|
||||
bool
|
||||
|
@ -338,6 +342,15 @@ config MPIC
|
|||
bool
|
||||
default y
|
||||
|
||||
config PPC_RTAS
|
||||
bool
|
||||
default n
|
||||
|
||||
config RTAS_ERROR_LOGGING
|
||||
bool
|
||||
depends on PPC_RTAS
|
||||
default n
|
||||
|
||||
config MPIC_BROKEN_U3
|
||||
bool
|
||||
depends on PPC_MAPLE
|
||||
|
|
|
@ -16,6 +16,7 @@ obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o ptrace32.o
|
|||
obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
|
||||
obj-$(CONFIG_POWER4) += idle_power4.o
|
||||
obj-$(CONFIG_PPC_OF) += of_device.o
|
||||
obj-$(CONFIG_PPC_RTAS) += rtas.o
|
||||
obj-$(CONFIG_IBMVIO) += vio.o
|
||||
|
||||
ifeq ($(CONFIG_PPC_MERGE),y)
|
||||
|
|
|
@ -36,11 +36,11 @@
|
|||
#include <asm/processor.h>
|
||||
#include <asm/cputable.h>
|
||||
#include <asm/thread_info.h>
|
||||
#include <asm/rtas.h>
|
||||
#ifdef CONFIG_PPC64
|
||||
#include <asm/paca.h>
|
||||
#include <asm/lppaca.h>
|
||||
#include <asm/iSeries/HvLpEvent.h>
|
||||
#include <asm/rtas.h>
|
||||
#include <asm/cache.h>
|
||||
#include <asm/systemcfg.h>
|
||||
#include <asm/compat.h>
|
||||
|
@ -97,7 +97,7 @@ int main(void)
|
|||
DEFINE(TI_TASK, offsetof(struct thread_info, task));
|
||||
DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain));
|
||||
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
|
||||
#endif /* CONFIG_PPC64 */
|
||||
#endif /* CONFIG_PPC32 */
|
||||
|
||||
#ifdef CONFIG_PPC64
|
||||
DEFINE(DCACHEL1LINESIZE, offsetof(struct ppc64_caches, dline_size));
|
||||
|
@ -142,11 +142,11 @@ int main(void)
|
|||
DEFINE(LPPACASRR1, offsetof(struct lppaca, saved_srr1));
|
||||
DEFINE(LPPACAANYINT, offsetof(struct lppaca, int_dword.any_int));
|
||||
DEFINE(LPPACADECRINT, offsetof(struct lppaca, int_dword.fields.decr_int));
|
||||
#endif /* CONFIG_PPC64 */
|
||||
|
||||
/* RTAS */
|
||||
DEFINE(RTASBASE, offsetof(struct rtas_t, base));
|
||||
DEFINE(RTASENTRY, offsetof(struct rtas_t, entry));
|
||||
#endif /* CONFIG_PPC64 */
|
||||
|
||||
/* Interrupt register frame */
|
||||
DEFINE(STACK_FRAME_OVERHEAD, STACK_FRAME_OVERHEAD);
|
||||
|
|
|
@ -954,7 +954,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
|
|||
* here so it's easy to add arch-specific sections later.
|
||||
* -- Cort
|
||||
*/
|
||||
#ifdef CONFIG_PPC_OF
|
||||
#ifdef CONFIG_PPC_RTAS
|
||||
/*
|
||||
* On CHRP, the Run-Time Abstraction Services (RTAS) have to be
|
||||
* called with the MMU off.
|
||||
|
@ -963,14 +963,13 @@ _GLOBAL(enter_rtas)
|
|||
stwu r1,-INT_FRAME_SIZE(r1)
|
||||
mflr r0
|
||||
stw r0,INT_FRAME_SIZE+4(r1)
|
||||
lis r4,rtas_data@ha
|
||||
lwz r4,rtas_data@l(r4)
|
||||
LOADADDR(r4, rtas)
|
||||
lis r6,1f@ha /* physical return address for rtas */
|
||||
addi r6,r6,1f@l
|
||||
tophys(r6,r6)
|
||||
tophys(r7,r1)
|
||||
lis r8,rtas_entry@ha
|
||||
lwz r8,rtas_entry@l(r8)
|
||||
lwz r8,RTASENTRY(r4)
|
||||
lwz r4,RTASBASE(r4)
|
||||
mfmsr r9
|
||||
stw r9,8(r1)
|
||||
LOAD_MSR_KERNEL(r0,MSR_KERNEL)
|
||||
|
@ -978,7 +977,6 @@ _GLOBAL(enter_rtas)
|
|||
MTMSRD(r0) /* don't get trashed */
|
||||
li r9,MSR_KERNEL & ~(MSR_IR|MSR_DR)
|
||||
mtlr r6
|
||||
CLR_TOP32(r7)
|
||||
mtspr SPRN_SPRG2,r7
|
||||
mtspr SPRN_SRR0,r8
|
||||
mtspr SPRN_SRR1,r9
|
||||
|
@ -999,4 +997,4 @@ machine_check_in_rtas:
|
|||
twi 31,0,0
|
||||
/* XXX load up BATs and panic */
|
||||
|
||||
#endif /* CONFIG_PPC_OF */
|
||||
#endif /* CONFIG_PPC_RTAS */
|
||||
|
|
|
@ -110,9 +110,6 @@ struct device_node *of_chosen;
|
|||
struct device_node *dflt_interrupt_controller;
|
||||
int num_interrupt_controllers;
|
||||
|
||||
u32 rtas_data;
|
||||
u32 rtas_entry;
|
||||
|
||||
/*
|
||||
* Wrapper for allocating memory for various data that needs to be
|
||||
* attached to device nodes as they are processed at boot or when
|
||||
|
|
|
@ -25,29 +25,29 @@
|
|||
#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/lmb.h>
|
||||
#ifdef CONFIG_PPC64
|
||||
#include <asm/systemcfg.h>
|
||||
#include <asm/ppcdebug.h>
|
||||
#endif
|
||||
|
||||
struct flash_block_list_header rtas_firmware_flash_list = {0, NULL};
|
||||
|
||||
struct rtas_t rtas = {
|
||||
struct rtas_t rtas = {
|
||||
.lock = SPIN_LOCK_UNLOCKED
|
||||
};
|
||||
|
||||
EXPORT_SYMBOL(rtas);
|
||||
|
||||
char rtas_err_buf[RTAS_ERROR_LOG_MAX];
|
||||
|
||||
DEFINE_SPINLOCK(rtas_data_buf_lock);
|
||||
char rtas_data_buf[RTAS_DATA_BUF_SIZE]__page_aligned;
|
||||
char rtas_data_buf[RTAS_DATA_BUF_SIZE] __cacheline_aligned;
|
||||
unsigned long rtas_rmo_buf;
|
||||
|
||||
void
|
||||
call_rtas_display_status(unsigned char c)
|
||||
/*
|
||||
* call_rtas_display_status and call_rtas_display_status_delay
|
||||
* are designed only for very early low-level debugging, which
|
||||
* is why the token is hard-coded to 10.
|
||||
*/
|
||||
void call_rtas_display_status(unsigned char c)
|
||||
{
|
||||
struct rtas_args *args = &rtas.args;
|
||||
unsigned long s;
|
||||
|
@ -67,8 +67,7 @@ call_rtas_display_status(unsigned char c)
|
|||
spin_unlock_irqrestore(&rtas.lock, s);
|
||||
}
|
||||
|
||||
void
|
||||
call_rtas_display_status_delay(unsigned char c)
|
||||
void call_rtas_display_status_delay(unsigned char c)
|
||||
{
|
||||
static int pending_newline = 0; /* did last write end with unprinted newline? */
|
||||
static int width = 16;
|
||||
|
@ -92,8 +91,7 @@ call_rtas_display_status_delay(unsigned char c)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
rtas_progress(char *s, unsigned short hex)
|
||||
void rtas_progress(char *s, unsigned short hex)
|
||||
{
|
||||
struct device_node *root;
|
||||
int width, *p;
|
||||
|
@ -209,18 +207,16 @@ rtas_progress(char *s, unsigned short hex)
|
|||
spin_unlock(&progress_lock);
|
||||
}
|
||||
|
||||
int
|
||||
rtas_token(const char *service)
|
||||
int rtas_token(const char *service)
|
||||
{
|
||||
int *tokp;
|
||||
if (rtas.dev == NULL) {
|
||||
PPCDBG(PPCDBG_RTAS,"\tNo rtas device in device-tree...\n");
|
||||
if (rtas.dev == NULL)
|
||||
return RTAS_UNKNOWN_SERVICE;
|
||||
}
|
||||
tokp = (int *) get_property(rtas.dev, service, NULL);
|
||||
return tokp ? *tokp : RTAS_UNKNOWN_SERVICE;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_RTAS_ERROR_LOGGING
|
||||
/*
|
||||
* Return the firmware-specified size of the error log buffer
|
||||
* for all rtas calls that require an error buffer argument.
|
||||
|
@ -235,31 +231,38 @@ int rtas_get_error_log_max(void)
|
|||
rtas_error_log_max = rtas_token ("rtas-error-log-max");
|
||||
if ((rtas_error_log_max == RTAS_UNKNOWN_SERVICE) ||
|
||||
(rtas_error_log_max > RTAS_ERROR_LOG_MAX)) {
|
||||
printk (KERN_WARNING "RTAS: bad log buffer size %d\n", rtas_error_log_max);
|
||||
printk (KERN_WARNING "RTAS: bad log buffer size %d\n",
|
||||
rtas_error_log_max);
|
||||
rtas_error_log_max = RTAS_ERROR_LOG_MAX;
|
||||
}
|
||||
return rtas_error_log_max;
|
||||
}
|
||||
EXPORT_SYMBOL(rtas_get_error_log_max);
|
||||
|
||||
|
||||
char rtas_err_buf[RTAS_ERROR_LOG_MAX];
|
||||
int rtas_last_error_token;
|
||||
|
||||
/** Return a copy of the detailed error text associated with the
|
||||
* most recent failed call to rtas. Because the error text
|
||||
* might go stale if there are any other intervening rtas calls,
|
||||
* this routine must be called atomically with whatever produced
|
||||
* the error (i.e. with rtas.lock still held from the previous call).
|
||||
*/
|
||||
static int
|
||||
__fetch_rtas_last_error(void)
|
||||
static char *__fetch_rtas_last_error(char *altbuf)
|
||||
{
|
||||
struct rtas_args err_args, save_args;
|
||||
u32 bufsz;
|
||||
char *buf = NULL;
|
||||
|
||||
if (rtas_last_error_token == -1)
|
||||
return NULL;
|
||||
|
||||
bufsz = rtas_get_error_log_max();
|
||||
|
||||
err_args.token = rtas_token("rtas-last-error");
|
||||
err_args.token = rtas_last_error_token;
|
||||
err_args.nargs = 2;
|
||||
err_args.nret = 1;
|
||||
|
||||
err_args.args[0] = (rtas_arg_t)__pa(rtas_err_buf);
|
||||
err_args.args[1] = bufsz;
|
||||
err_args.args[2] = 0;
|
||||
|
@ -272,23 +275,38 @@ __fetch_rtas_last_error(void)
|
|||
err_args = rtas.args;
|
||||
rtas.args = save_args;
|
||||
|
||||
return err_args.args[2];
|
||||
/* Log the error in the unlikely case that there was one. */
|
||||
if (unlikely(err_args.args[2] == 0)) {
|
||||
if (altbuf) {
|
||||
buf = altbuf;
|
||||
} else {
|
||||
buf = rtas_err_buf;
|
||||
if (mem_init_done)
|
||||
buf = kmalloc(RTAS_ERROR_LOG_MAX, GFP_ATOMIC);
|
||||
}
|
||||
if (buf)
|
||||
memcpy(buf, rtas_err_buf, RTAS_ERROR_LOG_MAX);
|
||||
}
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
#define get_errorlog_buffer() kmalloc(RTAS_ERROR_LOG_MAX, GFP_KERNEL)
|
||||
|
||||
#else /* CONFIG_RTAS_ERROR_LOGGING */
|
||||
#define __fetch_rtas_last_error(x) NULL
|
||||
#define get_errorlog_buffer() NULL
|
||||
#endif
|
||||
|
||||
int rtas_call(int token, int nargs, int nret, int *outputs, ...)
|
||||
{
|
||||
va_list list;
|
||||
int i, logit = 0;
|
||||
int i;
|
||||
unsigned long s;
|
||||
struct rtas_args *rtas_args;
|
||||
char * buff_copy = NULL;
|
||||
char *buff_copy = NULL;
|
||||
int ret;
|
||||
|
||||
PPCDBG(PPCDBG_RTAS, "Entering rtas_call\n");
|
||||
PPCDBG(PPCDBG_RTAS, "\ttoken = 0x%x\n", token);
|
||||
PPCDBG(PPCDBG_RTAS, "\tnargs = %d\n", nargs);
|
||||
PPCDBG(PPCDBG_RTAS, "\tnret = %d\n", nret);
|
||||
PPCDBG(PPCDBG_RTAS, "\t&outputs = 0x%lx\n", outputs);
|
||||
if (token == RTAS_UNKNOWN_SERVICE)
|
||||
return -1;
|
||||
|
||||
|
@ -301,46 +319,25 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...)
|
|||
rtas_args->nret = nret;
|
||||
rtas_args->rets = (rtas_arg_t *)&(rtas_args->args[nargs]);
|
||||
va_start(list, outputs);
|
||||
for (i = 0; i < nargs; ++i) {
|
||||
for (i = 0; i < nargs; ++i)
|
||||
rtas_args->args[i] = va_arg(list, rtas_arg_t);
|
||||
PPCDBG(PPCDBG_RTAS, "\tnarg[%d] = 0x%x\n", i, rtas_args->args[i]);
|
||||
}
|
||||
va_end(list);
|
||||
|
||||
for (i = 0; i < nret; ++i)
|
||||
rtas_args->rets[i] = 0;
|
||||
|
||||
PPCDBG(PPCDBG_RTAS, "\tentering rtas with 0x%lx\n",
|
||||
__pa(rtas_args));
|
||||
enter_rtas(__pa(rtas_args));
|
||||
PPCDBG(PPCDBG_RTAS, "\treturned from rtas ...\n");
|
||||
|
||||
/* A -1 return code indicates that the last command couldn't
|
||||
be completed due to a hardware error. */
|
||||
if (rtas_args->rets[0] == -1)
|
||||
logit = (__fetch_rtas_last_error() == 0);
|
||||
|
||||
ifppcdebug(PPCDBG_RTAS) {
|
||||
for(i=0; i < nret ;i++)
|
||||
udbg_printf("\tnret[%d] = 0x%lx\n", i, (ulong)rtas_args->rets[i]);
|
||||
}
|
||||
buff_copy = __fetch_rtas_last_error(NULL);
|
||||
|
||||
if (nret > 1 && outputs != NULL)
|
||||
for (i = 0; i < nret-1; ++i)
|
||||
outputs[i] = rtas_args->rets[i+1];
|
||||
ret = (nret > 0)? rtas_args->rets[0]: 0;
|
||||
|
||||
/* Log the error in the unlikely case that there was one. */
|
||||
if (unlikely(logit)) {
|
||||
buff_copy = rtas_err_buf;
|
||||
if (mem_init_done) {
|
||||
buff_copy = kmalloc(RTAS_ERROR_LOG_MAX, GFP_ATOMIC);
|
||||
if (buff_copy)
|
||||
memcpy(buff_copy, rtas_err_buf,
|
||||
RTAS_ERROR_LOG_MAX);
|
||||
}
|
||||
}
|
||||
|
||||
/* Gotta do something different here, use global lock for now... */
|
||||
spin_unlock_irqrestore(&rtas.lock, s);
|
||||
|
||||
|
@ -355,8 +352,7 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...)
|
|||
/* Given an RTAS status code of 990n compute the hinted delay of 10^n
|
||||
* (last digit) milliseconds. For now we bound at n=5 (100 sec).
|
||||
*/
|
||||
unsigned int
|
||||
rtas_extended_busy_delay_time(int status)
|
||||
unsigned int rtas_extended_busy_delay_time(int status)
|
||||
{
|
||||
int order = status - 9900;
|
||||
unsigned long ms;
|
||||
|
@ -367,7 +363,7 @@ rtas_extended_busy_delay_time(int status)
|
|||
order = 5; /* bound */
|
||||
|
||||
/* Use microseconds for reasonable accuracy */
|
||||
for (ms=1; order > 0; order--)
|
||||
for (ms = 1; order > 0; order--)
|
||||
ms *= 10;
|
||||
|
||||
return ms;
|
||||
|
@ -494,112 +490,23 @@ int rtas_set_indicator(int indicator, int index, int new_value)
|
|||
return rc;
|
||||
}
|
||||
|
||||
#define FLASH_BLOCK_LIST_VERSION (1UL)
|
||||
static void
|
||||
rtas_flash_firmware(void)
|
||||
void rtas_restart(char *cmd)
|
||||
{
|
||||
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_restart(char *cmd)
|
||||
{
|
||||
if (rtas_firmware_flash_list.next)
|
||||
rtas_flash_firmware();
|
||||
|
||||
printk("RTAS system-reboot returned %d\n",
|
||||
rtas_call(rtas_token("system-reboot"), 0, 1, NULL));
|
||||
for (;;);
|
||||
}
|
||||
|
||||
void
|
||||
rtas_power_off(void)
|
||||
void rtas_power_off(void)
|
||||
{
|
||||
if (rtas_firmware_flash_list.next)
|
||||
rtas_flash_bypass_warning();
|
||||
/* allow power on only with power button press */
|
||||
printk("RTAS power-off returned %d\n",
|
||||
rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1));
|
||||
for (;;);
|
||||
}
|
||||
|
||||
void
|
||||
rtas_halt(void)
|
||||
void rtas_halt(void)
|
||||
{
|
||||
if (rtas_firmware_flash_list.next)
|
||||
rtas_flash_bypass_warning();
|
||||
rtas_power_off();
|
||||
}
|
||||
|
||||
|
@ -632,9 +539,8 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
|
|||
{
|
||||
struct rtas_args args;
|
||||
unsigned long flags;
|
||||
char * buff_copy;
|
||||
char *buff_copy, *errbuf = NULL;
|
||||
int nargs;
|
||||
int err_rc = 0;
|
||||
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
return -EPERM;
|
||||
|
@ -653,7 +559,7 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
|
|||
nargs * sizeof(rtas_arg_t)) != 0)
|
||||
return -EFAULT;
|
||||
|
||||
buff_copy = kmalloc(RTAS_ERROR_LOG_MAX, GFP_KERNEL);
|
||||
buff_copy = get_errorlog_buffer();
|
||||
|
||||
spin_lock_irqsave(&rtas.lock, flags);
|
||||
|
||||
|
@ -665,19 +571,14 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
|
|||
|
||||
/* A -1 return code indicates that the last command couldn't
|
||||
be completed due to a hardware error. */
|
||||
if (args.rets[0] == -1) {
|
||||
err_rc = __fetch_rtas_last_error();
|
||||
if ((err_rc == 0) && buff_copy) {
|
||||
memcpy(buff_copy, rtas_err_buf, RTAS_ERROR_LOG_MAX);
|
||||
}
|
||||
}
|
||||
if (args.rets[0] == -1)
|
||||
errbuf = __fetch_rtas_last_error(buff_copy);
|
||||
|
||||
spin_unlock_irqrestore(&rtas.lock, flags);
|
||||
|
||||
if (buff_copy) {
|
||||
if ((args.rets[0] == -1) && (err_rc == 0)) {
|
||||
log_error(buff_copy, ERR_TYPE_RTAS_LOG, 0);
|
||||
}
|
||||
if (errbuf)
|
||||
log_error(errbuf, ERR_TYPE_RTAS_LOG, 0);
|
||||
kfree(buff_copy);
|
||||
}
|
||||
|
||||
|
@ -690,6 +591,7 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
/* This version can't take the spinlock, because it never returns */
|
||||
|
||||
struct rtas_args rtas_stop_self_args = {
|
||||
|
@ -714,6 +616,7 @@ void rtas_stop_self(void)
|
|||
|
||||
panic("Alas, I survived.\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Call early during boot, before mem init or bootmem, to retreive the RTAS
|
||||
|
@ -722,6 +625,8 @@ void rtas_stop_self(void)
|
|||
*/
|
||||
void __init rtas_initialize(void)
|
||||
{
|
||||
unsigned long rtas_region = RTAS_INSTANTIATE_MAX;
|
||||
|
||||
/* Get RTAS dev node and fill up our "rtas" structure with infos
|
||||
* about it.
|
||||
*/
|
||||
|
@ -743,26 +648,27 @@ void __init rtas_initialize(void)
|
|||
} else
|
||||
rtas.dev = NULL;
|
||||
}
|
||||
if (!rtas.dev)
|
||||
return;
|
||||
|
||||
/* If RTAS was found, allocate the RMO buffer for it and look for
|
||||
* the stop-self token if any
|
||||
*/
|
||||
if (rtas.dev) {
|
||||
unsigned long rtas_region = RTAS_INSTANTIATE_MAX;
|
||||
if (systemcfg->platform == PLATFORM_PSERIES_LPAR)
|
||||
rtas_region = min(lmb.rmo_size, RTAS_INSTANTIATE_MAX);
|
||||
|
||||
rtas_rmo_buf = lmb_alloc_base(RTAS_RMOBUF_MAX, PAGE_SIZE,
|
||||
rtas_region);
|
||||
#ifdef CONFIG_PPC64
|
||||
if (systemcfg->platform == PLATFORM_PSERIES_LPAR)
|
||||
rtas_region = min(lmb.rmo_size, RTAS_INSTANTIATE_MAX);
|
||||
#endif
|
||||
rtas_rmo_buf = lmb_alloc_base(RTAS_RMOBUF_MAX, PAGE_SIZE, rtas_region);
|
||||
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
rtas_stop_self_args.token = rtas_token("stop-self");
|
||||
rtas_stop_self_args.token = rtas_token("stop-self");
|
||||
#endif /* CONFIG_HOTPLUG_CPU */
|
||||
}
|
||||
|
||||
#ifdef CONFIG_RTAS_ERROR_LOGGING
|
||||
rtas_last_error_token = rtas_token("rtas-last-error");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
EXPORT_SYMBOL(rtas_firmware_flash_list);
|
||||
EXPORT_SYMBOL(rtas_token);
|
||||
EXPORT_SYMBOL(rtas_call);
|
||||
EXPORT_SYMBOL(rtas_data_buf);
|
||||
|
@ -772,4 +678,3 @@ EXPORT_SYMBOL(rtas_get_sensor);
|
|||
EXPORT_SYMBOL(rtas_get_power_level);
|
||||
EXPORT_SYMBOL(rtas_set_power_level);
|
||||
EXPORT_SYMBOL(rtas_set_indicator);
|
||||
EXPORT_SYMBOL(rtas_get_error_log_max);
|
|
@ -21,11 +21,6 @@ config EEH
|
|||
depends on PPC_PSERIES
|
||||
default y if !EMBEDDED
|
||||
|
||||
config PPC_RTAS
|
||||
bool
|
||||
depends on PPC_PSERIES || PPC_BPA
|
||||
default y
|
||||
|
||||
config RTAS_PROC
|
||||
bool "Proc interface to RTAS"
|
||||
depends on PPC_RTAS
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
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_IBMVIO) += vio.o
|
||||
|
|
138
arch/powerpc/platforms/pseries/rtas-fw.c
Normal file
138
arch/powerpc/platforms/pseries/rtas-fw.c
Normal file
|
@ -0,0 +1,138 @@
|
|||
/*
|
||||
*
|
||||
* 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);
|
3
arch/powerpc/platforms/pseries/rtas-fw.h
Normal file
3
arch/powerpc/platforms/pseries/rtas-fw.h
Normal file
|
@ -0,0 +1,3 @@
|
|||
void rtas_fw_restart(char *cmd);
|
||||
void rtas_fw_power_off(void);
|
||||
void rtas_fw_halt(void);
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* linux/arch/ppc/kernel/setup.c
|
||||
* 64-bit pSeries and RS/6000 setup code.
|
||||
*
|
||||
* Copyright (C) 1995 Linus Torvalds
|
||||
* Adapted from 'alpha' version by Gary Thomas
|
||||
|
@ -67,6 +67,8 @@
|
|||
#include <asm/i8259.h>
|
||||
#include <asm/udbg.h>
|
||||
|
||||
#include "rtas-fw.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
#define DBG(fmt...) udbg_printf(fmt)
|
||||
#else
|
||||
|
@ -589,9 +591,9 @@ struct machdep_calls __initdata pSeries_md = {
|
|||
.pcibios_fixup = pSeries_final_fixup,
|
||||
.pci_probe_mode = pSeries_pci_probe_mode,
|
||||
.irq_bus_setup = pSeries_irq_bus_setup,
|
||||
.restart = rtas_restart,
|
||||
.power_off = rtas_power_off,
|
||||
.halt = rtas_halt,
|
||||
.restart = rtas_fw_restart,
|
||||
.power_off = rtas_fw_power_off,
|
||||
.halt = rtas_fw_halt,
|
||||
.panic = rtas_os_term,
|
||||
.cpu_die = pSeries_mach_cpu_die,
|
||||
.get_boot_time = rtas_get_boot_time,
|
||||
|
|
|
@ -318,6 +318,11 @@ config PPC_RTAS
|
|||
depends on PPC_PSERIES || PPC_BPA
|
||||
default y
|
||||
|
||||
config RTAS_ERROR_LOGGING
|
||||
bool
|
||||
depends on PPC_RTAS
|
||||
default y
|
||||
|
||||
config RTAS_PROC
|
||||
bool "Proc interface to RTAS"
|
||||
depends on PPC_RTAS
|
||||
|
|
|
@ -43,7 +43,7 @@ obj-$(CONFIG_MODULES) += module.o
|
|||
ifneq ($(CONFIG_PPC_MERGE),y)
|
||||
obj-$(CONFIG_MODULES) += ppc_ksyms.o
|
||||
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_SCANLOG) += scanlog.o
|
||||
obj-$(CONFIG_LPARCFG) += lparcfg.o
|
||||
|
|
Loading…
Reference in a new issue