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

Commit f8b630bc authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: vgic-v3: Add ICV_IGRPEN1_EL1 handler 



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

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

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

+23 −0
Original line number Diff line number Diff line
@@ -401,6 +401,23 @@ static unsigned int __hyp_text __vgic_v3_get_bpr1(u32 vmcr) 
	return bpr;

}



static void __hyp_text __vgic_v3_read_igrpen1(struct kvm_vcpu *vcpu, u32 vmcr, int rt)

{

	vcpu_set_reg(vcpu, rt, !!(vmcr & ICH_VMCR_ENG1_MASK));

}



static void __hyp_text __vgic_v3_write_igrpen1(struct kvm_vcpu *vcpu, u32 vmcr, int rt)

{

	u64 val = vcpu_get_reg(vcpu, rt);



	if (val & 1)

		vmcr |= ICH_VMCR_ENG1_MASK;

	else

		vmcr &= ~ICH_VMCR_ENG1_MASK;



	__vgic_v3_write_vmcr(vmcr);

}



static void __hyp_text __vgic_v3_read_bpr1(struct kvm_vcpu *vcpu, u32 vmcr, int rt)

{

	vcpu_set_reg(vcpu, rt, __vgic_v3_get_bpr1(vmcr));
@@ -448,6 +465,12 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) 
	is_read = (esr & ESR_ELx_SYS64_ISS_DIR_MASK) == ESR_ELx_SYS64_ISS_DIR_READ;



	switch (sysreg) {

	case SYS_ICC_GRPEN1_EL1:

		if (is_read)

			fn = __vgic_v3_read_igrpen1;

		else

			fn = __vgic_v3_write_igrpen1;

		break;

	case SYS_ICC_BPR1_EL1:

		if (is_read)

			fn = __vgic_v3_read_bpr1;