|
@@ -745,6 +745,9 @@ ENTRY(__kvm_vcpu_run)
|
|
|
// Guest context
|
|
|
add x2, x0, #VCPU_CONTEXT
|
|
|
|
|
|
+ // We must restore the 32-bit state before the sysregs, thanks
|
|
|
+ // to Cortex-A57 erratum #852523.
|
|
|
+ restore_guest_32bit_state
|
|
|
bl __restore_sysregs
|
|
|
|
|
|
skip_debug_state x3, 1f
|
|
@@ -752,7 +755,6 @@ ENTRY(__kvm_vcpu_run)
|
|
|
kern_hyp_va x3
|
|
|
bl __restore_debug
|
|
|
1:
|
|
|
- restore_guest_32bit_state
|
|
|
restore_guest_regs
|
|
|
|
|
|
// That's it, no more messing around.
|