powerpc/kexec: Add kexec "hold" support for Book3e processors

Motivation:
IBM Blue Gene/Q comes with some very strange firmware that I'm trying to get out
of using in the kernel.  So instead I spin all the threads in the boot wrapper
(using the firmware) and have them enter the kexec stub, pre-translated at the
virtual "linear" address, never touching firmware again.

This works strategy works wonderfully, but I need the following patch in the
kexec stub. I believe it should not effect Book3S and Book3E does not appear
to be here yet so I'd love to get any criticisms up front.

This patch adds two items:

1) Book3e requires that GPR4 survive the "hold" process, so we make
   sure that happens.
2) Book3e has no real mode, and the hold code exploits this.  Since
   these processors ares always translated, we arrange for the kexeced
   threads to enter the hold code using the normal kernel linear mapping.

Signed-off-by: Jimi Xenidis <jimix@pobox.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 1697a25ebe9180fa7f6d7f6095fd4233b83a208e..0886ae6dd5be1576ca274b36a8f2c79810622a48 100644 (file)
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -122,6 +122,8 @@ __secondary_hold:
 #endif
        /* Grab our physical cpu number */
        mr      r24,r3
+       /* stash r4 for book3e */
+       mr      r25,r4
 
        /* Tell the master cpu we're here */
        /* Relocation is off & we are located at an address less */
@@ -129,16 +131,31 @@ __secondary_hold:
        std     r24,__secondary_hold_acknowledge-_stext(0)
        sync
 
+       li      r26,0
+#ifdef CONFIG_PPC_BOOK3E
+       tovirt(r26,r26)
+#endif
        /* All secondary cpus wait here until told to start. */
-100:   ld      r4,__secondary_hold_spinloop-_stext(0)
+100:   ld      r4,__secondary_hold_spinloop-_stext(r26)
        cmpdi   0,r4,0
        beq     100b
 
 #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
+#ifdef CONFIG_PPC_BOOK3E
+       tovirt(r4,r4)
+#endif
        ld      r4,0(r4)                /* deref function descriptor */
        mtctr   r4
        mr      r3,r24
+       /*
+        * it may be the case that other platforms have r4 right to
+        * begin with, this gives us some safety in case it is not
+        */
+#ifdef CONFIG_PPC_BOOK3E
+       mr      r4,r25
+#else
        li      r4,0
+#endif
        /* Make sure that patched code is visible */
        isync
        bctr