KVM: arm/arm64: Move timer IRQ map to latest possible time

We are about to modify the VGIC to allocate all data structures
dynamically and store mapped IRQ information on a per-IRQ struct, which
is indeed allocated dynamically at init time.

Therefore, we cannot record the mapped IRQ info from the timer at timer
reset time like it's done now, because VCPU reset happens before timer
init.

A possible later time to do this is on the first run of a per VCPU, it
just requires us to move the enable state to be a per-VCPU state and do
the lookup of the physical IRQ number when we are about to run the VCPU.

Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index be4b6394a062..ceb9345bcf07 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -459,7 +459,7 @@ static void update_vttbr(struct kvm *kvm)
 static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
 {
         struct kvm *kvm = vcpu->kvm;
-        int ret;
+        int ret = 0;
 
         if (likely(vcpu->arch.has_run_once))
                 return 0;
@@ -482,9 +482,9 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
          * interrupts from the virtual timer with a userspace gic.
          */
         if (irqchip_in_kernel(kvm) && vgic_initialized(kvm))
-                kvm_timer_enable(kvm);
+                ret = kvm_timer_enable(vcpu);
 
-        return 0;
+        return ret;
 }
 
 bool kvm_arch_intc_initialized(struct kvm *kvm)