ASoC: SOF: ipc4-topology: Update the basecfg for copier earlier #4508
Conversation
ujfalusi
requested review from
lgirdwood,
plbossart,
ranj063,
kv2019i,
dbaluta,
bardliao,
vijendarmukunda,
kuanhsuncheng and
yaochunhung
as code owners
The sof_ipc4_update_resource_usage() call updates the CPC value in basecfg and it must be done prior to making a copy of the copier configuration for the init message. Other module types do the resource update as last step or in case of a process module at the correct time, before the memcpy. Fixes: d8a2c98 ("ASoC: SOF: ipc4-loader/topology: Query the CPC value from manifest") Signed-off-by: Peter Ujfalusi <[email protected]>
| @@ -1766,9 +1769,6 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, | |||
| gtw_cfg_config_length, | |||
| &ipc4_copier->dma_config_tlv, dma_config_tlv_size); | |||
|
|
|||
| /* update pipeline memory usage */ | |||
| sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); | |||
|
|
|||
There was a problem hiding this comment.
is this saying that in practice the base firmware only received CPC values of zero so far?
Not fully clear on which bug this fixes, but it's Monday morning huh.
There was a problem hiding this comment.
This fixes fresh unreported issue where driver could send 0 CPC even if proper data found in manifest for copier.
There was a problem hiding this comment.
@plbossart, the firmware was receiving the previously found CPC value for the copier instance:
- We find X as a matching CPC but CPC of 0 is sent
- We find Y as a matching CPC but CPC of X is sent
- We did not find matching CPC (so it should be 0) but CPC of Y is sent
This is only affecting the copier because the sof_ipc4_update_pipeline_mem_usage() was after the memcpy and I only did a rename in patch 3f1e22f
In other places it was either before the memcpy or there were no memcpy at all.
|
This job is currently running, and may or may not finish successfully. (Approximately 2hr from now) |
|
SOFCI TEST |
|
SOFCI TEST |
The sof_ipc4_update_resource_usage() call updates the CPC value in basecfg and it must be done prior to making a copy of the copier configuration for the init message.
Other module types do the resource update as last step or in case of a process module at the correct time, before the memcpy.
Fixes: d8a2c98 ("ASoC: SOF: ipc4-loader/topology: Query the CPC value from manifest")