Skip to content

[mtl-005] pipeline: Ignore CPC value and use always the safe maximum #8007

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

Closed
ujfalusi wants to merge 3 commits into from
Closed

[mtl-005] pipeline: Ignore CPC value and use always the safe maximum #8007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00a3287
audio: Kconfig: Add option to use constant CPC value
ujfalusi Aug 4, 2023
1d17657
pipeline: Handle CONFIG_OVERRIDE_CPC_AS_HZ_DIVIDED_BY for CPC value
ujfalusi Aug 4, 2023
6d3d7f4
[WORKAROUND] mtl: Use constant CPC value of MAX_CPU_HZ / 1000
ujfalusi Aug 4, 2023
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
3 changes: 2 additions & 1 deletion app/boards/intel_adsp_ace15_mtpm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,5 @@ CONFIG_HOST_DMA_RELOAD_DELAY_ENABLE=n
CONFIG_COMP_KPB=y
CONFIG_COMP_ARIA=y
CONFIG_CLOCK_CONTROL_ADSP=y
CONFIG_CLOCK_CONTROL=y
CONFIG_CLOCK_CONTROL=y
CONFIG_OVERRIDE_CPC_AS_HZ_DIVIDED_BY=1000
8 changes: 8 additions & 0 deletions src/audio/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ config COMP_BLOB
multiple IPC messages. Not all components or modules need
this. If unsure, say yes.

config OVERRIDE_CPC_AS_HZ_DIVIDED_BY
int "Ignore supplied CPC value and use MAX_CPU_HZ / DIVIDED_BY"
default 0
help
If OVERRIDE_CPC_AS_HZ_DIVIDED_BY is not 0, ignore the provided CPC
value and use CPC = CLK_MAX_CPU_HZ / OVERRIDE_CPC_AS_HZ_DIVIDED_BY
instead

config COMP_SRC
bool "SRC component"
default y
Expand Down
15 changes: 14 additions & 1 deletion src/audio/pipeline/pipeline-stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,20 @@ static int add_pipeline_cps_consumption(struct comp_dev *current,
cd = &md->cfg.base_cfg;
}

if (cd->cpc == 0) {
if (CONFIG_OVERRIDE_CPC_AS_HZ_DIVIDED_BY) {
uint32_t new_cpc = CLK_MAX_CPU_HZ / CONFIG_OVERRIDE_CPC_AS_HZ_DIVIDED_BY;

if (!cd->cpc)
tr_warn(pipe,
"CPC for module: %#x, core: %d: 0, overriding to %u",
current->ipc_config.id, ppl_data->p->core, new_cpc);
else
tr_info(pipe,
"CPC for module: %#x, core: %d: %u, overriding to %u",
current->ipc_config.id, ppl_data->p->core, cd->cpc, new_cpc);

cd->cpc = new_cpc;
} else if (cd->cpc == 0) {
/* Use maximum clock budget, assume 1ms chunk size */
cd->cpc = CLK_MAX_CPU_HZ / 1000;
tr_warn(pipe,
Expand Down