KVM: PPC: e500: MMU API

[karo-tx-linux.git] / arch / powerpc / kvm / powerpc.c

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 607fbdf24b8484c173cc03593ffc71d968b689fe..3cf6fba513ac311b61fdc3137b7e9196e0359347 100644 (file)
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -171,8 +171,11 @@ void kvm_arch_check_processor_compat(void *rtn)
        *(int *)rtn = kvmppc_core_check_processor_compat();
 }
 
-int kvm_arch_init_vm(struct kvm *kvm)
+int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 {
+       if (type)
+               return -EINVAL;
+
        return kvmppc_core_init_vm(kvm);
 }
 
@@ -219,6 +222,9 @@ int kvm_dev_ioctl_check_extension(long ext)
        case KVM_CAP_PPC_PAIRED_SINGLES:
        case KVM_CAP_PPC_OSI:
        case KVM_CAP_PPC_GET_PVINFO:
+#ifdef CONFIG_KVM_E500
+       case KVM_CAP_SW_TLB:
+#endif
                r = 1;
                break;
        case KVM_CAP_COALESCED_MMIO:
@@ -599,6 +605,19 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
                r = 0;
                vcpu->arch.papr_enabled = true;
                break;
+#ifdef CONFIG_KVM_E500
+       case KVM_CAP_SW_TLB: {
+               struct kvm_config_tlb cfg;
+               void __user *user_ptr = (void __user *)(uintptr_t)cap->args[0];
+
+               r = -EFAULT;
+               if (copy_from_user(&cfg, user_ptr, sizeof(cfg)))
+                       break;
+
+               r = kvm_vcpu_ioctl_config_tlb(vcpu, &cfg);
+               break;
+       }
+#endif
        default:
                r = -EINVAL;
                break;
@@ -648,6 +667,18 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
                r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap);
                break;
        }
+
+#ifdef CONFIG_KVM_E500
+       case KVM_DIRTY_TLB: {
+               struct kvm_dirty_tlb dirty;
+               r = -EFAULT;
+               if (copy_from_user(&dirty, argp, sizeof(dirty)))
+                       goto out;
+               r = kvm_vcpu_ioctl_dirty_tlb(vcpu, &dirty);
+               break;
+       }
+#endif
+
        default:
                r = -EINVAL;
        }
@@ -656,6 +687,11 @@ out:
        return r;
 }
 
+int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
+{
+       return VM_FAULT_SIGBUS;
+}
+
 static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo)
 {
        u32 inst_lis = 0x3c000000;