Skip to content

Commit

Permalink
intel_adsp: ptl: Fix SOF compilation without PM
Browse files Browse the repository at this point in the history
PTL has CONFIG_PM disabled. SOF should still build without
this configuration flag. This patch fixes the compilation issue.

Signed-off-by: Jaroslaw Stelter <Jaroslaw.Stelter@intel.com>
  • Loading branch information
jxstelter authored and pjdobrowolski committed Jun 12, 2024
1 parent ae4f314 commit 124ebf2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/platform/intel/ace/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@ int platform_boot_complete(uint32_t boot_message)
return ipc_platform_send_msg(&msg);
}

#ifdef CONFIG_PM
static struct pm_notifier pm_state_notifier = {
.state_entry = cpu_notify_state_entry,
.state_exit = cpu_notify_state_exit,
};
#endif

/* Runs on the primary core only */
int platform_init(struct sof *sof)
Expand Down Expand Up @@ -123,8 +125,10 @@ int platform_init(struct sof *sof)
if (ret < 0)
return ret;

#ifdef CONFIG_PM
/* register power states entry / exit notifiers */
pm_notifier_register(&pm_state_notifier);
#endif

/* initialize the host IPC mechanisms */
trace_point(TRACE_BOOT_PLATFORM_IPC);
Expand Down
4 changes: 4 additions & 0 deletions zephyr/lib/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ extern struct tr_ctx zephyr_tr;
extern void *global_imr_ram_storage;
#endif

#if CONFIG_PM
void cpu_notify_state_entry(enum pm_state state)
{
if (!cpu_is_primary(arch_proc_id()))
Expand Down Expand Up @@ -82,6 +83,7 @@ void cpu_notify_state_entry(enum pm_state state)
#endif /* CONFIG_ADSP_IMR_CONTEXT_SAVE */
}
}
#endif /* CONFIG_PM */

/* notifier called after every power state transition */
void cpu_notify_state_exit(enum pm_state state)
Expand Down Expand Up @@ -120,6 +122,7 @@ int cpu_enable_core(int id)
if (arch_cpu_active(id))
return 0;

#if CONFIG_PM
/* During kernel initialization, the next pm state is set to ACTIVE. By checking this
* value, we determine if this is the first core boot, if not, we need to skip idle thread
* initialization. By reinitializing the idle thread, we would overwrite the kernel structs
Expand All @@ -131,6 +134,7 @@ int cpu_enable_core(int id)
}

k_smp_cpu_resume(id, secondary_init, NULL, true, false);
#endif /* CONFIG_PM */

return 0;
}
Expand Down

0 comments on commit 124ebf2

Please sign in to comment.