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

Commit 8d6a0313 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

KVM: ARM: vgic: abstract EISR bitmap access 



Move the GICH_EISR access to its own function.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 69bb2c9f

include/kvm/arm_vgic.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct vgic_ops { 
	void	(*set_lr)(struct kvm_vcpu *, int, struct vgic_lr);

	void	(*sync_lr_elrsr)(struct kvm_vcpu *, int, struct vgic_lr);

	u64	(*get_elrsr)(const struct kvm_vcpu *vcpu);

	u64	(*get_eisr)(const struct kvm_vcpu *vcpu);

};



struct vgic_dist {

virt/kvm/arm/vgic.c

+23 −2
Original line number Diff line number Diff line
@@ -1036,11 +1036,26 @@ static u64 vgic_v2_get_elrsr(const struct kvm_vcpu *vcpu) 
	return val;

}



static u64 vgic_v2_get_eisr(const struct kvm_vcpu *vcpu)

{

	u64 val;



#if BITS_PER_LONG == 64

	val  = vcpu->arch.vgic_cpu.vgic_v2.vgic_eisr[1];

	val <<= 32;

	val |= vcpu->arch.vgic_cpu.vgic_v2.vgic_eisr[0];

#else

	val = *(u64 *)vcpu->arch.vgic_cpu.vgic_v2.vgic_eisr;

#endif

	return val;

}



static const struct vgic_ops vgic_ops = {

	.get_lr			= vgic_v2_get_lr,

	.set_lr			= vgic_v2_set_lr,

	.sync_lr_elrsr		= vgic_v2_sync_lr_elrsr,

	.get_elrsr		= vgic_v2_get_elrsr,

	.get_eisr		= vgic_v2_get_eisr,

};



static struct vgic_lr vgic_get_lr(const struct kvm_vcpu *vcpu, int lr)
@@ -1065,6 +1080,11 @@ static inline u64 vgic_get_elrsr(struct kvm_vcpu *vcpu) 
	return vgic_ops.get_elrsr(vcpu);

}



static inline u64 vgic_get_eisr(struct kvm_vcpu *vcpu)

{

	return vgic_ops.get_eisr(vcpu);

}



static void vgic_retire_lr(int lr_nr, int irq, struct kvm_vcpu *vcpu)

{

	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
@@ -1271,10 +1291,11 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu) 
		 * Some level interrupts have been EOIed. Clear their

		 * active bit.

		 */

		u64 eisr = vgic_get_eisr(vcpu);

		unsigned long *eisr_ptr = (unsigned long *)&eisr;

		int lr;



		for_each_set_bit(lr, (unsigned long *)vgic_cpu->vgic_v2.vgic_eisr,

				 vgic_cpu->nr_lr) {

		for_each_set_bit(lr, eisr_ptr, vgic_cpu->nr_lr) {

			struct vgic_lr vlr = vgic_get_lr(vcpu, lr);



			vgic_irq_clear_active(vcpu, vlr.irq);