linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] powerpc kvm: fix kvmppc_start_thread() for CONFIG_SMP=N
@ 2011-11-11  2:03 Michael Neuling
  2011-11-11 16:01 ` Alexander Graf
  0 siblings, 1 reply; 3+ messages in thread
From: Michael Neuling @ 2011-11-11  2:03 UTC (permalink / raw)
  To: Paul Mackerras, benh, Alexander Graf; +Cc: linuxppc-dev

Currently kvmppc_start_thread() tries to wake other SMT threads via
xics_wake_cpu().  Unfortunately xics_wake_cpu only exists when
CONFIG_SMP=Y so when compiling with CONFIG_SMP=N we get:

  arch/powerpc/kvm/built-in.o: In function `.kvmppc_start_thread':
  book3s_hv.c:(.text+0xa1e0): undefined reference to `.xics_wake_cpu'

The following should be fine since kvmppc_start_thread() shouldn't
called to start non-zero threads when SMP=N since threads_per_core=1.

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
 arch/powerpc/kvm/book3s_hv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-ozlabs/arch/powerpc/kvm/book3s_hv.c
===================================================================
--- linux-ozlabs.orig/arch/powerpc/kvm/book3s_hv.c
+++ linux-ozlabs/arch/powerpc/kvm/book3s_hv.c
@@ -538,7 +538,7 @@ static void kvmppc_start_thread(struct k
 	tpaca->kvm_hstate.napping = 0;
 	vcpu->cpu = vc->pcpu;
 	smp_wmb();
-#ifdef CONFIG_PPC_ICP_NATIVE
+#if defined(CONFIG_PPC_ICP_NATIVE) && defined(CONFIG_SMP)
 	if (vcpu->arch.ptid) {
 		tpaca->cpu_start = 0x80;
 		wmb();

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] powerpc kvm: fix kvmppc_start_thread() for CONFIG_SMP=N
  2011-11-11  2:03 [PATCH] powerpc kvm: fix kvmppc_start_thread() for CONFIG_SMP=N Michael Neuling
@ 2011-11-11 16:01 ` Alexander Graf
  2011-11-12  4:07   ` Michael Neuling
  0 siblings, 1 reply; 3+ messages in thread
From: Alexander Graf @ 2011-11-11 16:01 UTC (permalink / raw)
  To: Michael Neuling; +Cc: Paul Mackerras, kvm-ppc, linuxppc-dev

On 11/11/2011 03:03 AM, Michael Neuling wrote:
> Currently kvmppc_start_thread() tries to wake other SMT threads via
> xics_wake_cpu().  Unfortunately xics_wake_cpu only exists when
> CONFIG_SMP=Y so when compiling with CONFIG_SMP=N we get:
>
>    arch/powerpc/kvm/built-in.o: In function `.kvmppc_start_thread':
>    book3s_hv.c:(.text+0xa1e0): undefined reference to `.xics_wake_cpu'
>
> The following should be fine since kvmppc_start_thread() shouldn't
> called to start non-zero threads when SMP=N since threads_per_core=1.
>
> Signed-off-by: Michael Neuling<mikey@neuling.org>

Thanks, applied to kvm-ppc-next. Please CC kvm-ppc@vger next time :).


Alex

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] powerpc kvm: fix kvmppc_start_thread() for CONFIG_SMP=N
  2011-11-11 16:01 ` Alexander Graf
@ 2011-11-12  4:07   ` Michael Neuling
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Neuling @ 2011-11-12  4:07 UTC (permalink / raw)
  To: Alexander Graf; +Cc: Paul Mackerras, kvm-ppc, linuxppc-dev

In message <4EBD46F4.5040503@suse.de> you wrote:
> On 11/11/2011 03:03 AM, Michael Neuling wrote:
> > Currently kvmppc_start_thread() tries to wake other SMT threads via
> > xics_wake_cpu().  Unfortunately xics_wake_cpu only exists when
> > CONFIG_SMP=Y so when compiling with CONFIG_SMP=N we get:
> >
> >    arch/powerpc/kvm/built-in.o: In function `.kvmppc_start_thread':
> >    book3s_hv.c:(.text+0xa1e0): undefined reference to `.xics_wake_cpu'
> >
> > The following should be fine since kvmppc_start_thread() shouldn't
> > called to start non-zero threads when SMP=N since threads_per_core=1.
> >
> > Signed-off-by: Michael Neuling<mikey@neuling.org>
> 
> Thanks, applied to kvm-ppc-next. Please CC kvm-ppc@vger next time :).

Thanks will do.

Mikey

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-11-12  4:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-11  2:03 [PATCH] powerpc kvm: fix kvmppc_start_thread() for CONFIG_SMP=N Michael Neuling
2011-11-11 16:01 ` Alexander Graf
2011-11-12  4:07   ` Michael Neuling

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).