Skip to contentSkip to conversation

KVM: PPC: e500: emulate SVR

PATCH In review Scott Wood 3 participants 4 messages Mar 29, 2011 – Mar 30, 2011

Subsystems (2)
lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH v2 1/1 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.

---
v2: Move to e500 code, and use a backing variable, even though we don't support changing it yet.

 arch/powerpc/include/asm/kvm_e500.h |    1 +
 arch/powerpc/kvm/e500.c             |    1 +
 arch/powerpc/kvm/e500_emulate.c     |    2 ++
 3 files changed, 4 insertions(+), 0 deletions(-)
arch/powerpc/include/asm/kvm_e500.h +1 -0
index 7fea26f..bb2a089 100644
@@ -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;
arch/powerpc/kvm/e500.c +1 -0
index e3768ee..0c1af12 100644
@@ -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;
arch/powerpc/kvm/e500_emulate.c +2 -0
index 8e3edfb..e2fb47f 100644
@@ -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;
Signature · 1 line
1.7.1
#1 lore raw
Quoted 3 lines · Scott Wood

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.

Haha - maybe I should have read your v2 before replying to the other mail :). Thanks! I'll take this patch into my staging tree.

Avi, please ack.

Alex

#2 lore raw
In reply to Scott Wood
Quoted 11 lines · Alexander Graf
Quoted 3 lines · Scott Wood

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.

Haha - maybe I should have read your v2 before replying to the other mail :). Thanks! I'll take this patch into my staging tree.

Avi, please ack.

Looks fine. As I mentioned on IRC, I'm primarily interested in guest/host and kernel/user interfaces.

Signature · 1 line
error compiling committee.c: too many arguments to function
#3 lore raw
In reply to Scott Wood
Quoted 7 lines · Avi Kivity
Quoted 6 lines · Alexander Graf
Quoted 3 lines · Scott Wood

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.

Quoted 7 lines
Quoted 5 lines

Haha - maybe I should have read your v2 before replying to the other mail :). Thanks! I'll take this patch into my staging tree.

Avi, please ack.

Looks fine. As I mentioned on IRC, I'm primarily interested in guest/host and kernel/user interfaces.

Ah, that part flew in after I left that client already O_o. Either way, thanks!

Alex