|
@@ -220,10 +220,18 @@ struct kvm_vcpu_events {
|
|
|
#define KVM_REG_ARM_PTIMER_CVAL ARM64_SYS_REG(3, 3, 14, 2, 2)
|
|
|
#define KVM_REG_ARM_PTIMER_CNT ARM64_SYS_REG(3, 3, 14, 0, 1)
|
|
|
|
|
|
-/* EL0 Virtual Timer Registers */
|
|
|
+/*
|
|
|
+ * EL0 Virtual Timer Registers
|
|
|
+ *
|
|
|
+ * WARNING:
|
|
|
+ * KVM_REG_ARM_TIMER_CVAL and KVM_REG_ARM_TIMER_CNT are not defined
|
|
|
+ * with the appropriate register encodings. Their values have been
|
|
|
+ * accidentally swapped. As this is set API, the definitions here
|
|
|
+ * must be used, rather than ones derived from the encodings.
|
|
|
+ */
|
|
|
#define KVM_REG_ARM_TIMER_CTL ARM64_SYS_REG(3, 3, 14, 3, 1)
|
|
|
-#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)
|
|
|
#define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2)
|
|
|
+#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)
|
|
|
|
|
|
/* KVM-as-firmware specific pseudo-registers */
|
|
|
#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT)
|