diff options
| author | Christoffer Dall <[email protected]> | 2017-11-20 11:10:15 +0000 |
|---|---|---|
| committer | Christoffer Dall <[email protected]> | 2017-11-29 15:46:09 +0000 |
| commit | ec6449a9c2296b1c04f6219f7473e0c2fedecfed (patch) | |
| tree | 2ee426e7d249629cb65c9c098ec2f4a924ee91fe /include/kvm/arm_arch_timer.h | |
| parent | Linux 4.15-rc1 (diff) | |
| download | kernel-ec6449a9c2296b1c04f6219f7473e0c2fedecfed.tar.gz kernel-ec6449a9c2296b1c04f6219f7473e0c2fedecfed.zip | |
KVM: arm/arm64: Don't enable/disable physical timer access on VHE
After the timer optimization rework we accidentally end up calling
physical timer enable/disable functions on VHE systems, which is neither
needed nor correct, since the CNTHCTL_EL2 register format is
different when HCR_EL2.E2H is set.
The CNTHCTL_EL2 is initialized when CPUs become online in
kvm_timer_init_vhe() and we don't have to call these functions on VHE
systems, which also allows us to inline the non-VHE functionality.
Reported-by: Jintack Lim <[email protected]>
Signed-off-by: Christoffer Dall <[email protected]>
Diffstat (limited to 'include/kvm/arm_arch_timer.h')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index 01ee473517e2..6e45608b2399 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -93,7 +93,4 @@ void kvm_timer_init_vhe(void); #define vcpu_vtimer(v) (&(v)->arch.timer_cpu.vtimer) #define vcpu_ptimer(v) (&(v)->arch.timer_cpu.ptimer) -void enable_el1_phys_timer_access(void); -void disable_el1_phys_timer_access(void); - #endif |