Re: [PATCH] PPC_47x SMP fix

From: Benjamin Herrenschmidt
Date: Wed May 18 2011 - 23:09:43 EST


On Wed, 2011-05-18 at 11:57 +0200, Kerstin Jonsson wrote:
> 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?

Sending to Linus now. I've also committed a fix for the later, moving
the 32-bit definition of start_secondary_resume to misc_32.S

Thanks !

Cheers,
Ben.
>
> Signed-off-by: Kerstin Jonsson <kerstin.jonsson@xxxxxxxxxxxx>
> Cc: Paul Mackerras <paulus@xxxxxxxxx>
> Cc: Michael Neuling <mikey@xxxxxxxxxxx>
> Cc: Will Schmidt <will_schmidt@xxxxxxxxxxxx>
> ---
> 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
> */


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/