Patched in Tegra support.

3 files changed, 58 insertions, 67 deletions

diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index e7947528aee..9806e55f91b 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -19,11 +19,9 @@ if VIRTUALIZATION
 
 config KVM
         tristate "Kernel-based Virtual Machine (KVM) support"
-        depends on BROKEN
         depends on HAVE_KVM && MODULES && EXPERIMENTAL
         # for device assignment:
         depends on PCI
-        depends on BROKEN
         select PREEMPT_NOTIFIERS
         select ANON_INODES
         select HAVE_KVM_IRQCHIP
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index bd1c5155503..43f4c92816e 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1,5 +1,5 @@
 /*
- * kvm_ia64.c: Basic KVM support On Itanium series processors
+ * kvm_ia64.c: Basic KVM suppport On Itanium series processors
  *
  *
  *      Copyright (C) 2007, Intel Corporation.
@@ -232,12 +232,12 @@ static int handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         if ((p->addr & PAGE_MASK) == IOAPIC_DEFAULT_BASE_ADDRESS)
                 goto mmio;
         vcpu->mmio_needed = 1;
-        vcpu->mmio_fragments[0].gpa = kvm_run->mmio.phys_addr = p->addr;
-        vcpu->mmio_fragments[0].len = kvm_run->mmio.len = p->size;
+        vcpu->mmio_phys_addr = kvm_run->mmio.phys_addr = p->addr;
+        vcpu->mmio_size = kvm_run->mmio.len = p->size;
         vcpu->mmio_is_write = kvm_run->mmio.is_write = !p->dir;
 
         if (vcpu->mmio_is_write)
-                memcpy(vcpu->arch.mmio_data, &p->data, p->size);
+                memcpy(vcpu->mmio_data, &p->data, p->size);
         memcpy(kvm_run->mmio.data, &p->data, p->size);
         kvm_run->exit_reason = KVM_EXIT_MMIO;
         return 0;
@@ -719,7 +719,7 @@ static void kvm_set_mmio_data(struct kvm_vcpu *vcpu)
         struct kvm_mmio_req *p = kvm_get_vcpu_ioreq(vcpu);
 
         if (!vcpu->mmio_is_write)
-                memcpy(&p->data, vcpu->arch.mmio_data, 8);
+                memcpy(&p->data, vcpu->mmio_data, 8);
         p->state = STATE_IORESP_READY;
 }
 
@@ -739,7 +739,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         }
 
         if (vcpu->mmio_needed) {
-                memcpy(vcpu->arch.mmio_data, kvm_run->mmio.data, 8);
+                memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8);
                 kvm_set_mmio_data(vcpu);
                 vcpu->mmio_read_completed = 1;
                 vcpu->mmio_needed = 0;
@@ -774,13 +774,13 @@ struct kvm *kvm_arch_alloc_vm(void)
         return kvm;
 }
 
-struct kvm_ia64_io_range {
+struct kvm_io_range {
         unsigned long start;
         unsigned long size;
         unsigned long type;
 };
 
-static const struct kvm_ia64_io_range io_ranges[] = {
+static const struct kvm_io_range io_ranges[] = {
         {VGA_IO_START, VGA_IO_SIZE, GPFN_FRAME_BUFFER},
         {MMIO_START, MMIO_SIZE, GPFN_LOW_MMIO},
         {LEGACY_IO_START, LEGACY_IO_SIZE, GPFN_LEGACY_IO},
@@ -809,13 +809,10 @@ static void kvm_build_io_pmt(struct kvm *kvm)
 #define GUEST_PHYSICAL_RR4      0x2739
 #define VMM_INIT_RR             0x1660
 
-int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
+int kvm_arch_init_vm(struct kvm *kvm)
 {
         BUG_ON(!kvm);
 
-        if (type)
-                return -EINVAL;
-
         kvm->arch.is_sn2 = ia64_platform_is("sn2");
 
         kvm->arch.metaphysical_rr0 = GUEST_PHYSICAL_RR0;
@@ -924,16 +921,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         return 0;
 }
 
-int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_event)
-{
-        if (!irqchip_in_kernel(kvm))
-                return -ENXIO;
-
-        irq_event->status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
-                                        irq_event->irq, irq_event->level);
-        return 0;
-}
-
 long kvm_arch_vm_ioctl(struct file *filp,
                 unsigned int ioctl, unsigned long arg)
 {
@@ -973,6 +960,29 @@ long kvm_arch_vm_ioctl(struct file *filp,
                         goto out;
                 }
                 break;
+        case KVM_IRQ_LINE_STATUS:
+        case KVM_IRQ_LINE: {
+                struct kvm_irq_level irq_event;
+
+                r = -EFAULT;
+                if (copy_from_user(&irq_event, argp, sizeof irq_event))
+                        goto out;
+                r = -ENXIO;
+                if (irqchip_in_kernel(kvm)) {
+                        __s32 status;
+                        status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
+                                    irq_event.irq, irq_event.level);
+                        if (ioctl == KVM_IRQ_LINE_STATUS) {
+                                r = -EFAULT;
+                                irq_event.status = status;
+                                if (copy_to_user(argp, &irq_event,
+                                                        sizeof irq_event))
+                                        goto out;
+                        }
+                        r = 0;
+                }
+                break;
+                }
         case KVM_GET_IRQCHIP: {
                 /* 0: PIC master, 1: PIC slave, 2: IOAPIC */
                 struct kvm_irqchip chip;
