Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f793c23e authored by Mark Rutland's avatar Mark Rutland
Browse files

ARM: KVM: arch_timers: zero CNTVOFF upon return to host



To use the virtual counters from the host, we need to ensure that
CNTVOFF doesn't change unexpectedly. When we change to a guest, we
replace the host's CNTVOFF, but we don't restore it when returning to
the host.

As the host sets CNTVOFF to zero, and never changes it, we can simply
zero CNTVOFF when returning to the host. This patch adds said zeroing to
the return to host path.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarChristoffer Dall <cdall@cs.columbia.edu>
parent 0af0b189
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -497,6 +497,10 @@ vcpu .req r0 @ vcpu pointer always in r0
	add	r5, vcpu, r4
	strd	r2, r3, [r5]

	@ Ensure host CNTVCT == CNTPCT
	mov	r2, #0
	mcrr	p15, 4, r2, r2, c14	@ CNTVOFF

1:
#endif
	@ Allow physical timer/counter access for the host