diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-15 15:23:56 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-15 15:23:56 +0300 |
| commit | 24422df3fb862b3b1a6791f72141e79724adc244 (patch) | |
| tree | 2b3b107bce84d69942998bfecee06789182698c1 /include | |
| parent | e2145c99b53ec88105c69bbbb577265660d08c69 (diff) | |
| parent | 9404673293b065cbb16b8915530147cac7e80b4d (diff) | |
| download | linux-24422df3fb862b3b1a6791f72141e79724adc244.tar.xz | |
Merge tag 'kvmarm-fixes-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.6, take #2
- Fix the handling of the phycal timer offset when FEAT_ECV
and CNTPOFF_EL2 are implemented.
- Restore the functionnality of Permission Indirection that
was broken by the Fine Grained Trapping rework
- Cleanup some PMU event sharing code
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index bb3cb005873e..e748bc957d83 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -82,6 +82,8 @@ struct timer_map { struct arch_timer_context *emul_ptimer; }; +void get_timer_map(struct kvm_vcpu *vcpu, struct timer_map *map); + struct arch_timer_cpu { struct arch_timer_context timers[NR_KVM_TIMERS]; @@ -145,4 +147,9 @@ u64 timer_get_cval(struct arch_timer_context *ctxt); void kvm_timer_cpu_up(void); void kvm_timer_cpu_down(void); +static inline bool has_cntpoff(void) +{ + return (has_vhe() && cpus_have_final_cap(ARM64_HAS_ECV_CNTPOFF)); +} + #endif |