@@ -1159,11 +1169,6 @@ out:
 
 #define PALE_RESET_ENTRY    0x80000000ffffffb0UL
 
-bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu)
-{
-        return irqchip_in_kernel(vcpu->kvm) == (vcpu->arch.apic != NULL);
-}
-
 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
 {
         struct kvm_vcpu *v;
@@ -1330,11 +1335,6 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
         return 0;
 }
 
-int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
-{
-        return 0;
-}
-
 int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
 {
         return -EINVAL;
@@ -1366,10 +1366,14 @@ static void kvm_release_vm_pages(struct kvm *kvm)
 {
         struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
-        int j;
+        int i, j;
+        unsigned long base_gfn;
 
         slots = kvm_memslots(kvm);
-        kvm_for_each_memslot(memslot, slots) {
+        for (i = 0; i < slots->nmemslots; i++) {
+                memslot = &slots->memslots[i];
+                base_gfn = memslot->base_gfn;
+
                 for (j = 0; j < memslot->npages; j++) {
                         if (memslot->rmap[j])
                                 put_page((struct page *)memslot->rmap[j]);
@@ -1561,21 +1565,6 @@ out:
         return r;
 }
 
-int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
-{
-        return VM_FAULT_SIGBUS;
-}
-
-void kvm_arch_free_memslot(struct kvm_memory_slot *free,
-                           struct kvm_memory_slot *dont)
-{
-}
-
-int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
-{
-        return 0;
-}
-
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
                 struct kvm_memory_slot *memslot,
                 struct kvm_memory_slot old,
@@ -1616,17 +1605,11 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
         return;
 }
 
-void kvm_arch_flush_shadow_all(struct kvm *kvm)
+void kvm_arch_flush_shadow(struct kvm *kvm)
 {
         kvm_flush_remote_tlbs(kvm);
 }
 
-void kvm_arch_flush_shadow_memslot(struct kvm *kvm,
-                                   struct kvm_memory_slot *slot)
-{
-        kvm_arch_flush_shadow_all();
-}
-
 long kvm_arch_dev_ioctl(struct file *filp,
                         unsigned int ioctl, unsigned long arg)
 {
@@ -1837,7 +1820,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
         if (log->slot >= KVM_MEMORY_SLOTS)
                 goto out;
 
-        memslot = id_to_memslot(kvm->memslots, log->slot);
+        memslot = &kvm->memslots->memslots[log->slot];
         r = -ENOENT;
         if (!memslot->dirty_bitmap)
                 goto out;
@@ -1868,6 +1851,21 @@ void kvm_arch_hardware_unsetup(void)
 {
 }
 
+void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
+{
+        int me;
+        int cpu = vcpu->cpu;
+
+        if (waitqueue_active(&vcpu->wq))
+                wake_up_interruptible(&vcpu->wq);
+
+        me = get_cpu();
+        if (cpu != me && (unsigned) cpu < nr_cpu_ids && cpu_online(cpu))
+                if (!test_and_set_bit(KVM_REQ_KICK, &vcpu->requests))
+                        smp_send_reschedule(cpu);
+        put_cpu();
+}
+
 int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq)
 {
         return __apic_accept_irq(vcpu, irq->vector);
@@ -1937,11 +1935,6 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
                 (kvm_highest_pending_irq(vcpu) != -1);
 }
 
-int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)
-{
-        return (!test_and_set_bit(KVM_REQ_KICK, &vcpu->requests));
-}
-
 int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
                                     struct kvm_mp_state *mp_state)
 {
diff --git a/arch/ia64/kvm/vmm.c b/arch/ia64/kvm/vmm.c
index 176a12cd56d..f0b9cac8241 100644
--- a/arch/ia64/kvm/vmm.c
+++ b/arch/ia64/kvm/vmm.c
@@ -20,9 +20,9 @@
  */
 
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <asm/fpswa.h>
+#include<linux/kernel.h>
+#include<linux/module.h>
+#include<asm/fpswa.h>
 
 #include "vcpu.h"