[1/9] asm/head.S: QUIESCE_REJECT fix
diff mbox series

Message ID 20200226183408.1626737-2-npiggin@gmail.com
State New
Headers show
Series
  • assorted fixes and preparation
Related show

Checks

Context Check Description
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco success Signed-off-by present
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot success Test snowpatch/job/snowpatch-skiboot on branch master
snowpatch_ozlabs/apply_patch success Successfully applied on branch master (f123417068e51842004bdc047c8c5107b70442ef)

Commit Message

Nicholas Piggin Feb. 26, 2020, 6:34 p.m. UTC
This was returning to the wrong point and loading some garbage that
had not been set up yet.

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

Patch
diff mbox series

diff --git a/asm/head.S b/asm/head.S
index b565f6c9c..0b4b1a5f0 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