KVM: ppc: e500: Add MMUCFG and PVR emulation

Latest kernel started to use these two registers.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 3f760414b9f8d3dc52b08be371cb0f39490ea544..be95b8d8e3b78506491f9075cc9e1a0146faeff3 100644 (file)
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -180,6 +180,9 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
        case SPRN_MMUCSR0:
                vcpu->arch.gpr[rt] = 0; break;
 
+       case SPRN_MMUCFG:
+               vcpu->arch.gpr[rt] = mfspr(SPRN_MMUCFG); break;
+
        /* extra exceptions */
        case SPRN_IVOR32:
                vcpu->arch.gpr[rt] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL];

diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index f8b8248cb9b0c6301b1ef2f6710b18ef7591872d..28a8237fe78bcbfb66a70a2d0e26df077fa1c2b1 100644 (file)
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -188,6 +188,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                                vcpu->arch.gpr[rt] = vcpu->arch.srr1; break;
                        case SPRN_PVR:
                                vcpu->arch.gpr[rt] = mfspr(SPRN_PVR); break;
+                       case SPRN_PIR:
+                               vcpu->arch.gpr[rt] = mfspr(SPRN_PIR); break;
 
                        /* Note: mftb and TBRL/TBWL are user-accessible, so
                         * the guest can always access the real TB anyways.