Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 841741f2 authored by Scott Wood's avatar Scott Wood Committed by Avi Kivity
Browse files

KVM: PPC: e500: Don't hardcode PIR=0 



The hardcoded behavior prevents proper SMP support.

user space shall specify the vcpu's PIR as the vcpu id.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 303b7c97

arch/powerpc/kvm/booke.c

+2 −2
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static void get_sregs_arch206(struct kvm_vcpu *vcpu, 
{

	sregs->u.e.features |= KVM_SREGS_E_ARCH206;



	sregs->u.e.pir = 0;

	sregs->u.e.pir = vcpu->vcpu_id;

	sregs->u.e.mcsrr0 = vcpu->arch.mcsrr0;

	sregs->u.e.mcsrr1 = vcpu->arch.mcsrr1;

	sregs->u.e.decar = vcpu->arch.decar;
@@ -774,7 +774,7 @@ static int set_sregs_arch206(struct kvm_vcpu *vcpu, 
	if (!(sregs->u.e.features & KVM_SREGS_E_ARCH206))

		return 0;



	if (sregs->u.e.pir != 0)

	if (sregs->u.e.pir != vcpu->vcpu_id)

		return -EINVAL;



	vcpu->arch.mcsrr0 = sregs->u.e.mcsrr0;

arch/powerpc/kvm/e500.c

+0 −3
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu) 
	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;



	vcpu->arch.cpu_type = KVM_CPU_E500V2;



	return 0;