cpu: fix cpu_disable_core for primary core

Nodify the logic for DSP D3 transition to invoke the sys_poweroff() call
to speed up the transition by performing the suspend/disable actions in
the IPC context instead of idle context. This results in a reduction of
the D3 transition time from 100ms on the ACE1.5 based MTL laptop to
~1ms.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

app/boards/intel_adsp_ace15_mtpm.conf

@@ -100,6 +100,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 CONFIG_ADSP_IDLE_CLOCK_GATING=y
 CONFIG_ADSP_IMR_CONTEXT_SAVE=n
 CONFIG_PM=y
+CONFIG_POWEROFF=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_PM_DEVICE_SYSTEM_MANAGED=y

app/boards/intel_adsp_ace20_lnl.conf

@@ -79,6 +79,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 CONFIG_ADSP_IDLE_CLOCK_GATING=y
 CONFIG_ADSP_IMR_CONTEXT_SAVE=y
 CONFIG_PM=y
+CONFIG_HIBERNATE=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_POWER_DOMAIN=y
 CONFIG_PM_DEVICE_RUNTIME=y

app/boards/intel_adsp_ace30_ptl.conf

@@ -78,6 +78,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 # Zephyr / power settings
 CONFIG_ADSP_IMR_CONTEXT_SAVE=y
 CONFIG_PM=y
+CONFIG_HIBERNATE=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_PM_DEVICE_POWER_DOMAIN=y

app/boards/intel_adsp_ace30_wcl.conf

@@ -71,6 +71,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 # Zephyr / power settings
 CONFIG_ADSP_IMR_CONTEXT_SAVE=y
 CONFIG_PM=y
+CONFIG_HIBERNATE=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_PM_DEVICE_POWER_DOMAIN=y

app/boards/intel_adsp_cavs25.conf

@@ -65,6 +65,7 @@ CONFIG_MM_DRV=y
 
 # Zephyr / power settings
 CONFIG_PM=y
+CONFIG_POWEROFF=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_PM_POLICY_CUSTOM=y

src/ipc/ipc-zephyr.c

@@ -226,34 +226,37 @@ enum task_state ipc_platform_do_cmd(struct ipc *ipc)
 
 	dbg_path_hot_stop_watching();
 
+	return SOF_TASK_STATE_COMPLETED;
+}
+
+void ipc_platform_complete_cmd(struct ipc *ipc)
+{
+	ARG_UNUSED(ipc);
+
 	if (ipc->task_mask & IPC_TASK_POWERDOWN ||
 	    ipc_get()->pm_prepare_D3) {
 #if defined(CONFIG_PM)
-		/**
-		 * @note For primary core this function
-		 * will only force set lower power state
-		 * in power management settings.
-		 * Core will enter D3 state after exit
-		 * IPC thread during idle.
+		/* force device suspend */
+		ipc_device_suspend_handler(NULL, ipc);
+		/*
+		 * When context save is not enabled, this function will never return but if it is
+		 * enabled, this function will return during context restore
 		 */
 		cpu_disable_core(PLATFORM_PRIMARY_CORE_ID);
+
+		/* invoke the resume handler during context restore */
+		ipc_device_resume_handler(NULL, ipc);
 #else
 		/**
 		 * @note no return - memory will be
 		 * powered off and IPC sent.
 		 */
 		platform_pm_runtime_power_off();
 #endif /* CONFIG_PM  */
+	} else {
+		intel_adsp_ipc_complete(INTEL_ADSP_IPC_HOST_DEV);
 	}
 
-	return SOF_TASK_STATE_COMPLETED;
-}
-
-void ipc_platform_complete_cmd(struct ipc *ipc)
-{
-	ARG_UNUSED(ipc);
-	intel_adsp_ipc_complete(INTEL_ADSP_IPC_HOST_DEV);
-
 #if CONFIG_DEBUG_IPC_COUNTERS
 	increment_ipc_processed_counter();
 #endif

zephyr/lib/cpu.c

@@ -32,6 +32,8 @@ static uint32_t mic_disable_status;
 #include <zephyr/kernel/smp.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/mm/mm_drv_intel_adsp_mtl_tlb.h>
+#include <zephyr/sys/poweroff.h>
+#include <zephyr/sys/hibernate.h>
 
 #if CONFIG_MULTICORE && CONFIG_SMP
 
@@ -255,16 +257,30 @@ void cpu_disable_core(int id)
 		tr_warn(&zephyr_tr, "core %d is already disabled", id);
 		return;
 	}
+
 #if defined(CONFIG_PM)
 	/* TODO: before requesting core shut down check if it's not actively used */
 	if (!pm_state_force(id, &(struct pm_state_info){PM_STATE_SOFT_OFF, 0, 0})) {
 		tr_err(&zephyr_tr, "failed to set PM_STATE_SOFT_OFF on core %d", id);
 		return;
 	}
 
-	/* Primary core will be turn off by the host after it enter SOFT_OFF state */
-	if (cpu_is_primary(id))
+	if (cpu_is_primary(id)) {
+		cpu_notify_state_entry(PM_STATE_SOFT_OFF);
+#if defined(CONFIG_POWEROFF)
+		/* Primary core will be turned off by the host. This does not return. */
+		sys_poweroff();
+#elif defined(CONFIG_HIBERNATE)
+		/*
+		 * Primary core will be turned off by the host. This function returns during
+		 * context restore.
+		 */
+		sys_hibernate();
+		cpu_notify_state_exit(PM_STATE_SOFT_OFF);
 		return;
+#endif
+	}
+
 
 	/* Broadcasting interrupts to other cores. */
 	arch_sched_broadcast_ipi();