Commit 8b6958d6 authored by Jing Zhang's avatar Jing Zhang Committed by Oliver Upton
Browse files

KVM: arm64: Use guest ID register values for the sake of emulation 



Since KVM now supports per-VM ID registers, use per-VM ID register
values for the sake of emulation for DBGDIDR and LORegion.

Signed-off-by: default avatarJing Zhang <jingzhangos@google.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20231003230408.3405722-4-oliver.upton@linux.dev


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 6656cda0

arch/arm64/kvm/sys_regs.c

+3 −3
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static bool trap_loregion(struct kvm_vcpu *vcpu, 
			  struct sys_reg_params *p,

			  const struct sys_reg_desc *r)

{

	u64 val = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1);

	u64 val = IDREG(vcpu->kvm, SYS_ID_AA64MMFR1_EL1);

	u32 sr = reg_to_encoding(r);



	if (!(val & (0xfUL << ID_AA64MMFR1_EL1_LO_SHIFT))) {
@@ -2445,8 +2445,8 @@ static bool trap_dbgdidr(struct kvm_vcpu *vcpu, 
	if (p->is_write) {

		return ignore_write(vcpu, p);

	} else {

		u64 dfr = read_sanitised_ftr_reg(SYS_ID_AA64DFR0_EL1);

		u64 pfr = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1);

		u64 dfr = IDREG(vcpu->kvm, SYS_ID_AA64DFR0_EL1);

		u64 pfr = IDREG(vcpu->kvm, SYS_ID_AA64PFR0_EL1);

		u32 el3 = !!cpuid_feature_extract_unsigned_field(pfr, ID_AA64PFR0_EL1_EL3_SHIFT);



		p->regval = ((((dfr >> ID_AA64DFR0_EL1_WRPs_SHIFT) & 0xf) << 28) |