diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-02-15 17:02:06 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-02-03 10:59:06 +0000 |
| commit | bea7e97fef888421ecc21d03c6e4f9ae1451a78d (patch) | |
| tree | 572dfebf386a73a710dd574cb59acf0739075d8b /arch/arm64 | |
| parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
| download | linux-stable-bea7e97fef888421ecc21d03c6e4f9ae1451a78d.tar.gz linux-stable-bea7e97fef888421ecc21d03c6e4f9ae1451a78d.tar.bz2 linux-stable-bea7e97fef888421ecc21d03c6e4f9ae1451a78d.zip | |
KVM: arm64: Fix missing RES1 in emulation of DBGBIDR
The AArch32 CP14 DBGDIDR has bit 15 set to RES1, which our current
emulation doesn't set. Just add the missing bit.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kvm/sys_regs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 3313dedfa505..0c0832472c4a 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1711,7 +1711,7 @@ static bool trap_dbgidr(struct kvm_vcpu *vcpu, p->regval = ((((dfr >> ID_AA64DFR0_WRPS_SHIFT) & 0xf) << 28) | (((dfr >> ID_AA64DFR0_BRPS_SHIFT) & 0xf) << 24) | (((dfr >> ID_AA64DFR0_CTX_CMPS_SHIFT) & 0xf) << 20) - | (6 << 16) | (el3 << 14) | (el3 << 12)); + | (6 << 16) | (1 << 15) | (el3 << 14) | (el3 << 12)); return true; } } |