smp: Kconfig: Move to using MP_MAX_NUM_CPUS

Continue to phase out MP_NUM_CPUS, change Kconfig to be MP_MAX_NUM_CPUS and make MP_MAX_NUM_CPUS the main Kconfig symbol. Signed-off-by: Kumar Gala <[email protected]>
caco3 · Oct 20, 2022 · 6393a7c · 6393a7c
1 parent 4f01660
commit 6393a7c
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 19 deletions.
diff --git a/boards/x86/acrn/Kconfig.defconfig b/boards/x86/acrn/Kconfig.defconfig
@@ -7,7 +7,7 @@ config BOARD
 	default "acrn"
 	depends on BOARD_ACRN
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 endif
diff --git a/boards/x86/ehl_crb/Kconfig.defconfig b/boards/x86/ehl_crb/Kconfig.defconfig
@@ -10,7 +10,7 @@ config BOARD
 config BUILD_OUTPUT_STRIPPED
 	default y
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 if BOARD_EHL_CRB_SBL

diff --git a/boards/x86/up_squared/Kconfig.defconfig b/boards/x86/up_squared/Kconfig.defconfig
@@ -5,7 +5,7 @@ if BOARD_UP_SQUARED
 config BOARD
 	default "up_squared"
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2 if BOARD_UP_SQUARED
 
 config BUILD_OUTPUT_STRIPPED

diff --git a/kernel/Kconfig b/kernel/Kconfig
@@ -873,15 +873,15 @@ config SMP_BOOT_DELAY
 
 config MP_NUM_CPUS
 	int "Number of CPUs/cores"
-	default 1
+	default MP_MAX_NUM_CPUS
 	range 1 4
 	help
 	  Number of multiprocessing-capable cores available to the
 	  multicpu API and SMP features.
 
 config MP_MAX_NUM_CPUS
 	int "Maximum number of CPUs/cores"
-	default MP_NUM_CPUS
+	default 1
 	range 1 4
 	help
 	  Maximum number of multiprocessing-capable cores available to the

diff --git a/soc/arc/snps_arc_hsdk/Kconfig.defconfig b/soc/arc/snps_arc_hsdk/Kconfig.defconfig
@@ -36,7 +36,7 @@ config ARCV2_TIMER_IRQ_PRIORITY
 config ARC_CONNECT
 	default y
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 4
 
 config UART_NS16550_ACCESS_WORD_ONLY

diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs5x_smp b/soc/arc/snps_nsim/Kconfig.defconfig.hs5x_smp
@@ -23,7 +23,7 @@ config CACHE_MANAGEMENT
 config ARC_CONNECT
 	default y
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 endif # SOC_NSIM_HS5X_SMP
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs6x_smp b/soc/arc/snps_nsim/Kconfig.defconfig.hs6x_smp
@@ -24,7 +24,7 @@ config CACHE_MANAGEMENT
 config ARC_CONNECT
 	default y
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 endif # SOC_NSIM_HS6X_SMP
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp b/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp
@@ -31,7 +31,7 @@ config CACHE_MANAGEMENT
 config ARC_CONNECT
 	default y
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 endif # SOC_NSIM_HS_SMP
diff --git a/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.defconfig.series b/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.defconfig.series
@@ -11,7 +11,7 @@ config SOC_SERIES
 	default "xc7zxxx"
 
 # Zephyr does not support SMP on aarch32 yet, so we default to 1 CPU core
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 1
 
 endif # SOC_SERIES_XILINX_XC7ZXXX
diff --git a/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.defconfig.series b/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.defconfig.series
@@ -10,7 +10,7 @@ rsource "Kconfig.defconfig.xc7z*"
 config SOC_SERIES
 	default "xc7zxxxs"
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 1
 
 endif # SOC_SERIES_XILINX_XC7ZXXXS
diff --git a/soc/riscv/riscv-privilege/andes_v5/Kconfig.defconfig.ae350 b/soc/riscv/riscv-privilege/andes_v5/Kconfig.defconfig.ae350
@@ -18,7 +18,7 @@ config IDLE_STACK_SIZE
 config TEST_EXTRA_STACK_SIZE
 	default 1024
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 1
 	range 1 8
 

diff --git a/soc/xtensa/esp32/Kconfig.defconfig b/soc/xtensa/esp32/Kconfig.defconfig
@@ -37,7 +37,7 @@ config SCHED_IPI_SUPPORTED
 config SCHED_CPU_MASK
 	default y
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 endif

diff --git a/soc/xtensa/esp32s2/Kconfig.defconfig b/soc/xtensa/esp32s2/Kconfig.defconfig
@@ -40,7 +40,7 @@ config ISR_STACK_SIZE
 config HEAP_MEM_POOL_SIZE
 	default 32768
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 1
 
 config MINIMAL_LIBC_OPTIMIZE_STRING_FOR_SIZE

diff --git a/soc/xtensa/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm b/soc/xtensa/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm
@@ -8,7 +8,7 @@ config SOC
 	string
 	default "intel_ace15_mtpm"
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 3
 
 endif
diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v15 b/soc/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v15
@@ -17,7 +17,7 @@ config SOC_SERIES_INTEL_CAVS_V15
 config HP_SRAM_RESERVE
 	default 32768
 
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 config SCHED_IPI_SUPPORTED

diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v18 b/soc/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v18
@@ -17,7 +17,7 @@ config SOC_SERIES_INTEL_CAVS_V18
 	def_bool y
 
 # FIXME: these DSPs can have more cores, but Zephyr only supports up to 2 cores on them
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 config SCHED_IPI_SUPPORTED

diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v20 b/soc/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v20
@@ -16,7 +16,7 @@ config SOC_SERIES_INTEL_CAVS_V20
 	def_bool y
 
 # FIXME: these DSPs can have more cores, but Zephyr only supports up to 2 cores on them
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 config SCHED_IPI_SUPPORTED

diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 b/soc/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v25
@@ -15,7 +15,7 @@ config SOC_SERIES_INTEL_CAVS_V25
 	def_bool y
 
 # Hardware has four cores, limited to two pending test fixes
-config MP_NUM_CPUS
+config MP_MAX_NUM_CPUS
 	default 2
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC