Message ID | 1307070645.23876.9.camel@pasglop (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On Fri, Jun 03, 2011 at 01:10:45PM +1000, Benjamin Herrenschmidt wrote: > On Fri, 2011-06-03 at 12:41 +1000, Benjamin Herrenschmidt wrote: > > On Fri, 2011-06-03 at 00:00 +0200, Giuliano Pochini wrote: > > > On Sat, 28 May 2011 11:55:14 +0400 > > > Andrey Gusev <ronne@list.ru> wrote: > > > > > > > Hi! > > > > A kernel 2.6.39 doesn't boot on my POWER MAC G4. > > > > > > Same problem with my dual-G4 MDD. A few more infos: > > > The machine hangs just after the message "Returning from prom_init" (still > > > in the OF screen). > > > The kernel works fine with the option maxcpus=1, but it locks up as soon as > > > I try to enable the second CPU with echo 1 > /sys.../online. > > > > I just verified that current upstream 3.0-rc1+ does boot fine. > > The fix is: > > c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 > powerpc/4xx: Fix regression in SMP on 476 > > It looks like the regression wasn't specific to 476 but to all ppc > 32-bit SMP setups. The bugs is specific to 2.6.39. > > Greg, it should cherry-pick as-is but here's a copy in case you need it. Now applied, thanks. greg k-h
On Fri, 03 Jun 2011 13:10:45 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Fri, 2011-06-03 at 12:41 +1000, Benjamin Herrenschmidt wrote: > > On Fri, 2011-06-03 at 00:00 +0200, Giuliano Pochini wrote: > > > On Sat, 28 May 2011 11:55:14 +0400 > > > Andrey Gusev <ronne@list.ru> wrote: > > > > > > > Hi! > > > > A kernel 2.6.39 doesn't boot on my POWER MAC G4. > > > > > > Same problem with my dual-G4 MDD. A few more infos: > > > The machine hangs just after the message "Returning from prom_init" (still > > > in the OF screen). > > > The kernel works fine with the option maxcpus=1, but it locks up as soon as > > > I try to enable the second CPU with echo 1 > /sys.../online. > > > > I just verified that current upstream 3.0-rc1+ does boot fine. > > The fix is: > > c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 > powerpc/4xx: Fix regression in SMP on 476 > [...] Yes, that patch fixed the problem. Thanks.
04.06.2011 02:36, Giuliano Pochini пишет: > On Fri, 03 Jun 2011 13:10:45 +1000 > Benjamin Herrenschmidt<benh@kernel.crashing.org> wrote: > >> On Fri, 2011-06-03 at 12:41 +1000, Benjamin Herrenschmidt wrote: >>> On Fri, 2011-06-03 at 00:00 +0200, Giuliano Pochini wrote: >>>> On Sat, 28 May 2011 11:55:14 +0400 >>>> Andrey Gusev<ronne@list.ru> wrote: >>>> >>>>> Hi! >>>>> A kernel 2.6.39 doesn't boot on my POWER MAC G4. >>>> Same problem with my dual-G4 MDD. A few more infos: >>>> The machine hangs just after the message "Returning from prom_init" (still >>>> in the OF screen). >>>> The kernel works fine with the option maxcpus=1, but it locks up as soon as >>>> I try to enable the second CPU with echo 1> /sys.../online. >>> I just verified that current upstream 3.0-rc1+ does boot fine. >> The fix is: >> >> c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 >> powerpc/4xx: Fix regression in SMP on 476 >> [...] > Yes, that patch fixed the problem. Thanks. > > The upstream 3.0-rc1 boots on my machine fine too.
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index cbdbb14..f2dcab7 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -410,8 +410,6 @@ int __cpuinit __cpu_up(unsigned int cpu) { int rc, c; - secondary_ti = current_set[cpu]; - if (smp_ops == NULL || (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu))) return -EINVAL; @@ -421,6 +419,8 @@ int __cpuinit __cpu_up(unsigned int cpu) if (rc) return rc; + secondary_ti = current_set[cpu]; + /* Make sure callin-map entry is 0 (can be leftover a CPU * hotplug */