adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

kconfig: Remove MP_NUM_CPUS usage

Browse source 
Zephyr's code base uses MP_MAX_NUM_CPUS to
know how many cores exists in the target. It is
also expected that both symbols MP_MAX_NUM_CPUS
and MP_NUM_CPUS have the same value, so lets
just use MP_MAX_NUM_CPUS and simplify it.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2023-07-20 12:34:23 -07:00 committed by Fabio Baltieri
parent d24de87aed
commit 15aa3acaf6
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boards/x86/acrn/doc/index.rst
View file

@ -125,7 +125,7 @@ Configure Zephyr CPUs
Now you need to configure the CPU environment ACRN presents to the
guest. By default Zephyr builds in SMP mode, but ACRN's default
configuration gives it only one CPU. Find the value of
``CONFIG_MP_NUM_CPUS`` in the Zephyr .config file give the guest that
``CONFIG_MP_MAX_NUM_CPUS`` in the Zephyr .config file give the guest that
many CPUs in the ``<cpu_affinity>`` tag. For example:
.. code-block:: xml

2
doc/kernel/services/smp/smp.rst
View file

@ -18,7 +18,7 @@ variable. This must be set to "y" to enable SMP features, otherwise
a uniprocessor kernel will be built. In general the platform default
will have enabled this anywhere it's supported. When enabled, the
number of physical CPUs available is visible at build time as
:kconfig:option:`CONFIG_MP_NUM_CPUS`. Likewise, the default for this will be the
:kconfig:option:`CONFIG_MP_MAX_NUM_CPUS`. Likewise, the default for this will be the
number of available CPUs on the platform and it is not expected that
typical apps will change it. But it is legal and supported to set
this to a smaller (but obviously not larger) number for special

2
drivers/mbox/mbox_andes_plic_sw.c
View file

@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(mbox_andes_plic_sw);
static struct mbox_andes_data {
mbox_callback_t cb[IPI_NUM];
void *user_data[IPI_NUM];
uint32_t enabled_channel[CONFIG_MP_NUM_CPUS];
uint32_t enabled_channel[CONFIG_MP_MAX_NUM_CPUS];
#ifdef CONFIG_SCHED_IPI_SUPPORTED
uint32_t reg_cb_channel;
uint32_t ipi_channel;

4
kernel/Kconfig
View file

@ -1173,12 +1173,12 @@ config TRACE_SCHED_IPI
to check if schedule IPI has called or not, for testing
purpose.
depends on SCHED_IPI_SUPPORTED
depends on MP_NUM_CPUS>1
depends on MP_MAX_NUM_CPUS>1
config KERNEL_COHERENCE
bool "Place all shared data into coherent memory"
depends on ARCH_HAS_COHERENCE
default y if SMP && MP_NUM_CPUS > 1
default y if SMP && MP_MAX_NUM_CPUS > 1
select THREAD_STACK_INFO
help
When available and selected, the kernel will build in a mode

2
lib/os/Kconfig
View file

@ -35,7 +35,7 @@ config BASE64
config PRINTK_SYNC
bool "Serialize printk() calls"
default y if SMP && MP_NUM_CPUS > 1 && !(EFI_CONSOLE && LOG)
default y if SMP && MP_MAX_NUM_CPUS > 1 && !(EFI_CONSOLE && LOG)
help
When true, a spinlock will be taken around the output from a
single printk() call, preventing the output data from

2
subsys/debug/Kconfig
View file

@ -257,7 +257,7 @@ config ASSERT_LEVEL
config SPIN_VALIDATE
bool "Spinlock validation"
depends on MULTITHREADING
depends on MP_NUM_CPUS <= 4
depends on MP_MAX_NUM_CPUS <= 4
default y if !FLASH || FLASH_SIZE > 32
help
There's a spinlock validation framework available when asserts are

4
tests/posix/pthread_pressure/Kconfig
View file

@ -6,8 +6,8 @@ source "Kconfig.zephyr"
config TEST_NUM_CPUS
int "Number of CPUs to use in parallel"
range 1 MP_NUM_CPUS
default MP_NUM_CPUS
range 1 MP_MAX_NUM_CPUS
default MP_MAX_NUM_CPUS
help
The number of parallel threads to run during the test.