leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[POWERPC] Fix panic in RTAS code

Browse Source 
Some older pSeries machines were panicking in pSeries_log_error
because it was getting called before it was ready.  This is a result
of commit "[POWERPC] pseries: Fix jumbled no_logging flag."
(79c0108d1b).

This fixes it by explicitly enabling RTAS error logging when it has
been initialized, and also makes the code clearer by renaming the
"no_more_logging" variable to "logging_enabled".

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Tony Breeds
2007-10-03 11:19:09 +10:00
committed by Paul Mackerras
parent 2d5f565964
commit a0c7ce9c87
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/platforms/pseries/rtasd.c
View File

@@ -54,8 +54,9 @@ static unsigned int rtas_event_scan_rate;
static int full_rtas_msgs = 0; static int full_rtas_msgs = 0;
/* Stop logging to nvram after first fatal error */ /* Stop logging to nvram after first fatal error */
static int no_more_logging; static int logging_enabled; /* Until we initialize everything,
* make sure we don't try logging
* anything */
static int error_log_cnt; static int error_log_cnt;
/* /*
@@ -217,7 +218,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
} }
/* Write error to NVRAM */ /* Write error to NVRAM */
if (!no_more_logging && !(err_type & ERR_FLAG_BOOT)) if (logging_enabled && !(err_type & ERR_FLAG_BOOT))
nvram_write_error_log(buf, len, err_type, error_log_cnt); nvram_write_error_log(buf, len, err_type, error_log_cnt);
/* /*
@@ -229,8 +230,8 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
printk_log_rtas(buf, len); printk_log_rtas(buf, len);
/* Check to see if we need to or have stopped logging */ /* Check to see if we need to or have stopped logging */
if (fatal || no_more_logging) { if (fatal || !logging_enabled) {
no_more_logging = 1; logging_enabled = 0;
spin_unlock_irqrestore(&rtasd_log_lock, s); spin_unlock_irqrestore(&rtasd_log_lock, s);
return; return;
} }
@@ -302,7 +303,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,
spin_lock_irqsave(&rtasd_log_lock, s); spin_lock_irqsave(&rtasd_log_lock, s);
/* if it's 0, then we know we got the last one (the one in NVRAM) */ /* if it's 0, then we know we got the last one (the one in NVRAM) */
if (rtas_log_size == 0 && !no_more_logging) if (rtas_log_size == 0 && logging_enabled)
nvram_clear_error_log(); nvram_clear_error_log();
spin_unlock_irqrestore(&rtasd_log_lock, s); spin_unlock_irqrestore(&rtasd_log_lock, s);
@@ -414,6 +415,8 @@ static int rtasd(void *unused)
memset(logdata, 0, rtas_error_log_max); memset(logdata, 0, rtas_error_log_max);
rc = nvram_read_error_log(logdata, rtas_error_log_max, rc = nvram_read_error_log(logdata, rtas_error_log_max,
&err_type, &error_log_cnt); &err_type, &error_log_cnt);
/* We can use rtas_log_buf now */
logging_enabled = 1;
if (!rc) { if (!rc) {
if (err_type != ERR_FLAG_ALREADY_LOGGED) { if (err_type != ERR_FLAG_ALREADY_LOGGED) {