powerpc/pmac: Fix issues with PowerMac "PowerSurge" SMP
Subsystems (2)
PATCH 1/1 powerpc/pmac: Fix issues with PowerMac "PowerSurge" SMP
The old PowerSurge SMP (ie, dual or quad 604 machines) code has numerous issues in modern world.
One is cpu_possible_map is set too late (the device-tree is bogus) so we fail to allocate the interrupt stacks and crash. Another problem is the fact the timebase is frozen by the bringup of the second CPU so the delays in the generic code will hang, we need to move some of the calling procedure to inside the powermac code.
This makes it boot again for me
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
arch/powerpc/kernel/smp.c | 3 arch/powerpc/platforms/powermac/setup.c | 41 +------ arch/powerpc/platforms/powermac/smp.c | 166 +++++++++++++++++++------------- 3 files changed, 112 insertions(+), 98 deletions(-)
arch/powerpc/platforms/powermac/setup.c +8 -33
@@ -103,11 +103,6 @@ unsigned long smu_cmdbuf_abs;EXPORT_SYMBOL (smu_cmdbuf_abs);#endif -#ifdef CONFIG_SMP -extern struct smp_ops_t psurge_smp_ops; -extern struct smp_ops_t core99_smp_ops; -#endif /* CONFIG_SMP */ -static void pmac_show_cpuinfo (struct seq_file *m) {struct device_node *np;
@@ -341,34 +336,6 @@ static void __init pmac_setup_arch(void)ROOT_DEV =DEFAULT_ROOT_DEVICE ;#endif -#ifdef CONFIG_SMP -/* Check for Core99 */ - ic =of_find_node_by_name (NULL ,"uni-n" ); -if (!ic) - ic =of_find_node_by_name (NULL ,"u3" ); -if (!ic) - ic =of_find_node_by_name (NULL ,"u4" ); -if (ic) { -of_node_put (ic); - smp_ops = &core99_smp_ops; - } -#ifdef CONFIG_PPC32 - else { -/* -* We have to set bits in cpu_possible_map here since the -* secondary CPU(s) aren't in the device tree, and -* setup_per_cpu_areas only allocates per-cpu data for -* CPUs in the cpu_possible_map. -*/ -int cpu; - -for (cpu =1 ; cpu <4 && cpu <NR_CPUS ; ++cpu) -cpu_set (cpu, cpu_possible_map); - smp_ops = &psurge_smp_ops; - } -#endif -#endif /* CONFIG_SMP */ -#ifdef CONFIG_ADB if (strstr (cmd_line,"adb_sync" )) {extern int __adb_probe_sync;
@@ -512,6 +479,14 @@ static void __init pmac_init_early(void)#ifdef CONFIG_PPC64 iommu_init_early_dart ();#endif + +/* SMP Init has to be done early as we need to patch up +* cpu_possible_map before interrupt stacks are allocated +* or kaboom... +*/ +#ifdef CONFIG_SMP +pmac_setup_smp (); +#endif }static int __init pmac_declare_of_platform_devices (void )
arch/powerpc/platforms/powermac/smp.c +102 -64
246 lines not on this page · raw message
arch/powerpc/kernel/smp.c +2 -1
@@ -68,7 +68,8 @@ EXPORT_PER_CPU_SYMBOL(cpu_core_map);/* SMP operations for this machine */ struct smp_ops_t *smp_ops; -static volatile unsigned int cpu_callin_map[NR_CPUS ]; +/* Can't be static due to PowerMac hackery */ +volatile unsigned int cpu_callin_map[NR_CPUS ];int smt_enabled_at_boot =1 ;