aboutsummaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorKarimAllah Ahmed <karahmed@amazon.de>2020-03-16 10:39:06 +0100
committerMarc Zyngier <maz@kernel.org>2020-03-16 16:24:17 +0000
commit76a5db107273b1ad01471e48c49635e2b944a7f4 (patch)
treecf99272908843cc46ef919b1f1d2b0a556b7a1b7 /virt
parent98d54f81e36ba3bf92172791eba5ca5bd813989b (diff)
downloadlinux-76a5db107273b1ad01471e48c49635e2b944a7f4.tar.gz
KVM: arm64: Use the correct timer structure to access the physical counter
Use the physical timer structure when reading the physical counter instead of using the virtual timer structure. Thankfully, nothing is accessing this code path yet (at least not until we enable save/restore of the physical counter). It doesn't hurt for this to be correct though. Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de> [maz: amended commit log] Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Zenghui Yu <yuzenghui@huawei.com> Fixes: 84135d3d18da ("KVM: arm/arm64: consolidate arch timer trap handlers") Link: https://lore.kernel.org/r/1584351546-5018-1-git-send-email-karahmed@amazon.de
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/arm/arch_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 0d9438e9de2a..93bd59b46848 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -788,7 +788,7 @@ u64 kvm_arm_timer_get_reg(struct kvm_vcpu *vcpu, u64 regid)
vcpu_ptimer(vcpu), TIMER_REG_CTL);
case KVM_REG_ARM_PTIMER_CNT:
return kvm_arm_timer_read(vcpu,
- vcpu_vtimer(vcpu), TIMER_REG_CNT);
+ vcpu_ptimer(vcpu), TIMER_REG_CNT);
case KVM_REG_ARM_PTIMER_CVAL:
return kvm_arm_timer_read(vcpu,
vcpu_ptimer(vcpu), TIMER_REG_CVAL);