michaelh/zephyr
1
0
Fork 0
Code Releases Activity

pm: Fix possible assertion when resuming

Browse source 
pm_system_resume() can be called from the idle thread with
interruptions unmasked. In this situation, _current_cpu will call
z_smp_cpu_mobile() that will return true and cause an assert.

In this function we don't need to check if the current context can be
preempted, we just need the information about which cpu is executing
it.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2022-06-13 22:34:48 -07:00 • committed by Anas Nashif
commit 2cd49ca0fe
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/pm/pm.c
View file

@ -21,6 +21,9 @@
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(pm, CONFIG_PM_LOG_LEVEL);
#define CURRENT_CPU \
(COND_CODE_1(CONFIG_SMP, (arch_curr_cpu()->id), (_current_cpu->id)))
static ATOMIC_DEFINE(z_post_ops_required, CONFIG_MP_NUM_CPUS);
static sys_slist_t pm_notifiers = SYS_SLIST_STATIC_INIT(&pm_notifiers);
@ -160,7 +163,7 @@ static inline void pm_state_notify(bool entering_state)
void pm_system_resume(void)
{
uint8_t id = _current_cpu->id;
uint8_t id = CURRENT_CPU;
/*
* This notification is called from the ISR of the event