Skip to content

Commit 7c196e5

Browse files
Markos Chandrassashalevin
authored andcommitted
MIPS: Kconfig: Disable MIPS MT and SMP implementations for R6
[ Upstream commit 5676319 ] 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]> Signed-off-by: Sasha Levin <[email protected]>
1 parent e652be4 commit 7c196e5

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
@@ -2103,7 +2103,7 @@ config CPU_R4K_CACHE_TLB
21032103

21042104
config MIPS_MT_SMP
21052105
bool "MIPS MT SMP support (1 TC on each available VPE)"
2106-
depends on SYS_SUPPORTS_MULTITHREADING
2106+
depends on SYS_SUPPORTS_MULTITHREADING && !CPU_MIPSR6
21072107
select CPU_MIPSR2_IRQ_VI
21082108
select CPU_MIPSR2_IRQ_EI
21092109
select SYNC_R4K
@@ -2204,7 +2204,7 @@ config MIPS_VPE_APSP_API_MT
22042204

22052205
config MIPS_CMP
22062206
bool "MIPS CMP framework support (DEPRECATED)"
2207-
depends on SYS_SUPPORTS_MIPS_CMP
2207+
depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6
22082208
select MIPS_GIC_IPI
22092209
select SMP
22102210
select SYNC_R4K
@@ -2221,7 +2221,7 @@ config MIPS_CMP
22212221

22222222
config MIPS_CPS
22232223
bool "MIPS Coherent Processing System support"
2224-
depends on SYS_SUPPORTS_MIPS_CPS
2224+
depends on SYS_SUPPORTS_MIPS_CPS && !CPU_MIPSR6
22252225
select MIPS_CM
22262226
select MIPS_CPC
22272227
select MIPS_CPS_PM if HOTPLUG_CPU

0 commit comments

Comments
 (0)