Revert "Save and restore virtual timer registers."
This reverts commit ba79ce3fe1ff85b1a6947d9ac1a380a9ace4677f.
Reason for revert: it breaks Linux's ability to preempt VMs.
Change-Id: I656d977c39f269974e1bd34f989880caa6676d92
diff --git a/src/arch/aarch64/exceptions.S b/src/arch/aarch64/exceptions.S
index 0765b8b..0f06bdd 100644
--- a/src/arch/aarch64/exceptions.S
+++ b/src/arch/aarch64/exceptions.S
@@ -306,11 +306,7 @@
stp x24, x25, [x1, #VCPU_LAZY + 16 * 12]
mrs x26, vttbr_el2
- mrs x27, cntv_cval_el0
- stp x26, x27, [x1, #VCPU_LAZY + 16 * 13]
-
- mrs x28, cntv_ctl_el0
- str x28, [x1, #VCPU_LAZY + 16 * 14]
+ str x26, [x1, #VCPU_LAZY + 16 * 13]
/* Save new vcpu pointer in non-volatile register. */
mov x19, x0
@@ -379,12 +375,8 @@
msr cptr_el2, x24
msr cnthctl_el2, x25
- ldp x26, x27, [x0, #VCPU_LAZY + 16 * 13]
+ ldr x26, [x0, #VCPU_LAZY + 16 * 13]
msr vttbr_el2, x26
- msr cntv_cval_el0, x27
-
- ldr x28, [x0, #VCPU_LAZY + 16 * 14]
- msr cntv_ctl_el0, x28
/* Restore non-volatile registers. */
ldp x19, x20, [x0, #VCPU_REGS + 8 * 19]