]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.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)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 26 Apr 2013 06:08:17 +0000 (16:08 +1000)
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>
CC: <stable@vger.kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/cpu_setup_power.S

index 2e6ad1180e9c7ed41ccb702018f5e4145ad71771..4daa5b799010d59df3410fbd785d2a085eea1f0e 100644 (file)
@@ -67,6 +67,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