aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/head.S
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-11-29 17:48:31 -0500
committerCatalin Marinas <catalin.marinas@arm.com>2012-12-05 06:20:04 -0500
commit1f75ff0a3d63606c1345e316e88a903fd43ca8be (patch)
treed326cb2f58040c910390e80f5a5287b0074a0276 /arch/arm64/kernel/head.S
parent45a7905fc48f6079932e77d64237cf7f008db5f4 (diff)
arm64: generic timer: use virtual counter instead of physical at EL0
We want to use the virtual counter at EL0, as the physical counter may not track the current clocksource for guests running under a hypervisor. This patch updates the vdso and generic timer driver to use the virtual counter. The kernel EL2 entry code is also updated to ensure that the virtual offset is initialised to zero. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/head.S')
-rw-r--r--arch/arm64/kernel/head.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index a2f02b63eae9..90dec55b17a2 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -158,6 +158,7 @@ ENTRY(el2_setup)
158 mrs x0, cnthctl_el2 158 mrs x0, cnthctl_el2
159 orr x0, x0, #3 // Enable EL1 physical timers 159 orr x0, x0, #3 // Enable EL1 physical timers
160 msr cnthctl_el2, x0 160 msr cnthctl_el2, x0
161 msr cntvoff_el2, xzr // Clear virtual offset
161 162
162 /* Populate ID registers. */ 163 /* Populate ID registers. */
163 mrs x0, midr_el1 164 mrs x0, midr_el1