zephyr: fix secondary core power-up sequence with CONFIG_PM

When Zephyr PM subsystem is not used and SOF legacy runtime_pm
framework is used instead, we need to keep runtime_pm separately
up-to-date on the core power status, even if we use Zephyr interfaces
to actually do the power up/down of a core.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Author: kv2019i

src/lib-zephyr/cpu.c

@@ -97,6 +97,9 @@ int cpu_enable_core(int id)
 	atomic_set(&start_flag, 1);
 #ifndef CONFIG_PM
 	w_core_enable_mask |= BIT(id);
+
+	/* keep pm_runtime up-to-speed with core power status */
+	pm_runtime_get(PM_RUNTIME_DSP, PWRD_BY_TPLG | id);
 #endif
 	return 0;
 }

src/platform/intel/cavs/lib/pm_runtime.c

@@ -428,13 +428,12 @@ static inline void cavs_pm_runtime_dis_dsp_pg(uint32_t index)
 		lps_ctl |= SHIM_LPSCTL_FDSPRUN;
 		shim_write(SHIM_LPSCTL, lps_ctl);
 	} else {
-#ifdef __ZEPHYR__
+#ifndef __ZEPHYR__
 		/*
 		 * In Zephyr secondary power-up needs to go via Zephyr
 		 * SMP kernel core, so we can't program PWRCTL directly here.
 		 */
-		cpu_enable_core(index);
-#else
+
 		/* Secondary core power up */
 		shim_write16(SHIM_PWRCTL, shim_read16(SHIM_PWRCTL) |
 			     SHIM_PWRCTL_TCPDSPPG(index) |