aboutsummaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2020-04-27 21:07:59 +1000
committerOliver O'Halloran <oohall@gmail.com>2020-06-11 10:26:29 +1000
commit7f3dfa7fc8478d22a4cd8af45fc636c3ed9737ea (patch)
tree25f7bead61d1908701ce97404eb19929b8421488 /asm
parentfccf34706ab1c5bc2cd25236ef4b1940de8d6eef (diff)
downloadskiboot-7f3dfa7fc8478d22a4cd8af45fc636c3ed9737ea.zip
skiboot-7f3dfa7fc8478d22a4cd8af45fc636c3ed9737ea.tar.gz
skiboot-7f3dfa7fc8478d22a4cd8af45fc636c3ed9737ea.tar.bz2
asm/head.S: QUIESCE_REJECT fix
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> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'asm')
-rw-r--r--asm/head.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/asm/head.S b/asm/head.S
index afe73bb..96ab2c4 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