michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: remove CONFIG_MP_NUM_CPUS

Browse source 
`CONFIG_MP_NUM_CPUS` has been deprecated for more than 2
releases, it's time to remove it.

Updated all usage of `CONFIG_MP_NUM_CPUS` to
`CONFIG_MP_MAX_NUM_CPUS`

Signed-off-by: Yong Cong Sin <ycsin@meta.com>
Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
This commit is contained in:
Yong Cong Sin 2024-09-18 00:07:25 +08:00 • committed by Fabio Baltieri
commit b55f3c1c4f
5 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/Kconfig
View file

@ -819,7 +819,7 @@ config CPU_CACHE_INCOHERENT
help help
This hidden configuration should be selected when the CPU has This hidden configuration should be selected when the CPU has
incoherent cache. This applies to intra-CPU multiprocessing incoherent cache. This applies to intra-CPU multiprocessing
incoherence and makes only sense when MP_NUM_CPUS > 1. incoherence and makes only sense when MP_MAX_NUM_CPUS > 1.
config CPU_HAS_ICACHE config CPU_HAS_ICACHE
bool bool
@ -1025,7 +1025,7 @@ config CACHE_DOUBLEMAP
point to the same cached/uncached memory at different locations. point to the same cached/uncached memory at different locations.
This applies to intra-CPU multiprocessing incoherence and makes only This applies to intra-CPU multiprocessing incoherence and makes only
sense when MP_NUM_CPUS > 1. sense when MP_MAX_NUM_CPUS > 1.
config CACHE_MANAGEMENT config CACHE_MANAGEMENT
bool "Cache management features" bool "Cache management features"

4
arch/x86/core/intel64/irq_offload.c
View file

@ -18,8 +18,8 @@
extern void (*x86_irq_funcs[NR_IRQ_VECTORS])(const void *arg); extern void (*x86_irq_funcs[NR_IRQ_VECTORS])(const void *arg);
extern const void *x86_irq_args[NR_IRQ_VECTORS]; extern const void *x86_irq_args[NR_IRQ_VECTORS];
static void (*irq_offload_funcs[CONFIG_MP_NUM_CPUS])(const void *arg); static void (*irq_offload_funcs[CONFIG_MP_MAX_NUM_CPUS])(const void *arg);
static const void *irq_offload_args[CONFIG_MP_NUM_CPUS]; static const void *irq_offload_args[CONFIG_MP_MAX_NUM_CPUS];
static void dispatcher(const void *arg) static void dispatcher(const void *arg)
{ {

3
doc/releases/migration-guide-4.0.rst
View file

@ -21,6 +21,9 @@ Build System
Kernel Kernel
****** ******
* Removed the deprecated :kconfig:option:`CONFIG_MP_NUM_CPUS`, application should be updated to use
:kconfig:option:`CONFIG_MP_MAX_NUM_CPUS` instead.
Boards Boards
****** ******

7
kernel/Kconfig.smp
View file

@ -38,13 +38,6 @@ config SMP_BOOT_DELAY
(architecture/SoC/board/application) to boot secondary CPUs at (architecture/SoC/board/application) to boot secondary CPUs at
a later time. a later time.
config MP_NUM_CPUS
int "Number of CPUs/cores [DEPRECATED]"
default MP_MAX_NUM_CPUS
range 1 12
help
This is deprecated, please use MP_MAX_NUM_CPUS instead.
config MP_MAX_NUM_CPUS config MP_MAX_NUM_CPUS
int "Maximum number of CPUs/cores" int "Maximum number of CPUs/cores"
default 1 default 1

3
kernel/init.c
View file

@ -41,9 +41,6 @@
#include <zephyr/internal/syscall_handler.h> #include <zephyr/internal/syscall_handler.h>
LOG_MODULE_REGISTER(os, CONFIG_KERNEL_LOG_LEVEL); LOG_MODULE_REGISTER(os, CONFIG_KERNEL_LOG_LEVEL);
BUILD_ASSERT(CONFIG_MP_NUM_CPUS == CONFIG_MP_MAX_NUM_CPUS,
"CONFIG_MP_NUM_CPUS and CONFIG_MP_MAX_NUM_CPUS need to be set the same");
/* the only struct z_kernel instance */ /* the only struct z_kernel instance */
__pinned_bss __pinned_bss
struct z_kernel _kernel; struct z_kernel _kernel;