[POWERPC] Add starting of secondary 86xx CPUs.

Clear the high BATS during load_up_mmu if FTR_HAS_HIGH_BATS.
Allow just a bit more time for secondary CPUs to phone home.

Signed-off-by: Wei Zhang <Wei.Zhang@freescale.com>
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 14 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index a0579e859b21..b25b25902d15 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -973,6 +973,13 @@ __secondary_start_gemini:
         b       __secondary_start
 #endif /* CONFIG_GEMINI */
 
+        .globl __secondary_start_mpc86xx
+__secondary_start_mpc86xx:
+        mfspr   r3, SPRN_PIR
+        stw     r3, __secondary_hold_acknowledge@l(0)
+        mr      r24, r3                 /* cpu # */
+        b       __secondary_start
+
         .globl  __secondary_start_pmac_0
 __secondary_start_pmac_0:
         /* NB the entries for cpus 0, 1, 2 must each occupy 8 bytes. */
@@ -1088,7 +1095,12 @@ load_up_mmu:
         LOAD_BAT(1,r3,r4,r5)
         LOAD_BAT(2,r3,r4,r5)
         LOAD_BAT(3,r3,r4,r5)
-
+BEGIN_FTR_SECTION
+        LOAD_BAT(4,r3,r4,r5)
+        LOAD_BAT(5,r3,r4,r5)
+        LOAD_BAT(6,r3,r4,r5)
+        LOAD_BAT(7,r3,r4,r5)
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS)
         blr
 
 /*
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 530f7dba0bd2..c5d179d4f818 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -492,7 +492,7 @@ int __devinit __cpu_up(unsigned int cpu)
          * -- Cort
          */
         if (system_state < SYSTEM_RUNNING)
-                for (c = 5000; c && !cpu_callin_map[cpu]; c--)
+                for (c = 50000; c && !cpu_callin_map[cpu]; c--)
                         udelay(100);
 #ifdef CONFIG_HOTPLUG_CPU
         else