soc: intel_adsp: call framework callback function for restore

When exiting power gated state, call the CPU start function passed to arch_start_cpu(). Signed-off-by: Rander Wang <[email protected]> Signed-off-by: Daniel Leung <[email protected]>
zephyrproject-rtos · Jan 17, 2024 · 6a0b1da · 6a0b1da
1 parent 2cdd448
commit 6a0b1da
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/soc/xtensa/intel_adsp/ace/power.c b/soc/xtensa/intel_adsp/ace/power.c
@@ -150,6 +150,7 @@ static ALWAYS_INLINE void _restore_core_context(void)
 }
 
 void dsp_restore_vector(void);
+void mp_resume_entry(void);
 
 void power_gate_entry(uint32_t core_id)
 {
@@ -180,6 +181,11 @@ void power_gate_exit(void)
 	cpu_early_init();
 	sys_cache_data_flush_and_invd_all();
 	_restore_core_context();
+
+	/* Secondary core is resumed by set_dx */
+	if (arch_proc_id()) {
+		mp_resume_entry();
+	}
 }
 
 __asm__(".align 4\n\t"

diff --git a/soc/xtensa/intel_adsp/cavs/power.c b/soc/xtensa/intel_adsp/cavs/power.c
@@ -52,6 +52,7 @@ LOG_MODULE_REGISTER(soc);
  * @biref FW entry point called by ROM during normal boot flow
  */
 extern void rom_entry(void);
+void mp_resume_entry(void);
 
 struct core_state {
 	uint32_t a0;
@@ -104,6 +105,11 @@ void power_gate_exit(void)
 	cpu_early_init();
 	sys_cache_data_flush_and_invd_all();
 	_restore_core_context();
+
+	/* Secondary core is resumed by set_dx */
+	if (arch_proc_id()) {
+		mp_resume_entry();
+	}
 }
 
 __asm__(".align 4\n\t"

diff --git a/soc/xtensa/intel_adsp/common/multiprocessing.c b/soc/xtensa/intel_adsp/common/multiprocessing.c
@@ -110,6 +110,11 @@ __imr void z_mp_entry(void)
 	__ASSERT(false, "arch_start_cpu() handler should never return");
 }
 
+void mp_resume_entry(void)
+{
+	start_rec.fn(start_rec.arg);
+}
+
 bool arch_cpu_active(int cpu_num)
 {
 	return soc_cpus_active[cpu_num];