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

Commit 58e0c973 authored by Jintack Lim's avatar Jintack Lim Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Update the physical timer interrupt level 



Now that we maintain the EL1 physical timer register states of VMs,
update the physical timer interrupt level along with the virtual one.

Signed-off-by: default avatarJintack Lim <jintack@cs.columbia.edu>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent a91d1855

virt/kvm/arm/arch_timer.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -186,6 +186,7 @@ static int kvm_timer_update_state(struct kvm_vcpu *vcpu) 
{

{

	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;

	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;

	struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);

	struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);

	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);





	/*

	/*

	 * If userspace modified the timer registers via SET_ONE_REG before

	 * If userspace modified the timer registers via SET_ONE_REG before
@@ -199,6 +200,9 @@ static int kvm_timer_update_state(struct kvm_vcpu *vcpu) 
	if (kvm_timer_should_fire(vtimer) != vtimer->irq.level)

	if (kvm_timer_should_fire(vtimer) != vtimer->irq.level)

		kvm_timer_update_irq(vcpu, !vtimer->irq.level, vtimer);

		kvm_timer_update_irq(vcpu, !vtimer->irq.level, vtimer);





	if (kvm_timer_should_fire(ptimer) != ptimer->irq.level)

		kvm_timer_update_irq(vcpu, !ptimer->irq.level, ptimer);



	return 0;

	return 0;

}

}