diff options
| author | Jintack Lim <jintack@cs.columbia.edu> | 2017-02-03 10:20:00 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2017-02-08 15:13:33 +0000 |
| commit | 90de943a430028ee389b22bf4a7ae5867c32ce0c (patch) | |
| tree | 80c64f76f1be349523dd346933858ed9c730fb1f /virt/kvm/arm/hyp | |
| parent | fbb4aeec5fc2ab47615b2a0cbabc503e1eef4c60 (diff) | |
| download | linux-90de943a430028ee389b22bf4a7ae5867c32ce0c.tar.bz2 | |
KVM: arm/arm64: Move cntvoff to each timer context
Make cntvoff per each timer context. This is helpful to abstract kvm
timer functions to work with timer context without considering timer
types (e.g. physical timer or virtual timer).
This also would pave the way for ever doing adjustments of the cntvoff
on a per-CPU basis if that should ever make sense.
Signed-off-by: Jintack Lim <jintack@cs.columbia.edu>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt/kvm/arm/hyp')
| -rw-r--r-- | virt/kvm/arm/hyp/timer-sr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/virt/kvm/arm/hyp/timer-sr.c b/virt/kvm/arm/hyp/timer-sr.c index 0cf08953e81c..4734915ab71f 100644 --- a/virt/kvm/arm/hyp/timer-sr.c +++ b/virt/kvm/arm/hyp/timer-sr.c @@ -53,7 +53,6 @@ void __hyp_text __timer_save_state(struct kvm_vcpu *vcpu) void __hyp_text __timer_restore_state(struct kvm_vcpu *vcpu) { - struct kvm *kvm = kern_hyp_va(vcpu->kvm); struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); u64 val; @@ -71,7 +70,7 @@ void __hyp_text __timer_restore_state(struct kvm_vcpu *vcpu) } if (timer->enabled) { - write_sysreg(kvm->arch.timer.cntvoff, cntvoff_el2); + write_sysreg(vtimer->cntvoff, cntvoff_el2); write_sysreg_el0(vtimer->cnt_cval, cntv_cval); isb(); write_sysreg_el0(vtimer->cnt_ctl, cntv_ctl); |