powerpc: Merge in 64-bit powermac support.

This brings in a lot of changes from arch/ppc64/kernel/pmac_*.c to
arch/powerpc/platforms/powermac/*.c and makes various minor tweaks
elsewhere.  On the powermac we now initialize ppc_md by copying
the whole pmac_md structure into it, which required some changes in
the ordering of initializations of individual fields of it.

Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 15 insertions, 21 deletions

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 72b0d26e41d4..147215a0d6c0 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1501,20 +1501,17 @@ copy_to_here:
         .section ".text";
         .align 2 ;
 
-        .globl  pmac_secondary_start_1  
-pmac_secondary_start_1: 
-        li      r24, 1
-        b       .pmac_secondary_start
-        
-        .globl pmac_secondary_start_2
-pmac_secondary_start_2: 
-        li      r24, 2
-        b       .pmac_secondary_start
-        
-        .globl pmac_secondary_start_3
-pmac_secondary_start_3:
-        li      r24, 3
-        b       .pmac_secondary_start
+        .globl  __secondary_start_pmac_0
+__secondary_start_pmac_0:
+        /* NB the entries for cpus 0, 1, 2 must each occupy 8 bytes. */
+        li      r24,0
+        b       1f
+        li      r24,1
+        b       1f
+        li      r24,2
+        b       1f
+        li      r24,3
+1:
         
 _GLOBAL(pmac_secondary_start)
         /* turn on 64-bit mode */
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 9b1baaa9eda0..095659d51b4b 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -772,7 +772,7 @@ static unsigned long __init prom_next_cell(int s, cell_t **cellp)
         }
         r = *p++;
 #ifdef CONFIG_PPC64
-        if (s) {
+        if (s > 1) {
                 r <<= 32;
                 r |= *(p++);
         }
@@ -2059,7 +2059,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
         reloc_got2(-offset);
 #endif
 
-        __start(hdr, 0, 0);
+        __start(hdr, KERNELBASE + offset, 0);
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index b9269c038af3..2d7fdeb581d1 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -464,14 +464,11 @@ void __init machine_init(unsigned long dt_ptr, unsigned long phys)
         strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line));
 #endif /* CONFIG_CMDLINE */
 
+        platform_init();
+
 #ifdef CONFIG_6xx
         ppc_md.power_save = ppc6xx_idle;
 #endif
-#ifdef CONFIG_POWER4
-        ppc_md.power_save = power4_idle;
-#endif
-
-        platform_init();
 
         if (ppc_md.progress)
                 ppc_md.progress("id mach(): done", 0x200);