kernel: idle: clock switch refactor

This patch cleans-up and refactoring correct implementation of clock switching in idle thread. Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>
thesofproject · Oct 16, 2023 · 4537cc5 · 4537cc5
1 parent c48d98d
commit 4537cc5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/kernel/idle.c b/kernel/idle.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/wait_q.h>
 #include <zephyr/pm/pm.h>
+#include <zephyr/pm/policy.h>
 #include <stdbool.h>
 #include <zephyr/logging/log.h>
 #include <ksched.h>
@@ -65,12 +66,6 @@ void idle(void *unused1, void *unused2, void *unused3)
 
 #ifdef CONFIG_PM
 		_kernel.idle = z_get_next_timeout_expiry();
-#if CONFIG_SOC_SERIES_INTEL_ACE
-		(void)atomic_inc(&_cpus_idleing);
-		if (_cpus_idleing == _cpus_active)
-			adsp_clock_idle_entry();
-#endif
-
 		/*
 		 * Call the suspend hook function of the soc interface
 		 * to allow entry into a low power state. The function
@@ -87,14 +82,16 @@ void idle(void *unused1, void *unused2, void *unused3)
 		 * logic.
 		 */
 		if (k_is_pre_kernel() || !pm_system_suspend(_kernel.idle)) {
+#if CONFIG_SOC_SERIES_INTEL_ACE
+			pm_policy_state_lock_put(PM_STATE_ACTIVE, 1);
+			adsp_clock_idle_entry();
+#endif
 			k_cpu_idle();
-		}
 #if CONFIG_SOC_SERIES_INTEL_ACE
-		if (_cpus_idleing == _cpus_active)
+			pm_policy_state_lock_get(PM_STATE_ACTIVE, 1);
 			adsp_clock_idle_exit();
-
-		(void)atomic_dec(&_cpus_idleing);
 #endif
+		}
 #else
 		k_cpu_idle();
 #endif

diff --git a/kernel/init.c b/kernel/init.c
@@ -48,9 +48,6 @@ struct z_kernel _kernel;
 __pinned_bss
 atomic_t _cpus_active;
 
-__pinned_bss
-atomic_t _cpus_idleing;
-
 /* init/main and idle threads */
 K_THREAD_PINNED_STACK_DEFINE(z_main_stack, CONFIG_MAIN_STACK_SIZE);
 struct k_thread z_main_thread;

diff --git a/soc/xtensa/intel_adsp/ace/power.c b/soc/xtensa/intel_adsp/ace/power.c
@@ -231,7 +231,6 @@ void pm_state_set(enum pm_state state, uint8_t substate_id)
 	/* save interrupt state and turn off all interrupts */
 	core_desc[cpu].intenable = XTENSA_RSR("INTENABLE");
 	z_xt_ints_off(0xffffffff);
-	(void)atomic_dec(&_cpus_idleing);
 
 	if (state == PM_STATE_SOFT_OFF) {
 		core_desc[cpu].bctl = DSPCS.bootctl[cpu].bctl;
@@ -369,7 +368,6 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 		__ASSERT(false, "invalid argument - unsupported power state");
 	}
 
-	(void)atomic_inc(&_cpus_idleing);
 	z_xt_ints_on(core_desc[cpu].intenable);
 }