Commit 79e1a7e3 authored by Marc Zyngier's avatar Marc Zyngier Committed by Ben Hutchings

arm64: KVM: Preserve RES1 bits in SCTLR_EL2

commit d68c1f7f upstream.

__do_hyp_init has the rather bad habit of ignoring RES1 bits and
writing them back as zero. On a v8.0-8.2 CPU, this doesn't do anything
bad, but may end-up being pretty nasty on future revisions of the
architecture.

Let's preserve those bits so that we don't have to fix this later on.
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
[bwh: Backported to 3.16:
 - s/ELx/EL2/
 - Adjust filename, context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 5e05d501
...@@ -89,6 +89,11 @@ ...@@ -89,6 +89,11 @@
#define SCTLR_EL2_C (1 << 2) #define SCTLR_EL2_C (1 << 2)
#define SCTLR_EL2_A (1 << 1) #define SCTLR_EL2_A (1 << 1)
#define SCTLR_EL2_M 1 #define SCTLR_EL2_M 1
#define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \
(1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \
(1 << 28) | (1 << 29))
#define SCTLR_EL2_FLAGS (SCTLR_EL2_M | SCTLR_EL2_A | SCTLR_EL2_C | \ #define SCTLR_EL2_FLAGS (SCTLR_EL2_M | SCTLR_EL2_A | SCTLR_EL2_C | \
SCTLR_EL2_SA | SCTLR_EL2_I) SCTLR_EL2_SA | SCTLR_EL2_I)
......
...@@ -84,10 +84,12 @@ __do_hyp_init: ...@@ -84,10 +84,12 @@ __do_hyp_init:
tlbi alle2 tlbi alle2
dsb sy dsb sy
mrs x4, sctlr_el2 /*
and x4, x4, #SCTLR_EL2_EE // preserve endianness of EL2 * Preserve all the RES1 bits while setting the default flags,
ldr x5, =SCTLR_EL2_FLAGS * as well as the EE bit on BE.
orr x4, x4, x5 */
ldr x4, =(SCTLR_EL2_RES1 | SCTLR_EL2_FLAGS)
CPU_BE( orr x4, x4, #SCTLR_EL2_EE)
msr sctlr_el2, x4 msr sctlr_el2, x4
isb isb
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment