Skip to content

Commit 5676319

Browse files
Markos Chandrasralfbaechle
authored andcommitted
MIPS: Kconfig: Disable MIPS MT and SMP implementations for R6
R6 does not support the MIPS MT ASE and the CMP/SMP options so restrict them in order to prevent users from selecting incompatible SMP configuration for R6 cores. We also disable the CPS/SMP option because its support hasn't been added to the CPS code yet. Signed-off-by: Markos Chandras <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/10637/ Signed-off-by: Ralf Baechle <[email protected]>
1 parent e57f9a2 commit 5676319

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/mips/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2113,7 +2113,7 @@ config CPU_R4K_CACHE_TLB
21132113

21142114
config MIPS_MT_SMP
21152115
bool "MIPS MT SMP support (1 TC on each available VPE)"
2116-
depends on SYS_SUPPORTS_MULTITHREADING
2116+
depends on SYS_SUPPORTS_MULTITHREADING && !CPU_MIPSR6
21172117
select CPU_MIPSR2_IRQ_VI
21182118
select CPU_MIPSR2_IRQ_EI
21192119
select SYNC_R4K
@@ -2214,7 +2214,7 @@ config MIPS_VPE_APSP_API_MT
22142214

22152215
config MIPS_CMP
22162216
bool "MIPS CMP framework support (DEPRECATED)"
2217-
depends on SYS_SUPPORTS_MIPS_CMP
2217+
depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6
22182218
select MIPS_GIC_IPI
22192219
select SMP
22202220
select SYNC_R4K
@@ -2231,7 +2231,7 @@ config MIPS_CMP
22312231

22322232
config MIPS_CPS
22332233
bool "MIPS Coherent Processing System support"
2234-
depends on SYS_SUPPORTS_MIPS_CPS
2234+
depends on SYS_SUPPORTS_MIPS_CPS && !CPU_MIPSR6
22352235
select MIPS_CM
22362236
select MIPS_CPC
22372237
select MIPS_CPS_PM if HOTPLUG_CPU

0 commit comments

Comments
 (0)