Commit 1e65ce65 authored by Paul Burton's avatar Paul Burton Committed by Luis Henriques

MIPS: CPS: #ifdef on CONFIG_MIPS_MT_SMP rather than CONFIG_MIPS_MT

commit 7a63076d upstream.

The CONFIG_MIPS_MT symbol can be selected by CONFIG_MIPS_VPE_LOADER in
addition to CONFIG_MIPS_MT_SMP. We only want MT code in the CPS SMP boot
vector if we're using MT for SMP. Thus switch the config symbol we ifdef
against to CONFIG_MIPS_MT_SMP.
Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10867/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent fe76180c
...@@ -224,7 +224,7 @@ LEAF(excep_ejtag) ...@@ -224,7 +224,7 @@ LEAF(excep_ejtag)
END(excep_ejtag) END(excep_ejtag)
LEAF(mips_cps_core_init) LEAF(mips_cps_core_init)
#ifdef CONFIG_MIPS_MT #ifdef CONFIG_MIPS_MT_SMP
/* Check that the core implements the MT ASE */ /* Check that the core implements the MT ASE */
has_mt t0, 3f has_mt t0, 3f
...@@ -310,7 +310,7 @@ LEAF(mips_cps_boot_vpes) ...@@ -310,7 +310,7 @@ LEAF(mips_cps_boot_vpes)
/* Calculate this VPEs ID. If the core doesn't support MT use 0 */ /* Calculate this VPEs ID. If the core doesn't support MT use 0 */
li t9, 0 li t9, 0
#ifdef CONFIG_MIPS_MT #ifdef CONFIG_MIPS_MT_SMP
has_mt t6, 1f has_mt t6, 1f
/* Find the number of VPEs present in the core */ /* Find the number of VPEs present in the core */
...@@ -338,7 +338,7 @@ LEAF(mips_cps_boot_vpes) ...@@ -338,7 +338,7 @@ LEAF(mips_cps_boot_vpes)
lw t7, COREBOOTCFG_VPECONFIG(t0) lw t7, COREBOOTCFG_VPECONFIG(t0)
addu v0, v0, t7 addu v0, v0, t7
#ifdef CONFIG_MIPS_MT #ifdef CONFIG_MIPS_MT_SMP
/* If the core doesn't support MT then return */ /* If the core doesn't support MT then return */
bnez t6, 1f bnez t6, 1f
...@@ -451,7 +451,7 @@ LEAF(mips_cps_boot_vpes) ...@@ -451,7 +451,7 @@ LEAF(mips_cps_boot_vpes)
2: .set pop 2: .set pop
#endif /* CONFIG_MIPS_MT */ #endif /* CONFIG_MIPS_MT_SMP */
/* Return */ /* Return */
jr ra jr ra
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment