From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: stable@kernel.org
Cc: linuxppc-dev@lists.ozlabs.org, Andrey Gusev <ronne@list.ru>,
paulus@samba.org
Subject: Re: PROBLEM: 2.6.39 doesn’t boot on POWER MAC
Date: Fri, 03 Jun 2011 13:10:45 +1000 [thread overview]
Message-ID: <1307070645.23876.9.camel@pasglop> (raw)
In-Reply-To: <1307068891.23876.2.camel@pasglop>
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.
Cheers,
Ben.
>From c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 Mon Sep 17 00:00:00 2001
From: kerstin jonsson <kerstin.jonsson@ericsson.com>
Date: Tue, 17 May 2011 23:57:11 +0000
Subject: [PATCH] powerpc/4xx: Fix regression in SMP on 476
commit c56e58537d504706954a06570b4034c04e5b7500 breaks SMP support in PPC_47x chip.
secondary_ti must be set to current thread info before callin kick_cpu or else
start_secondary_47x will jump into void when trying to return to c-code.
In the current setup secondary_ti is initialized before the CPU idle task is started
and only the boot core will start. I am not sure this is the correct solution, but it
makes SMP possible in my chip.
Note! The HOTPLUG support probably need some fixing to, There is no trampoline code
available in head_44x.S - start_secondary_resume?
Signed-off-by: Kerstin Jonsson <kerstin.jonsson@ericsson.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/smp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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
*/
next prev parent reply other threads:[~2011-06-03 3:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-28 7:55 PROBLEM: 2.6.39 doesn’t boot on POWER MAC Andrey Gusev
2011-05-28 18:09 ` PROBLEM: 2.6.39 doesn't " Tabi Timur-B04825
2011-05-29 7:36 ` Andrey Gusev
2011-05-29 19:16 ` Andrey Gusev
2011-05-29 21:51 ` Benjamin Herrenschmidt
2011-05-30 22:11 ` kevin diggs
2011-05-30 22:17 ` Benjamin Herrenschmidt
2011-05-31 20:42 ` Andrey Gusev
2011-06-02 22:00 ` PROBLEM: 2.6.39 doesn’t " Giuliano Pochini
2011-06-03 2:41 ` Benjamin Herrenschmidt
2011-06-03 3:10 ` Benjamin Herrenschmidt [this message]
2011-06-03 5:53 ` [stable] " Greg KH
2011-06-03 22:36 ` Giuliano Pochini
2011-06-04 9:02 ` Andrey Gusev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1307070645.23876.9.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=ronne@list.ru \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).