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

Commit a7e33ad9 authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

KVM: arm/arm64: arch_timer: Remove irq_phys_map 



Now that the interface between the arch timer and the VGIC does not
require passing the irq_phys_map entry pointer anymore, let's remove
it from the virtual arch timer and use the virtual IRQ number instead
directly.
The remaining pointer returned by kvm_vgic_map_phys_irq() will be
removed in the following patch.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarEric Auger <eric.auger@linaro.org>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent b452cb52

include/kvm/arm_arch_timer.h

+0 −3
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ struct arch_timer_cpu { 
	/* Timer IRQ */

	struct kvm_irq_level		irq;



	/* VGIC mapping */

	struct irq_phys_map		*map;



	/* Active IRQ state caching */

	bool				active_cleared_last;

};

virt/kvm/arm/arch_timer.c

+4 −6
Original line number Diff line number Diff line
@@ -175,10 +175,10 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level) 


	timer->active_cleared_last = false;

	timer->irq.level = new_level;

	trace_kvm_timer_update_irq(vcpu->vcpu_id, timer->map->virt_irq,

	trace_kvm_timer_update_irq(vcpu->vcpu_id, timer->irq.irq,

				   timer->irq.level);

	ret = kvm_vgic_inject_mapped_irq(vcpu->kvm, vcpu->vcpu_id,

					 timer->map->virt_irq,

					 timer->irq.irq,

					 timer->irq.level);

	WARN_ON(ret);

}
@@ -276,7 +276,7 @@ void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) 
	* exit.

	*/

	phys_active = timer->irq.level ||

			kvm_vgic_map_is_active(vcpu, timer->map->virt_irq);

			kvm_vgic_map_is_active(vcpu, timer->irq.irq);



	/*

	 * We want to avoid hitting the (re)distributor as much as
@@ -378,7 +378,6 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
	if (WARN_ON(IS_ERR(map)))

		return PTR_ERR(map);



	timer->map = map;

	return 0;

}
@@ -504,8 +503,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) 
	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;



	timer_disarm(timer);

	if (timer->map)

		kvm_vgic_unmap_phys_irq(vcpu, timer->map->virt_irq);

	kvm_vgic_unmap_phys_irq(vcpu, timer->irq.irq);

}



void kvm_timer_enable(struct kvm *kvm)