Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM updates from Paolo Bonzini:
 "Small release overall.

  x86:
   - miscellaneous fixes
   - AVIC support (local APIC virtualization, AMD version)

  s390:
   - polling for interrupts after a VCPU goes to halted state is now
     enabled for s390
   - use hardware provided information about facility bits that do not
     need any hypervisor activity, and other fixes for cpu models and
     facilities
   - improve perf output
   - floating interrupt controller improvements.

  MIPS:
   - miscellaneous fixes

  PPC:
   - bugfixes only

  ARM:
   - 16K page size support
   - generic firmware probing layer for timer and GIC

  Christoffer Dall (KVM-ARM maintainer) says:
    "There are a few changes in this pull request touching things
     outside KVM, but they should all carry the necessary acks and it
     made the merge process much easier to do it this way."

  though actually the irqchip maintainers' acks didn't make it into the
  patches.  Marc Zyngier, who is both irqchip and KVM-ARM maintainer,
  later acked at http://mid.gmane.org/573351D1.4060303@arm.com ('more
  formally and for documentation purposes')"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (82 commits)
  KVM: MTRR: remove MSR 0x2f8
  KVM: x86: make hwapic_isr_update and hwapic_irr_update look the same
  svm: Manage vcpu load/unload when enable AVIC
  svm: Do not intercept CR8 when enable AVIC
  svm: Do not expose x2APIC when enable AVIC
  KVM: x86: Introducing kvm_x86_ops.apicv_post_state_restore
  svm: Add VMEXIT handlers for AVIC
  svm: Add interrupt injection via AVIC
  KVM: x86: Detect and Initialize AVIC support
  svm: Introduce new AVIC VMCB registers
  KVM: split kvm_vcpu_wake_up from kvm_vcpu_kick
  KVM: x86: Introducing kvm_x86_ops VCPU blocking/unblocking hooks
  KVM: x86: Introducing kvm_x86_ops VM init/destroy hooks
  KVM: x86: Rename kvm_apic_get_reg to kvm_lapic_get_reg
  KVM: x86: Misc LAPIC changes to expose helper functions
  KVM: shrink halt polling even more for invalid wakeups
  KVM: s390: set halt polling to 80 microseconds
  KVM: halt_polling: provide a way to qualify wakeups during poll
  KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts
  kvm: Conditionally register IRQ bypass consumer
  ...

1 files changed, 11 insertions, 29 deletions

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 9aaa35dd9144..409db3304471 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/cpu.h>
-#include <linux/of_irq.h>
 #include <linux/kvm.h>
 #include <linux/kvm_host.h>
 #include <linux/interrupt.h>
@@ -438,45 +437,29 @@ static struct notifier_block kvm_timer_cpu_nb = {
         .notifier_call = kvm_timer_cpu_notify,
 };
 
-static const struct of_device_id arch_timer_of_match[] = {
-        { .compatible   = "arm,armv7-timer",    },
-        { .compatible   = "arm,armv8-timer",    },
-        {},
-};
-
 int kvm_timer_hyp_init(void)
 {
-        struct device_node *np;
-        unsigned int ppi;
+        struct arch_timer_kvm_info *info;
         int err;
 
-        timecounter = arch_timer_get_timecounter();
-        if (!timecounter)
-                return -ENODEV;
+        info = arch_timer_get_kvm_info();
+        timecounter = &info->timecounter;
 
-        np = of_find_matching_node(NULL, arch_timer_of_match);
-        if (!np) {
-                kvm_err("kvm_arch_timer: can't find DT node\n");
+        if (info->virtual_irq <= 0) {
+                kvm_err("kvm_arch_timer: invalid virtual timer IRQ: %d\n",
+                        info->virtual_irq);
                 return -ENODEV;
         }
+        host_vtimer_irq = info->virtual_irq;
 
-        ppi = irq_of_parse_and_map(np, 2);
-        if (!ppi) {
-                kvm_err("kvm_arch_timer: no virtual timer interrupt\n");
-                err = -EINVAL;
-                goto out;
-        }
-
-        err = request_percpu_irq(ppi, kvm_arch_timer_handler,
+        err = request_percpu_irq(host_vtimer_irq, kvm_arch_timer_handler,
                                  "kvm guest timer", kvm_get_running_vcpus());
         if (err) {
                 kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n",
-                        ppi, err);
+                        host_vtimer_irq, err);
                 goto out;
         }
 
-        host_vtimer_irq = ppi;
-
         err = __register_cpu_notifier(&kvm_timer_cpu_nb);
         if (err) {
                 kvm_err("Cannot register timer CPU notifier\n");
@@ -489,14 +472,13 @@ int kvm_timer_hyp_init(void)
                 goto out_free;
         }
 
-        kvm_info("%s IRQ%d\n", np->name, ppi);
+        kvm_info("virtual timer IRQ%d\n", host_vtimer_irq);
         on_each_cpu(kvm_timer_init_interrupt, NULL, 1);
 
         goto out;
 out_free:
-        free_percpu_irq(ppi, kvm_get_running_vcpus());
+        free_percpu_irq(host_vtimer_irq, kvm_get_running_vcpus());
 out:
-        of_node_put(np);
         return err;
 }