diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2012-11-06 14:27:59 -0500 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-12-05 06:26:50 -0500 |
commit | 7dbfbe5b2f5fc01fb0a19a0d58820ba4ebb07884 (patch) | |
tree | 1c0722e8dadc07c59089a9b1df50cbcd22aa7cf4 /arch/arm64 | |
parent | 712c6ff4dba4917a440be601dc312506322bffe8 (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')
-rw-r--r-- | arch/arm64/kernel/head.S | 3 |
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) | |||
185 | msr hstr_el2, xzr // Disable CP15 traps to EL2 | 185 | msr hstr_el2, xzr // Disable CP15 traps to EL2 |
186 | #endif | 186 | #endif |
187 | 187 | ||
188 | /* Stage-2 translation */ | ||
189 | msr vttbr_el2, xzr | ||
190 | |||
188 | /* Hypervisor stub */ | 191 | /* Hypervisor stub */ |
189 | adr x0, __hyp_stub_vectors | 192 | adr x0, __hyp_stub_vectors |
190 | msr vbar_el2, x0 | 193 | msr vbar_el2, x0 |