diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2017-06-06 19:08:35 +0100 |
---|---|---|
committer | Christoffer Dall <cdall@linaro.org> | 2017-06-06 22:20:02 +0200 |
commit | 33b5c38852b29736f3b472dd095c9a18ec22746f (patch) | |
tree | b15b4efb4211b2e6670fb6d3bbcc2dd740272cb0 /arch | |
parent | 78fd6dcf11468a5a131b8365580d0c613bcc02cb (diff) | |
download | linux-33b5c38852b29736f3b472dd095c9a18ec22746f.tar.gz linux-33b5c38852b29736f3b472dd095c9a18ec22746f.tar.bz2 linux-33b5c38852b29736f3b472dd095c9a18ec22746f.zip |
arm: KVM: Allow unaligned accesses at HYP
We currently have the HSCTLR.A bit set, trapping unaligned accesses
at HYP, but we're not really prepared to deal with it.
Since the rest of the kernel is pretty happy about that, let's follow
its example and set HSCTLR.A to zero. Modern CPUs don't really care.
Cc: stable@vger.kernel.org
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kvm/init.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S index 570ed4a9c261..5386528665b5 100644 --- a/arch/arm/kvm/init.S +++ b/arch/arm/kvm/init.S @@ -104,7 +104,6 @@ __do_hyp_init: @ - Write permission implies XN: disabled @ - Instruction cache: enabled @ - Data/Unified cache: enabled - @ - Memory alignment checks: enabled @ - MMU: enabled (this code must be run from an identity mapping) mrc p15, 4, r0, c1, c0, 0 @ HSCR ldr r2, =HSCTLR_MASK @@ -112,8 +111,8 @@ __do_hyp_init: mrc p15, 0, r1, c1, c0, 0 @ SCTLR ldr r2, =(HSCTLR_EE | HSCTLR_FI | HSCTLR_I | HSCTLR_C) and r1, r1, r2 - ARM( ldr r2, =(HSCTLR_M | HSCTLR_A) ) - THUMB( ldr r2, =(HSCTLR_M | HSCTLR_A | HSCTLR_TE) ) + ARM( ldr r2, =(HSCTLR_M) ) + THUMB( ldr r2, =(HSCTLR_M | HSCTLR_TE) ) orr r1, r1, r2 orr r0, r0, r1 mcr p15, 4, r0, c1, c0, 0 @ HSCR |