diff --git a/west.yml b/west.yml index 4dbcd1e7cb23..8dd577a2dd61 100644 --- a/west.yml +++ b/west.yml @@ -45,7 +45,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: c48d98d556b74d75f3e3feda8e245a04d12af3e8 + revision: 0d2d06ffe1804ea0e188dba6de934989540c4363 remote: thesofproject # Import some projects listed in zephyr/west.yml@revision diff --git a/zephyr/lib/cpu.c b/zephyr/lib/cpu.c index f17801b0e30d..0e132682aba7 100644 --- a/zephyr/lib/cpu.c +++ b/zephyr/lib/cpu.c @@ -167,6 +167,7 @@ int cpu_enable_core(int id) atomic_set(&start_flag, 1); + pm_policy_state_lock_get(PM_STATE_ACTIVE, 1); return 0; } @@ -207,6 +208,8 @@ void cpu_disable_core(int id) if (soc_adsp_halt_cpu(id) != 0) tr_err(&zephyr_tr, "failed to disable core %d", id); + else + pm_policy_state_lock_put(PM_STATE_ACTIVE, 1); #endif /* CONFIG_PM */ } diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c index 0d4644ffdfb2..eb368a4d62d5 100644 --- a/zephyr/wrapper.c +++ b/zephyr/wrapper.c @@ -232,6 +232,7 @@ int start_complete(void) #if defined(CONFIG_PM) pm_policy_state_lock_get(PM_STATE_RUNTIME_IDLE, PM_ALL_SUBSTATES); pm_policy_state_lock_get(PM_STATE_SOFT_OFF, PM_ALL_SUBSTATES); + pm_policy_state_lock_get(PM_STATE_ACTIVE, 1); #endif return boot_complete(); }