diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2015-06-04 15:28:37 +0200 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2015-06-17 10:46:29 +0200 |
| commit | 921ef1e16c762db13be740a35e691104d6740572 (patch) | |
| tree | a462ac0d104c72bf4c6a15b8b1f3aaaa1fbb47ec | |
| parent | KVM: arm/arm64: Enable the KVM-VFIO device (diff) | |
| download | linux-921ef1e16c762db13be740a35e691104d6740572.tar.xz linux-921ef1e16c762db13be740a35e691104d6740572.zip | |
KVM: arm64: fix misleading comments in save/restore
The elr_el2 and spsr_el2 registers in fact contain the processor state
before entry into EL2. In the case of guest state it could be in either
el0 or el1.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
| -rw-r--r-- | arch/arm64/kvm/hyp.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index 5befd010e232..519805f71876 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -50,8 +50,8 @@ stp x29, lr, [x3, #80] mrs x19, sp_el0 - mrs x20, elr_el2 // EL1 PC - mrs x21, spsr_el2 // EL1 pstate + mrs x20, elr_el2 // pc before entering el2 + mrs x21, spsr_el2 // pstate before entering el2 stp x19, x20, [x3, #96] str x21, [x3, #112] @@ -82,8 +82,8 @@ ldr x21, [x3, #16] msr sp_el0, x19 - msr elr_el2, x20 // EL1 PC - msr spsr_el2, x21 // EL1 pstate + msr elr_el2, x20 // pc on return from el2 + msr spsr_el2, x21 // pstate on return from el2 add x3, x2, #CPU_XREG_OFFSET(19) ldp x19, x20, [x3] |