diff options
| author | James Morse <james.morse@arm.com> | 2020-05-29 15:06:55 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-06-09 09:04:42 +0100 |
| commit | ef5a294be8d0e17b91d23be905f69368b0d3952e (patch) | |
| tree | ed074ebbee8a867019b1eadd99081a2ec5fb0598 /arch/arm64/kvm/sys_regs_generic_v8.c | |
| parent | 7c582bf4ed84f3eb58bdd1f63024a14c17551e7d (diff) | |
| download | linux-ef5a294be8d0e17b91d23be905f69368b0d3952e.tar.bz2 | |
KVM: arm64: Add emulation for 32bit guests accessing ACTLR2
ACTLR_EL1 is a 64bit register while the 32bit ACTLR is obviously 32bit.
For 32bit software, the extra bits are accessible via ACTLR2... which
KVM doesn't emulate.
Suggested-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200529150656.7339-3-james.morse@arm.com
Diffstat (limited to 'arch/arm64/kvm/sys_regs_generic_v8.c')
| -rw-r--r-- | arch/arm64/kvm/sys_regs_generic_v8.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm64/kvm/sys_regs_generic_v8.c b/arch/arm64/kvm/sys_regs_generic_v8.c index 9cb6b4c8355a..aa9d356451eb 100644 --- a/arch/arm64/kvm/sys_regs_generic_v8.c +++ b/arch/arm64/kvm/sys_regs_generic_v8.c @@ -27,6 +27,14 @@ static bool access_actlr(struct kvm_vcpu *vcpu, return ignore_write(vcpu, p); p->regval = vcpu_read_sys_reg(vcpu, ACTLR_EL1); + + if (p->is_aarch32) { + if (r->Op2 & 2) + p->regval = upper_32_bits(p->regval); + else + p->regval = lower_32_bits(p->regval); + } + return true; } @@ -47,6 +55,8 @@ static const struct sys_reg_desc genericv8_cp15_regs[] = { /* ACTLR */ { Op1(0b000), CRn(0b0001), CRm(0b0000), Op2(0b001), access_actlr }, + { Op1(0b000), CRn(0b0001), CRm(0b0000), Op2(0b011), + access_actlr }, }; static struct kvm_sys_reg_target_table genericv8_target_table = { |