summaryrefslogtreecommitdiff
path: root/arch/arm/kvm/init.S
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2016-02-01 22:56:31 +0300
committerMarc Zyngier <marc.zyngier@arm.com>2016-02-29 21:34:14 +0300
commitd4c7688c51e57be20ca5f3dffa4c8771888a42fc (patch)
treeef37556f1e5e57e9d9e5a582bf25f3daf1dfc636 /arch/arm/kvm/init.S
parentb98e2e728eed3091edbce64cfcc447a482b7726c (diff)
downloadlinux-d4c7688c51e57be20ca5f3dffa4c8771888a42fc.tar.xz
ARM: KVM: Switch to C-based stage2 init
As we now have hooks to setup VTCR from C code, let's drop the original VTCR setup and reimplement it as part of the HYP code. Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kvm/init.S')
-rw-r--r--arch/arm/kvm/init.S8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S
index 3988e72d16ff..1f9ae17476f9 100644
--- a/arch/arm/kvm/init.S
+++ b/arch/arm/kvm/init.S
@@ -84,14 +84,6 @@ __do_hyp_init:
orr r0, r0, r1
mcr p15, 4, r0, c2, c0, 2 @ HTCR
- mrc p15, 4, r1, c2, c1, 2 @ VTCR
- ldr r2, =VTCR_MASK
- bic r1, r1, r2
- bic r0, r0, #(~VTCR_HTCR_SH) @ clear non-reusable HTCR bits
- orr r1, r0, r1
- orr r1, r1, #(KVM_VTCR_SL0 | KVM_VTCR_T0SZ | KVM_VTCR_S)
- mcr p15, 4, r1, c2, c1, 2 @ VTCR
-
@ Use the same memory attributes for hyp. accesses as the kernel
@ (copy MAIRx ro HMAIRx).
mrc p15, 0, r0, c10, c2, 0