Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6.git] / arch / powerpc / kvm / e500.c
index 0c1af12..8c0d45a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved.
  *
  * Author: Yu Liu, <yu.liu@freescale.com>
  *
@@ -15,6 +15,7 @@
 #include <linux/kvm_host.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/export.h>
 
 #include <asm/reg.h>
 #include <asm/cputable.h>
@@ -41,6 +42,11 @@ void kvmppc_core_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu)
 {
        kvmppc_e500_tlb_put(vcpu);
+
+#ifdef CONFIG_SPE
+       if (vcpu->arch.shadow_msr & MSR_SPE)
+               kvmppc_vcpu_disable_spe(vcpu);
+#endif
 }
 
 int kvmppc_core_check_processor_compat(void)
@@ -68,6 +74,8 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)
        /* Since booke kvm only support one core, update all vcpus' PIR to 0 */
        vcpu->vcpu_id = 0;
 
+       vcpu->arch.cpu_type = KVM_CPU_E500V2;
+
        return 0;
 }
 
@@ -97,6 +105,81 @@ int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,
        return 0;
 }
 
+void kvmppc_core_get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+       struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
+
+       sregs->u.e.features |= KVM_SREGS_E_ARCH206_MMU | KVM_SREGS_E_SPE |
+                              KVM_SREGS_E_PM;
+       sregs->u.e.impl_id = KVM_SREGS_E_IMPL_FSL;
+
+       sregs->u.e.impl.fsl.features = 0;
+       sregs->u.e.impl.fsl.svr = vcpu_e500->svr;
+       sregs->u.e.impl.fsl.hid0 = vcpu_e500->hid0;
+       sregs->u.e.impl.fsl.mcar = vcpu_e500->mcar;
+
+       sregs->u.e.mas0 = vcpu_e500->mas0;
+       sregs->u.e.mas1 = vcpu_e500->mas1;
+       sregs->u.e.mas2 = vcpu_e500->mas2;
+       sregs->u.e.mas7_3 = ((u64)vcpu_e500->mas7 << 32) | vcpu_e500->mas3;
+       sregs->u.e.mas4 = vcpu_e500->mas4;
+       sregs->u.e.mas6 = vcpu_e500->mas6;
+
+       sregs->u.e.mmucfg = mfspr(SPRN_MMUCFG);
+       sregs->u.e.tlbcfg[0] = vcpu_e500->tlb0cfg;
+       sregs->u.e.tlbcfg[1] = vcpu_e500->tlb1cfg;
+       sregs->u.e.tlbcfg[2] = 0;
+       sregs->u.e.tlbcfg[3] = 0;
+
+       sregs->u.e.ivor_high[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL];
+       sregs->u.e.ivor_high[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA];
+       sregs->u.e.ivor_high[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND];
+       sregs->u.e.ivor_high[3] =
+               vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR];
+
+       kvmppc_get_sregs_ivor(vcpu, sregs);
+}
+
+int kvmppc_core_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+       struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
+
+       if (sregs->u.e.impl_id == KVM_SREGS_E_IMPL_FSL) {
+               vcpu_e500->svr = sregs->u.e.impl.fsl.svr;
+               vcpu_e500->hid0 = sregs->u.e.impl.fsl.hid0;
+               vcpu_e500->mcar = sregs->u.e.impl.fsl.mcar;
+       }
+
+       if (sregs->u.e.features & KVM_SREGS_E_ARCH206_MMU) {
+               vcpu_e500->mas0 = sregs->u.e.mas0;
+               vcpu_e500->mas1 = sregs->u.e.mas1;
+               vcpu_e500->mas2 = sregs->u.e.mas2;
+               vcpu_e500->mas7 = sregs->u.e.mas7_3 >> 32;
+               vcpu_e500->mas3 = (u32)sregs->u.e.mas7_3;
+               vcpu_e500->mas4 = sregs->u.e.mas4;
+               vcpu_e500->mas6 = sregs->u.e.mas6;
+       }
+
+       if (!(sregs->u.e.features & KVM_SREGS_E_IVOR))
+               return 0;
+
+       if (sregs->u.e.features & KVM_SREGS_E_SPE) {
+               vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] =
+                       sregs->u.e.ivor_high[0];
+               vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] =
+                       sregs->u.e.ivor_high[1];
+               vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] =
+                       sregs->u.e.ivor_high[2];
+       }
+
+       if (sregs->u.e.features & KVM_SREGS_E_PM) {
+               vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR] =
+                       sregs->u.e.ivor_high[3];
+       }
+
+       return kvmppc_set_sregs_ivor(vcpu, sregs);
+}
+
 struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 {
        struct kvmppc_vcpu_e500 *vcpu_e500;