Skip to content

ace: power policy management #6489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 5 commits into from
Nov 4, 2022
Merged

ace: power policy management #6489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a8c798
ace: power: add custom power policy
tmleman Oct 26, 2022
ddfe1b8
ace: power: handling d0i3 prevent
tmleman Oct 26, 2022
e97ceec
zephyr: power: preventing lower power states
tmleman Oct 26, 2022
1d90bf8
ace: cpu: compilation error fix
tmleman Oct 26, 2022
aac1777
mtl: power: enabling zephyr power manager
tmleman Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/boards/intel_adsp_ace15_mtpm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ CONFIG_COMP_SRC=y

CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y

# power settings
CONFIG_PM=y
CONFIG_PM_POLICY_CUSTOM=y

# enable Zephyr drivers
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_DAI=y
Expand Down Expand Up @@ -54,10 +58,8 @@ CONFIG_INTEL_ADSP_IPC=y

# Temporary disabled options
CONFIG_TRACE=n
CONFIG_PM=n
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_PM_DEVICE_POWER_DOMAIN=n
CONFIG_PM_POLICY_CUSTOM=n
CONFIG_COMP_KPB=n

1 change: 1 addition & 0 deletions src/lib-zephyr/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ int cpu_enabled_cores(void)

#else /* CONFIG_ACE */
#include <sof/trace/trace.h>
#include <rtos/wait.h>
#include <zephyr/pm/pm.h>

LOG_MODULE_DECLARE(zephyr, CONFIG_SOF_LOG_LEVEL);
Expand Down
70 changes: 70 additions & 0 deletions src/platform/intel/ace/lib/pm_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,82 @@
#include <sof_versions.h>
#include <stdint.h>

#include <ace_v1x-regs.h>
#include <zephyr/pm/policy.h>

/* 76cc9773-440c-4df9-95a8-72defe7796fc */
DECLARE_SOF_UUID("power", power_uuid, 0x76cc9773, 0x440c, 0x4df9,
0x95, 0xa8, 0x72, 0xde, 0xfe, 0x77, 0x96, 0xfc);

DECLARE_TR_CTX(power_tr, SOF_UUID(power_uuid), LOG_LEVEL_INFO);

#if defined(CONFIG_PM_POLICY_CUSTOM)
const struct pm_state_info *pm_policy_next_state(uint8_t cpu, int32_t ticks)
{
unsigned int num_cpu_states;
const struct pm_state_info *cpu_states;

num_cpu_states = pm_state_cpu_get_all(cpu, &cpu_states);

for (int i = num_cpu_states - 1; i >= 0; i--) {
const struct pm_state_info *state = &cpu_states[i];
uint32_t min_residency, exit_latency;

/* policy cannot lead to D3 */
if (state->state == PM_STATE_SOFT_OFF)
continue;

/* check if there is a lock on state + substate */
if (pm_policy_state_lock_is_active(state->state, state->substate_id))
continue;

if (state->state == PM_STATE_RUNTIME_IDLE) {
/* No D0i3 when secondary cores are active! */
if (cpu_enabled_cores() & ~BIT(PLATFORM_PRIMARY_CORE_ID))
continue;
}

min_residency = k_us_to_ticks_ceil32(state->min_residency_us);
exit_latency = k_us_to_ticks_ceil32(state->exit_latency_us);

if (ticks == K_TICKS_FOREVER ||
(ticks >= (min_residency + exit_latency))) {
/* TODO: PM_STATE_RUNTIME_IDLE requires substates to be defined
* to handle case with enabled PG andf disabled CG.
*/
return state;
}
}

return NULL;
}
#endif /* CONFIG_PM_POLICY_CUSTOM */

void platform_pm_runtime_enable(uint32_t context, uint32_t index)
{
switch (context) {
case PM_RUNTIME_DSP:
pm_policy_state_lock_put(PM_STATE_RUNTIME_IDLE, PM_ALL_SUBSTATES);
break;
default:
break;
}
}

void platform_pm_runtime_disable(uint32_t context, uint32_t index)
{
switch (context) {
case PM_RUNTIME_DSP:
pm_policy_state_lock_get(PM_STATE_RUNTIME_IDLE, PM_ALL_SUBSTATES);
/* Disable power gating when preventing */
DFDSPBRCP.bootctl[PLATFORM_PRIMARY_CORE_ID].bctl |=
DFDSPBRCP_BCTL_WAITIPCG | DFDSPBRCP_BCTL_WAITIPPG;
break;
default:
break;
}
}

void platform_pm_runtime_init(struct pm_runtime_data *prd)
{ }

Expand Down
6 changes: 5 additions & 1 deletion zephyr/wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
/* Zephyr includes */
#include <zephyr/device.h>
#include <zephyr/kernel.h>
#include <zephyr/pm/policy.h>
#include <version.h>
#include <zephyr/sys/__assert.h>
#include <soc.h>
Expand Down Expand Up @@ -624,7 +625,10 @@ int task_main_start(struct sof *sof)
* (only called from single core, no RMW lock)
*/
__ASSERT_NO_MSG(cpu_get_id() == PLATFORM_PRIMARY_CORE_ID);

#if defined(CONFIG_PM)
pm_policy_state_lock_get(PM_STATE_RUNTIME_IDLE, PM_ALL_SUBSTATES);
pm_policy_state_lock_get(PM_STATE_SOFT_OFF, PM_ALL_SUBSTATES);
#endif
/* let host know DSP boot is complete */
ret = platform_boot_complete(0);

Expand Down