]> git.karo-electronics.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:33:03 +0000 (20:33 -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 ea847abb0d0a5fae6738c1bed0dc863d78358ded..116700886b3136c756706228b8602b0fe9c67594 100644 (file)
@@ -66,6 +66,7 @@ _GLOBAL(__restore_cpu_power8)
        bl      __init_FSCR
        mfmsr   r3
        rldicl. r0,r3,4,63
+       mtlr    r11
        beqlr
        li      r0,0
        mtspr   SPRN_LPID,r0