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

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

[POWERPC] Fix RTAS os-term usage on kernel panic 



The rtas_os_term() routine was being called at the wrong time.
The actual rtas call "os-term" will not ever return, and so
calling it from the panic notifier is too early.  Instead,
call it from the machine_reset() call.

This splits the rtas_os_term() routine into two: one part to capture
the kernel panic message, invoked during the panic notifier, and
another part that is invoked during machine_reset().

Prior to this patch, the os-term call was never being made,
because panic_timeout was always non-zero.  Calling os-term
helps keep the hypervisor happy!  We have to keep the hypervisor
happy to avoid service, dump and error reporting problems.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent fbe48175

arch/powerpc/kernel/rtas.c

+6 −6
Original line number Diff line number Diff line
@@ -638,18 +638,18 @@ void rtas_halt(void) 
/* Must be in the RMO region, so we place it here */

static char rtas_os_term_buf[2048];



void rtas_os_term(char *str)

void rtas_panic_msg(char *str)

{

	int status;

	snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);

}



	if (panic_timeout)

		return;

void rtas_os_term(void)

{

	int status;



	if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term"))

		return;



	snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);



	do {

		status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,

				   __pa(rtas_os_term_buf));

arch/powerpc/platforms/pseries/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -507,7 +507,8 @@ define_machine(pseries) { 
	.restart		= rtas_restart,

	.power_off		= pSeries_power_off,

	.halt			= rtas_halt,

	.panic			= rtas_os_term,

	.panic			= rtas_panic_msg,

	.machine_shutdown	= rtas_os_term,

	.get_boot_time		= rtas_get_boot_time,

	.get_rtc_time		= rtas_get_rtc_time,

	.set_rtc_time		= rtas_set_rtc_time,

include/asm-powerpc/rtas.h

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ extern int rtas_call(int token, int, int, int *, ...); 
extern void rtas_restart(char *cmd);

extern void rtas_power_off(void);

extern void rtas_halt(void);

extern void rtas_os_term(char *str);

extern void rtas_panic_msg(char *str);

extern void rtas_os_term(void);

extern int rtas_get_sensor(int sensor, int index, int *state);

extern int rtas_get_power_level(int powerdomain, int *level);

extern int rtas_set_power_level(int powerdomain, int level, int *setlevel);