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

Commit 495dd859 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

KVM: ARM: vgic: abstract MISR decoding 



Instead of directly dealing with the GICH_MISR bits, move the code to
its own function and use a couple of public flags to represent the
actual state.

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 8d6a0313

include/kvm/arm_vgic.h

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ struct vgic_ops { 
	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);

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

};



struct vgic_dist {
@@ -165,6 +166,9 @@ struct vgic_cpu { 


#define LR_EMPTY	0xff



#define INT_STATUS_EOI		(1 << 0)

#define INT_STATUS_UNDERFLOW	(1 << 1)



struct kvm;

struct kvm_vcpu;

struct kvm_run;

virt/kvm/arm/vgic.c

+23 −3
Original line number Diff line number Diff line
@@ -1050,12 +1050,26 @@ static u64 vgic_v2_get_eisr(const struct kvm_vcpu *vcpu) 
	return val;

}



static u32 vgic_v2_get_interrupt_status(const struct kvm_vcpu *vcpu)

{

	u32 misr = vcpu->arch.vgic_cpu.vgic_v2.vgic_misr;

	u32 ret = 0;



	if (misr & GICH_MISR_EOI)

		ret |= INT_STATUS_EOI;

	if (misr & GICH_MISR_U)

		ret |= INT_STATUS_UNDERFLOW;



	return ret;

}



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,

	.get_interrupt_status	= vgic_v2_get_interrupt_status,

};



static struct vgic_lr vgic_get_lr(const struct kvm_vcpu *vcpu, int lr)
@@ -1085,6 +1099,11 @@ static inline u64 vgic_get_eisr(struct kvm_vcpu *vcpu) 
	return vgic_ops.get_eisr(vcpu);

}



static inline u32 vgic_get_interrupt_status(struct kvm_vcpu *vcpu)

{

	return vgic_ops.get_interrupt_status(vcpu);

}



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

{

	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
@@ -1282,11 +1301,12 @@ static void __kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu) 
static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)

{

	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;

	u32 status = vgic_get_interrupt_status(vcpu);

	bool level_pending = false;



	kvm_debug("MISR = %08x\n", vgic_cpu->vgic_v2.vgic_misr);

	kvm_debug("STATUS = %08x\n", status);



	if (vgic_cpu->vgic_v2.vgic_misr & GICH_MISR_EOI) {

	if (status & INT_STATUS_EOI) {

		/*

		 * Some level interrupts have been EOIed. Clear their

		 * active bit.
@@ -1319,7 +1339,7 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu) 
		}

	}



	if (vgic_cpu->vgic_v2.vgic_misr & GICH_MISR_U)

	if (status & INT_STATUS_UNDERFLOW)

		vgic_cpu->vgic_v2.vgic_hcr &= ~GICH_HCR_UIE;



	return level_pending;