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

Commit 423de85a authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: vgic-v3: Add ICV_BPR0_EL1 handler 



Add a handler for reading/writing the guest's view of the ICC_BPR0_EL1
register, which is located in the ICH_VMCR_EL2.BPR0 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>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarChristoffer Dall <cdall@linaro.org>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 182936ee

arch/arm64/include/asm/sysreg.h

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ 


#define SYS_VBAR_EL1			sys_reg(3, 0, 12, 0, 0)



#define SYS_ICC_BPR0_EL1		sys_reg(3, 0, 12, 8, 3)

#define SYS_ICC_AP1Rn_EL1(n)		sys_reg(3, 0, 12, 9, n)

#define SYS_ICC_DIR_EL1			sys_reg(3, 0, 12, 11, 1)

#define SYS_ICC_SGI1R_EL1		sys_reg(3, 0, 12, 11, 5)

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

+28 −0
Original line number Diff line number Diff line
@@ -706,11 +706,33 @@ static void __hyp_text __vgic_v3_write_igrpen1(struct kvm_vcpu *vcpu, u32 vmcr, 
	__vgic_v3_write_vmcr(vmcr);

}



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

{

	vcpu_set_reg(vcpu, rt, __vgic_v3_get_bpr0(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));

}



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

{

	u64 val = vcpu_get_reg(vcpu, rt);

	u8 bpr_min = __vgic_v3_bpr_min() - 1;



	/* Enforce BPR limiting */

	if (val < bpr_min)

		val = bpr_min;



	val <<= ICH_VMCR_BPR0_SHIFT;

	val &= ICH_VMCR_BPR0_MASK;

	vmcr &= ~ICH_VMCR_BPR0_MASK;

	vmcr |= val;



	__vgic_v3_write_vmcr(vmcr);

}



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

{

	u64 val = vcpu_get_reg(vcpu, rt);
@@ -888,6 +910,12 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) 
	case SYS_ICC_HPPIR1_EL1:

		fn = __vgic_v3_read_hppir;

		break;

	case SYS_ICC_BPR0_EL1:

		if (is_read)

			fn = __vgic_v3_read_bpr0;

		else

			fn = __vgic_v3_write_bpr0;

		break;

	default:

		return 0;

	}