Skip to contentSkip to conversation

ASoC: SOF: ipc4-topology: Update the basecfg for copier earlier

PATCH Superseded Peter Ujfalusi 2 participants 5 messages Aug 9, 2023 – Aug 10, 2023

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Peter Ujfalusi

author maintainer
#0 lore raw

PATCH 1/1 ASoC: SOF: ipc4-topology: Update the basecfg for copier earlier

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 d8a2c9879349 ("ASoC: SOF: ipc4-loader/topology: Query the CPC value from manifest")
---
 sound/soc/sof/ipc4-topology.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/sof/ipc4-topology.c +3 -3
index 0196cbfc0998..633f6040d712 100644
@@ -1731,6 +1731,9 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
 
 	*ipc_config_size = ipc_size;
 
+	/* update pipeline memory usage */
+	sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config);
+
 	/* copy IPC data */
 	memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data));
 	if (gtw_cfg_config_length)
@@ -1743,9 +1746,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);
-
 	/*
 	 * Restore gateway config length now that IPC payload is prepared. This avoids
 	 * counting the DMA CONFIG TLV multiple times
Signature · 1 line
2.41.0
maintainer
#1 lore raw
Quoted 5 lines · Peter Ujfalusi

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.

This doesn't apply against my for-6.5 branch, please check and resend.

author maintainer
#2 lore raw
Quoted 8 lines · Mark Brown
Quoted 5 lines · Peter Ujfalusi

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.

This doesn't apply against my for-6.5 branch, please check and resend.

It is generated on top of your -next branch.

I believe it is failing because the for-6.5 does not have this patch:
ef8a29bae82f ("ASoC: SOF: ipc4-topology: restore gateway config length")

Basing this patch for 6.5 will cause conflict with the 6.6 material

0659f81c348 ("ASoC: SOF: ipc4-topology: add DMA config TLV to IPC data") and it's fix:
ef8a29bae82f ("ASoC: SOF: ipc4-topology: restore gateway config length")

If that's OK, then I can re-create the patch or I can send w/o the Fixes tag to be on top of your -next

Signature · 1 line
Péter
maintainer
#3 lore raw
Quoted 2 lines · Péter Ujfalusi

If that's OK, then I can re-create the patch or I can send w/o the Fixes tag to be on top of your -next

Well, is it a fix or isn't it? If it's a fix we should send it for v6.5.

maintainer
#4 lore raw
In reply to Peter Ujfalusi
Quoted 8 lines · Peter Ujfalusi

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.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: ipc4-topology: Update the basecfg for copier earlier

      commit: e6475ce253187d2e68867102fddd57341ebbf8eb

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark