diff options
| author | Marc Zyngier <maz@kernel.org> | 2019-06-28 17:23:43 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-07 11:28:38 +0300 |
| commit | 41ce82f63c0624556b94b90551e4f70a0c913879 (patch) | |
| tree | 3ae626e6158a6da3417b80f3d59a8679257f70e9 /arch/arm64/kvm/trace_arm.h | |
| parent | 3c5ff0c60f2febb170bc4096d4b8a8390ebb0bad (diff) | |
| download | linux-41ce82f63c0624556b94b90551e4f70a0c913879.tar.xz | |
KVM: arm64: timers: Move timer registers to the sys_regs file
Move the timer gsisters to the sysreg file. This will further help when
they are directly changed by a nesting hypervisor in the VNCR page.
This requires moving the initialisation of the timer struct so that some
of the helpers (such as arch_timer_ctx_index) can work correctly at an
early stage.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/trace_arm.h')
| -rw-r--r-- | arch/arm64/kvm/trace_arm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/kvm/trace_arm.h b/arch/arm64/kvm/trace_arm.h index 4c71270cc097..4691053c5ee4 100644 --- a/arch/arm64/kvm/trace_arm.h +++ b/arch/arm64/kvm/trace_arm.h @@ -301,8 +301,8 @@ TRACE_EVENT(kvm_timer_save_state, ), TP_fast_assign( - __entry->ctl = ctx->cnt_ctl; - __entry->cval = ctx->cnt_cval; + __entry->ctl = timer_get_ctl(ctx); + __entry->cval = timer_get_cval(ctx); __entry->timer_idx = arch_timer_ctx_index(ctx); ), @@ -323,8 +323,8 @@ TRACE_EVENT(kvm_timer_restore_state, ), TP_fast_assign( - __entry->ctl = ctx->cnt_ctl; - __entry->cval = ctx->cnt_cval; + __entry->ctl = timer_get_ctl(ctx); + __entry->cval = timer_get_cval(ctx); __entry->timer_idx = arch_timer_ctx_index(ctx); ), |