Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79c0108d authored by Linas Vepstas's avatar Linas Vepstas Committed by Paul Mackerras
Browse files

[POWERPC] pseries: Fix jumbled no_logging flag 



Get rid of the jumbled usage of the no_logging flag. Its use
spans several directories, and is incorrectly/misleadingly
documented. Instead, two changes:
1) nvram will accept error log as soon as its ready.
2) logging to nvram stops on the first fatal error reported.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>

----
 arch/powerpc/kernel/nvram_64.c         |    8 --------
 arch/powerpc/platforms/pseries/rtasd.c |   14 ++++++--------
 2 files changed, 6 insertions(+), 16 deletions(-)
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 72755f44

arch/powerpc/kernel/nvram_64.c

+0 −8
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ static struct nvram_partition * nvram_part; 
static long nvram_error_log_index = -1;

static long nvram_error_log_size = 0;



int no_logging = 1; 	/* Until we initialize everything,

			 * make sure we don't try logging

			 * anything */



extern volatile int error_log_cnt;



struct err_log_info {
@@ -637,10 +633,6 @@ int nvram_write_error_log(char * buff, int length, unsigned int err_type) 
	loff_t tmp_index;

	struct err_log_info info;

	

	if (no_logging) {

		return -EPERM;

	}



	if (nvram_error_log_index == -1) {

		return -ESPIPE;

	}

arch/powerpc/platforms/pseries/rtasd.c

+6 −8
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ static unsigned int rtas_event_scan_rate; 


static int full_rtas_msgs = 0;



extern int no_logging;

/* Stop logging to nvram after first fatal error */

static int no_more_logging;



volatile int error_log_cnt = 0;
@@ -216,7 +217,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) 
	}



	/* Write error to NVRAM */

	if (!no_logging && !(err_type & ERR_FLAG_BOOT))

	if (!no_more_logging && !(err_type & ERR_FLAG_BOOT))

		nvram_write_error_log(buf, len, err_type);



	/*
@@ -228,8 +229,8 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) 
		printk_log_rtas(buf, len);



	/* Check to see if we need to or have stopped logging */

	if (fatal || no_logging) {

		no_logging = 1;

	if (fatal || no_more_logging) {

		no_more_logging = 1;

		spin_unlock_irqrestore(&rtasd_log_lock, s);

		return;

	}
@@ -301,7 +302,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf, 


	spin_lock_irqsave(&rtasd_log_lock, s);

	/* if it's 0, then we know we got the last one (the one in NVRAM) */

	if (rtas_log_size == 0 && !no_logging)

	if (rtas_log_size == 0 && !no_more_logging)

		nvram_clear_error_log();

	spin_unlock_irqrestore(&rtasd_log_lock, s);
@@ -413,9 +414,6 @@ static int rtasd(void *unused) 
	memset(logdata, 0, rtas_error_log_max);

	rc = nvram_read_error_log(logdata, rtas_error_log_max, &err_type);



	/* We can use rtas_log_buf now */

	no_logging = 0;



	if (!rc) {

		if (err_type != ERR_FLAG_ALREADY_LOGGED) {

			pSeries_log_error(logdata, err_type | ERR_FLAG_BOOT, 0);