Skip to contentSkip to conversation

ASoC: SOF: Intel: hda-dai: skip tlv configuration for DSPless mode

PATCH In review Peter Ujfalusi 2 participants 4 messages Jun 3, 2024 – Jun 4, 2024

Subsystems (3)
lore
Share & tools
lore

Peter Ujfalusi

author maintainer
#0 lore raw

cover ASoC: SOF: Intel: hda-dai: skip tlv configuration for DSPless mode

Hi,

Thesof_ipc4_dma_config_tlv() call makes no sense in case of DSPless mode since it is a configuration for the firmware.

Regards,
Peter
---
Bard Liao (2):
ASoC: SOF: Intel: hda-dai: skip tlv for dspless mode
ASoC: SOF: Intel: hda-dai: remove skip_tlv label

 sound/soc/sof/intel/hda-dai.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Signature · 1 line
2.45.1
author maintainer
#1 lore raw

PATCH 1/2 ASoC: SOF: Intel: hda-dai: skip tlv for dspless mode

From: Bard Liao <[email protected]>

sof_ipc4_dma_config_tlv{} is for Audio DSP firmware only. Don't set it in dspless mode.

Fixes 17386cb1b48b ("ASoC: SOF: Intel: hda-dai: set dma_stream_channel_map device")
---
 sound/soc/sof/intel/hda-dai.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/sof/intel/hda-dai.c +3 -0
index ce675c22a5ab..a2b6dbcfa918 100644
@@ -525,6 +525,9 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream,
 		return ret;
 	}
 
+	if (sdev->dspless_mode_selected)
+		return 0;
+
 	ipc4_copier = widget_to_copier(w);
 	dma_config_tlv = &ipc4_copier->dma_config_tlv[cpu_dai_id];
 	dma_config = &dma_config_tlv->dma_config;
Signature · 1 line
2.45.1
author maintainer
#2 lore raw

PATCH 2/2 ASoC: SOF: Intel: hda-dai: remove skip_tlv label

In reply to Peter Ujfalusi

From: Bard Liao <[email protected]>

We just return 0 after the skip_tlv label. No need to use a label.

---
 sound/soc/sof/intel/hda-dai.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/sof/intel/hda-dai.c +1 -2
index a2b6dbcfa918..c61d298ea6b3 100644
@@ -379,7 +379,7 @@ static int non_hda_dai_hw_params_data(struct snd_pcm_substream *substream,
 
 	sdev = widget_to_sdev(w);
 	if (sdev->dspless_mode_selected)
-		goto skip_tlv;
+		return 0;
 
 	/* get stream_id */
 	hext_stream = ops->get_hext_stream(sdev, cpu_dai, substream);
@@ -423,7 +423,6 @@ static int non_hda_dai_hw_params_data(struct snd_pcm_substream *substream,
 	dma_config->dma_stream_channel_map.device_count = 1;
 	dma_config->dma_priv_config_size = 0;
 
-skip_tlv:
 	return 0;
 }
 
Signature · 1 line
2.45.1
maintainer
#3 lore raw
In reply to Peter Ujfalusi
Quoted 6 lines · Peter Ujfalusi

Thesof_ipc4_dma_config_tlv() call makes no sense in case of DSPless mode since it is a configuration for the firmware.

Regards,
Peter

Applied to

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

Thanks!

[1/2] ASoC: SOF: Intel: hda-dai: skip tlv for dspless mode

      commit: e0e8e4bce61cac674fdabd85d070e7bab1634a8b
[2/2] ASoC: SOF: Intel: hda-dai: remove skip_tlv label
      commit: 3b06e137089fc0beb5ffa6a869de9a93df984072

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