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

Commit c88c5d43 authored by Russell Currey's avatar Russell Currey Committed by Michael Ellerman
Browse files

powerpc/powernv: Fix OPAL_CONSOLE_FLUSH prototype and usages 



The recently added OPAL API call, OPAL_CONSOLE_FLUSH, originally took no
parameters and returned nothing.  The call was updated to accept the
terminal number to flush, and returned various values depending on the
state of the output buffer.

The prototype has been updated and its usage in the OPAL kmsg dumper has
been modified to support its new behaviour as an incremental flush.

Signed-off-by: default avatarRussell Currey <ruscur@russell.cc>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2f10f1a7

arch/powerpc/include/asm/opal.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ int64_t opal_console_read(int64_t term_number, __be64 *length, 
			  uint8_t *buffer);

int64_t opal_console_write_buffer_space(int64_t term_number,

					__be64 *length);

void opal_console_flush(void);

int64_t opal_console_flush(int64_t term_number);

int64_t opal_rtc_read(__be32 *year_month_day,

		      __be64 *hour_minute_second_millisecond);

int64_t opal_rtc_write(uint32_t year_month_day,

arch/powerpc/platforms/powernv/opal-kmsg.c

+8 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ static void force_opal_console_flush(struct kmsg_dumper *dumper, 
				     enum kmsg_dump_reason reason)

{

	int i;

	int64_t ret;



	/*

	 * Outside of a panic context the pollers will continue to run,
@@ -36,7 +37,13 @@ static void force_opal_console_flush(struct kmsg_dumper *dumper, 
		return;



	if (opal_check_token(OPAL_CONSOLE_FLUSH)) {

		opal_console_flush();

		ret = opal_console_flush(0);



		if (ret == OPAL_UNSUPPORTED || ret == OPAL_PARAMETER)

			return;



		/* Incrementally flush until there's nothing left */

		while (opal_console_flush(0) != OPAL_SUCCESS);

	} else {

		/*

		 * If OPAL_CONSOLE_FLUSH is not implemented in the firmware,