The SMP_ON_UP checks restrict the feature to ARM limited designs, when other implementers support SMP designs. Instead of checking for an ARM CPU and ARMv6/v7 just check for a v6 or v7 and then rely on the MPIDR for non ARM 11MPCore designs.
Signed-off-by: Stephen Boyd <[email protected]> --- arch/arm/kernel/head.S | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index f17d9a0..ede5b70 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -393,20 +393,25 @@ ENDPROC(__turn_mmu_on) #ifdef CONFIG_SMP_ON_UP __fixup_smp: mov r4, #0x00070000 - orr r3, r4, #0xff000000 @ mask 0xff070000 - orr r4, r4, #0x41000000 @ val 0x41070000 - and r0, r9, r3 - teq r0, r4 @ ARM CPU and ARMv6/v7? + and r0, r9, r4 + teq r0, r4 @ ARMv6/v7? bne __fixup_smp_on_up @ no, assume UP + orr r3, r4, #0xff000000 @ mask 0xff070000 orr r3, r3, #0x0000ff00 orr r3, r3, #0x000000f0 @ mask 0xff07fff0 + orr r4, r4, #0x41000000 @ val 0x41070000 orr r4, r4, #0x0000b000 orr r4, r4, #0x00000020 @ val 0x4107b020 and r0, r9, r3 teq r0, r4 @ ARM 11MPCore? moveq pc, lr @ yes, assume SMP + mov r4, #0x00070000 + and r0, r9, #0x000f0000 + teq r0, r4 @ ARMv6? + beq __fixup_smp_on_up @ yes, assume UP + mrc p15, 0, r0, c0, c0, 5 @ read MPIDR tst r0, #1 << 31 movne pc, lr @ bit 31 => SMP -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
