diff mbox series

[2/3] core/opal: allow some re-entrant calls

Message ID 20180316101517.5588-3-npiggin@gmail.com
State Accepted
Headers show
Series improve ability for OPAL to cope with re-entry due | expand

Commit Message

Nicholas Piggin March 16, 2018, 10:15 a.m. UTC 
This allows a small number of OPAL calls to succeed despite re-entering
the firmware, and rejects others rather than aborting.

This allows a system reset interrupt that interrupts OPAL to do something
useful. Sreset other CPUs, use the console, which allows xmon to work or
stack traces to be printed, reboot the system.

Use OPAL_INTERNAL_ERROR when rejecting, rather than OPAL_BUSY, which is
used for many other things that does not mean a serious permanent error.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 core/opal.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/core/opal.c b/core/opal.c
index e7940e7a..38f9d724 100644
--- a/core/opal.c
+++ b/core/opal.c
@@ -143,9 +143,22 @@  int64_t opal_entry_check(struct stack_frame *eframe)
 		return opal_bad_token(token);
 
 	if (!opal_quiesce_state && cpu->in_opal_call) {
-		printf("CPU ATTEMPT TO RE-ENTER FIRMWARE! PIR=%04lx cpu @%p -> pir=%04x token=%llu\n",
-		       mfspr(SPR_PIR), cpu, cpu->pir, token);
-		abort();
+		switch (token) {
+		case OPAL_CONSOLE_READ:
+		case OPAL_CONSOLE_WRITE:
+		case OPAL_CONSOLE_WRITE_BUFFER_SPACE:
+		case OPAL_CONSOLE_FLUSH:
+		case OPAL_POLL_EVENTS:
+		case OPAL_CHECK_TOKEN:
+		case OPAL_CEC_REBOOT:
+		case OPAL_CEC_REBOOT2:
+		case OPAL_SIGNAL_SYSTEM_RESET:
+			break;
+		default:
+			printf("CPU ATTEMPT TO RE-ENTER FIRMWARE! PIR=%04lx cpu @%p -> pir=%04x token=%llu\n",
+			       mfspr(SPR_PIR), cpu, cpu->pir, token);
+			return OPAL_INTERNAL_ERROR;
+		}
 	}
 
 again: