Skip to content

ASoC: SOF: ipc4-topology: Refresh copier IPC payload before widget setup #5762

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

Open
ujfalusi wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
Open

ASoC: SOF: ipc4-topology: Refresh copier IPC payload before widget setup #5762

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 33 additions & 0 deletions sound/soc/sof/ipc4-topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3186,6 +3186,15 @@ static int sof_ipc4_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget
ipc_size = ipc4_copier->ipc_config_size;
ipc_data = ipc4_copier->ipc_config_data;

/*
* Refresh copier_data in ipc_config_data for host copiers.
* The node_id may have been updated by host_config after
* ipc_prepare, e.g. when host stream tags change after a
* suspend/resume cycle.
*/
if (swidget->id != snd_soc_dapm_buffer)
Copy link
Copy Markdown
Collaborator Author

@ujfalusi ujfalusi May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The section is small, people expected to be able to have wider attention spam than few lines.

memcpy(ipc_data, &ipc4_copier->data, sizeof(ipc4_copier->data));

msg = &ipc4_copier->msg;
break;
}
Expand All @@ -3194,6 +3203,9 @@ static int sof_ipc4_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget
{
struct snd_sof_dai *dai = swidget->private;
struct sof_ipc4_copier *ipc4_copier = dai->private;
struct sof_ipc4_copier_data *copier_data;
u32 gtw_cfg_config_length;
u32 tlv_size;

pipeline = pipe_widget->private;
if (pipeline->use_chain_dma)
Expand All @@ -3202,6 +3214,27 @@ static int sof_ipc4_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget
ipc_size = ipc4_copier->ipc_config_size;
ipc_data = ipc4_copier->ipc_config_data;

/*
* Refresh copier_data and dma_config_tlv in ipc_config_data.
* These may have been updated after ipc_prepare, e.g. when
* link DMA stream tags change after a suspend/resume cycle.
*
* copier_data->gtw_cfg.config_length does not include the
* TLV size (it was restored after _sof_ipc4_prepare_copier_module),
* so temporarily inflate it to match the ipc_config_data layout.
*/
copier_data = &ipc4_copier->data;
gtw_cfg_config_length = copier_data->gtw_cfg.config_length * 4;
tlv_size = ipc_size - sizeof(*copier_data) - gtw_cfg_config_length;

copier_data->gtw_cfg.config_length += tlv_size / 4;
memcpy(ipc_data, copier_data, sizeof(*copier_data));
copier_data->gtw_cfg.config_length = gtw_cfg_config_length / 4;

Comment on lines +3226 to +3233
Copy link
Copy Markdown
Collaborator Author

@ujfalusi ujfalusi May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is needed to be done like this, see how this is done in sof_ipc4_prepare_copier_module

if (tlv_size)
memcpy(ipc_data + sizeof(*copier_data) + gtw_cfg_config_length,
&ipc4_copier->dma_config_tlv, tlv_size);
Comment on lines +3227 to +3236
Copy link
Copy Markdown
Collaborator Author

@ujfalusi ujfalusi May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ipc_size is ipc4_copier->ipc_config_size, which has been correctly set during prepare and it is guarantied to never underflow.


msg = &ipc4_copier->msg;
break;
}
Expand Down
Loading