[Skiboot] [PATCH 02/16] asm/head.S: QUIESCE_REJECT fix

Nicholas Piggin npiggin at gmail.com
Mon Apr 27 21:07:59 AEST 2020


This was returning to the wrong point and loading some garbage that
had not been set up yet.

Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
---
 asm/head.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/asm/head.S b/asm/head.S
index aea49d279..735e624bc 100644
--- a/asm/head.S
+++ b/asm/head.S
@@ -881,7 +881,7 @@ opal_entry:
 	cmpwi	%cr0,%r11,QUIESCE_REJECT
 	bne	2f
 	li	%r3,OPAL_BUSY
-	b	.Lreturn /* reject */
+	b	.Lreject
 2:	/* hold */
 	lwz	%r11,CPUTHREAD_IN_OPAL_CALL(%r12)
 	subi	%r11,%r11,1
@@ -984,6 +984,7 @@ opal_entry:
 	mr	%r12,%r13
 	ld	%r13,STACK_GPR13(%r1)
 	ld	%r1,STACK_GPR1(%r1)
+.Lreject:
 	sync 	/* release barrier vs quiescing */
 	lwz	%r11,CPUTHREAD_IN_OPAL_CALL(%r12)
 	subi	%r11,%r11,1
-- 
2.23.0



More information about the Skiboot mailing list