| Message ID | 20200427110813.1276533-3-npiggin@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | assorted fixes and preparation (try again) | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (0f1937ef40fca0c3212a9dff1010b832a24fb063) |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
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
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(-)