]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
powerpc/power8: Fix secondary CPUs hanging on boot for HV=0
authorMichael Neuling <mikey@neuling.org>
Wed, 24 Apr 2013 21:00:37 +0000 (21:00 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 May 2013 03:08:16 +0000 (20:08 -0700)
commit 8c2a381734fc9718f127f4aba958e8a7958d4028 upstream.

In __restore_cpu_power8 we determine if we are HV and if not, we return
before setting HV only resources.

Unfortunately we forgot to restore the link register from r11 before
returning.

This will happen on boot and with secondary CPUs not coming online.

This adds the missing link register restore.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/kernel/cpu_setup_power.S

index 57cf14065aecfd261269e21b428d8aba4f4856f4..0c0fc7b559a59401c45b232feba274a4fcd6a1f2 100644 (file)
@@ -64,6 +64,7 @@ _GLOBAL(__restore_cpu_power8)
        mflr    r11
        mfmsr   r3
        rldicl. r0,r3,4,63
+       mtlr    r11
        beqlr
        li      r0,0
        mtspr   SPRN_LPID,r0