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

Commit 7505258c authored by Anton Blanchard's avatar Anton Blanchard Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S HV: Fix KVM hang with CONFIG_KVM_XICS=n 



I noticed KVM is broken when KVM in-kernel XICS emulation
(CONFIG_KVM_XICS) is disabled.

The problem was introduced in 48eaef05 (KVM: PPC: Book3S HV: use
xics_wake_cpu only when defined). It used CONFIG_KVM_XICS to wrap
xics_wake_cpu, where CONFIG_PPC_ICP_NATIVE should have been
used.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Acked-by: default avatarScott Wood <scottwood@freescale.com>
parent 69e9fbb2

arch/powerpc/kvm/book3s_hv.c

+1 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu) 


	/* CPU points to the first thread of the core */

	if (cpu != me && cpu >= 0 && cpu < nr_cpu_ids) {

#ifdef CONFIG_KVM_XICS

#ifdef CONFIG_PPC_ICP_NATIVE

		int real_cpu = cpu + vcpu->arch.ptid;

		if (paca[real_cpu].kvm_hstate.xics_phys)

			xics_wake_cpu(real_cpu);
@@ -1360,9 +1360,7 @@ static void kvmppc_start_thread(struct kvm_vcpu *vcpu) 
	smp_wmb();

#if defined(CONFIG_PPC_ICP_NATIVE) && defined(CONFIG_SMP)

	if (cpu != smp_processor_id()) {

#ifdef CONFIG_KVM_XICS

		xics_wake_cpu(cpu);

#endif

		if (vcpu->arch.ptid)

			++vc->n_woken;

	}