Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6293d651 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: vgic-v3: Add ICV_PMR_EL1 handler 



Add a handler for reading/writing the guest's view of the ICC_PMR_EL1
register, which is located in the ICH_VMCR_EL2.VPMR field.

Tested-by: default avatarAlexander Graf <agraf@suse.de>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarChristoffer Dall <cdall@linaro.org>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent d840b2d3

virt/kvm/arm/hyp/vgic-v3-sr.c

+27 −0
Original line number Diff line number Diff line
@@ -884,6 +884,27 @@ static void __hyp_text __vgic_v3_read_hppir(struct kvm_vcpu *vcpu, 
	vcpu_set_reg(vcpu, rt, lr_val & ICH_LR_VIRTUAL_ID_MASK);

}



static void __hyp_text __vgic_v3_read_pmr(struct kvm_vcpu *vcpu,

					  u32 vmcr, int rt)

{

	vmcr &= ICH_VMCR_PMR_MASK;

	vmcr >>= ICH_VMCR_PMR_SHIFT;

	vcpu_set_reg(vcpu, rt, vmcr);

}



static void __hyp_text __vgic_v3_write_pmr(struct kvm_vcpu *vcpu,

					   u32 vmcr, int rt)

{

	u32 val = vcpu_get_reg(vcpu, rt);



	val <<= ICH_VMCR_PMR_SHIFT;

	val &= ICH_VMCR_PMR_MASK;

	vmcr &= ~ICH_VMCR_PMR_MASK;

	vmcr |= val;



	write_gicreg(vmcr, ICH_VMCR_EL2);

}



static void __hyp_text __vgic_v3_read_rpr(struct kvm_vcpu *vcpu,

					  u32 vmcr, int rt)

{
@@ -1029,6 +1050,12 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) 
		else

			fn = __vgic_v3_write_ctlr;

		break;

	case SYS_ICC_PMR_EL1:

		if (is_read)

			fn = __vgic_v3_read_pmr;

		else

			fn = __vgic_v3_write_pmr;

		break;

	default:

		return 0;

	}