KVM: PPC: e500: emulate SVR

Return the actual host SVR for now, as we already do for PVR.  Eventually
we may support Qemu overriding PVR/SVR if the situation is appropriate,
once we implement KVM_SET_SREGS on e500.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/arch/powerpc/include/asm/kvm_e500.h b/arch/powerpc/include/asm/kvm_e500.h
index 7fea26fffb25f692f50f71d8e4b3d858d9478aad..bb2a0890600f227b6109f5281776d8548e9da8ca 100644 (file)
--- a/arch/powerpc/include/asm/kvm_e500.h
+++ b/arch/powerpc/include/asm/kvm_e500.h
@@ -43,6 +43,7 @@ struct kvmppc_vcpu_e500 {
 
        u32 host_pid[E500_PID_NUM];
        u32 pid[E500_PID_NUM];
+       u32 svr;
 
        u32 mas0;
        u32 mas1;

diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index e3768ee9b59537bf92eceb853fa9edf56d7d5b6c..0c1af1267843c9953ffdf4b052bb60610c446561 100644 (file)
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -63,6 +63,7 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)
 
        /* Registers init */
        vcpu->arch.pvr = mfspr(SPRN_PVR);
+       vcpu_e500->svr = mfspr(SPRN_SVR);
 
        /* Since booke kvm only support one core, update all vcpus' PIR to 0 */
        vcpu->vcpu_id = 0;

diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 8e3edfbc963412e39813dbb7ccff1b8a57bdcfd0..e2fb47f035a52146dc3cc006827bfd15c7752e06 100644 (file)
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -175,6 +175,8 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                kvmppc_set_gpr(vcpu, rt, vcpu_e500->hid0); break;
        case SPRN_HID1:
                kvmppc_set_gpr(vcpu, rt, vcpu_e500->hid1); break;
+       case SPRN_SVR:
+               kvmppc_set_gpr(vcpu, rt, vcpu_e500->svr); break;
 
        case SPRN_MMUCSR0:
                kvmppc_set_gpr(vcpu, rt, 0); break;