summaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/head.S
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-11-06 19:27:59 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2012-12-05 11:26:50 +0000
commit7dbfbe5b2f5fc01fb0a19a0d58820ba4ebb07884 (patch)
tree1c0722e8dadc07c59089a9b1df50cbcd22aa7cf4 /arch/arm64/kernel/head.S
parent712c6ff4dba4917a440be601dc312506322bffe8 (diff)
arm64: hyp: initialize vttbr_el2 to zero
The architecture doesn't mandate any reset value for vttbr_el2. Better set it to a known value before some HYP code gets confused. Signed-off-by: Marc Zyngier <marc.zyngier@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.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 5792749e34c4..368ad1f7c36c 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -185,6 +185,9 @@ ENTRY(el2_setup)
msr hstr_el2, xzr // Disable CP15 traps to EL2
#endif
+ /* Stage-2 translation */
+ msr vttbr_el2, xzr
+
/* Hypervisor stub */
adr x0, __hyp_stub_vectors
msr vbar_el2, x0