Skip to content

Commit

Permalink
kcps: fix 0 module CPC case
Browse files Browse the repository at this point in the history
If a module contains 0 as its CPC value, the consumption calculation
routine will assign a "safe" maximum value to keep the DSP running at
the maximum clock rate. This works when constructing a pipeline, but
when a pipeline is torn down, returning the maximum clock rate leads
to the clock being reduced to a small value. Fix this by detecting
such cases in pipeline termination code.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
  • Loading branch information
lyakh committed Jul 11, 2024
1 parent c478037 commit 7396c50
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
13 changes: 13 additions & 0 deletions src/audio/pipeline/pipeline-stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,18 @@ static int pipeline_calc_cps_consumption(struct comp_dev *current,

if (cd->cpc == 0) {
/* Use maximum clock budget, assume 1ms chunk size */
if (!ppl_data->kcps_acc[comp_core])
ppl_data->kcps_acc[comp_core] = ppl_data->kcps[comp_core];
ppl_data->kcps[comp_core] = CLK_MAX_CPU_HZ / 1000;
tr_warn(pipe,
"0 CPS requested for module: %#x, core: %d using safe max KCPS: %u",
current->ipc_config.id, comp_core, ppl_data->kcps[comp_core]);

/*
* This return code indicates to the caller, that the kcps calue
* shouldn't be used for slowing down the clock when terminating
* the pipeline
*/
return PPL_STATUS_PATH_STOP;
} else {
kcps = cd->cpc * 1000 / current->period;
Expand Down Expand Up @@ -430,6 +437,12 @@ int pipeline_trigger(struct pipeline *p, struct comp_dev *host, int cmd)
ret = walk_ctx.comp_func(p->source_comp, NULL, &walk_ctx, PPL_DIR_DOWNSTREAM);

for (int i = 0; i < arch_num_cpus(); i++) {
if (ret == PPL_STATUS_PATH_STOP) {
/* Restore the value before maximization */
data.kcps[i] -= data.kcps_acc[i];
data.kcps_acc[i] = 0;
}

if (data.kcps[i] > 0) {
core_kcps_adjust(i, -data.kcps[i]);
tr_info(pipe, "Sum of KCPS consumption: %d, core: %d", core_kcps_get(i), i);
Expand Down
1 change: 1 addition & 0 deletions src/include/sof/audio/pipeline.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ struct pipeline_data {
uint32_t delay_ms; /* between PRE_{START,RELEASE} and {START,RELEASE} */
#if CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL
uint32_t kcps[CONFIG_CORE_COUNT]; /**< the max count of KCPS */
uint32_t kcps_acc[CONFIG_CORE_COUNT]; /**< accumulated KCPS before maximization */
#endif
};

Expand Down

0 comments on commit 7396c50

Please sign in to comment.