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

Commit 909d9b50 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

KVM: ARM: vgic: move underflow handling to vgic_ops 



Move the code dealing with LR underflow handling to its own functions,
and make them accessible through vgic_ops.

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 495dd859

include/kvm/arm_vgic.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ struct vgic_ops { 
	u64	(*get_elrsr)(const struct kvm_vcpu *vcpu);

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

	u32	(*get_interrupt_status)(const struct kvm_vcpu *vcpu);

	void	(*enable_underflow)(struct kvm_vcpu *vcpu);

	void	(*disable_underflow)(struct kvm_vcpu *vcpu);

};



struct vgic_dist {

virt/kvm/arm/vgic.c

+25 −3
Original line number Diff line number Diff line
@@ -1063,6 +1063,16 @@ static u32 vgic_v2_get_interrupt_status(const struct kvm_vcpu *vcpu) 
	return ret;

}



static void vgic_v2_enable_underflow(struct kvm_vcpu *vcpu)

{

	vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr |= GICH_HCR_UIE;

}



static void vgic_v2_disable_underflow(struct kvm_vcpu *vcpu)

{

	vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr &= ~GICH_HCR_UIE;

}



static const struct vgic_ops vgic_ops = {

	.get_lr			= vgic_v2_get_lr,

	.set_lr			= vgic_v2_set_lr,
@@ -1070,6 +1080,8 @@ static const struct vgic_ops vgic_ops = { 
	.get_elrsr		= vgic_v2_get_elrsr,

	.get_eisr		= vgic_v2_get_eisr,

	.get_interrupt_status	= vgic_v2_get_interrupt_status,

	.enable_underflow	= vgic_v2_enable_underflow,

	.disable_underflow	= vgic_v2_disable_underflow,

};



static struct vgic_lr vgic_get_lr(const struct kvm_vcpu *vcpu, int lr)
@@ -1104,6 +1116,16 @@ static inline u32 vgic_get_interrupt_status(struct kvm_vcpu *vcpu) 
	return vgic_ops.get_interrupt_status(vcpu);

}



static inline void vgic_enable_underflow(struct kvm_vcpu *vcpu)

{

	vgic_ops.enable_underflow(vcpu);

}



static inline void vgic_disable_underflow(struct kvm_vcpu *vcpu)

{

	vgic_ops.disable_underflow(vcpu);

}



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

{

	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
@@ -1285,9 +1307,9 @@ static void __kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu) 


epilog:

	if (overflow) {

		vgic_cpu->vgic_v2.vgic_hcr |= GICH_HCR_UIE;

		vgic_enable_underflow(vcpu);

	} else {

		vgic_cpu->vgic_v2.vgic_hcr &= ~GICH_HCR_UIE;

		vgic_disable_underflow(vcpu);

		/*

		 * We're about to run this VCPU, and we've consumed

		 * everything the distributor had in store for
@@ -1340,7 +1362,7 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu) 
	}



	if (status & INT_STATUS_UNDERFLOW)

		vgic_cpu->vgic_v2.vgic_hcr &= ~GICH_HCR_UIE;

		vgic_disable_underflow(vcpu);



	return level_pending;

}