Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: SOF: ipc4-topology: Account for different ChainDMA host buffer size 

For ChainDMA the firmware allocates 5ms host buffer instead of the standard
4ms which should be taken into account when setting the constraint on the
buffer size.

Fixes: 842bb8b62c ("ASoC: SOF: ipc4-topology: Save the DMA maximum burst size for PCMs")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20251002135752.2430-3-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2025-10-02 16:57:51 +03:00 committed by Mark Brown
parent a7fe5ff832
commit 3dcf683bf1
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/sof/ipc4-topology.c
View File

@ -666,8 +666,13 @@ static int sof_ipc4_widget_setup_pcm(struct snd_sof_widget *swidget)
swidget->tuples, swidget->tuples,
swidget->num_tuples, sizeof(u32), 1); swidget->num_tuples, sizeof(u32), 1);
/* Set default DMA buffer size if it is not specified in topology */ /* Set default DMA buffer size if it is not specified in topology */
if (!sps->dsp_max_burst_size_in_ms) if (!sps->dsp_max_burst_size_in_ms) {
sps->dsp_max_burst_size_in_ms = SOF_IPC4_MIN_DMA_BUFFER_SIZE; struct snd_sof_widget *pipe_widget = swidget->spipe->pipe_widget;
struct sof_ipc4_pipeline *pipeline = pipe_widget->private;
sps->dsp_max_burst_size_in_ms = pipeline->use_chain_dma ?
SOF_IPC4_CHAIN_DMA_BUFFER_SIZE : SOF_IPC4_MIN_DMA_BUFFER_SIZE;
}
} else { } else {
/* Capture data is copied from DSP to host in 1ms bursts */ /* Capture data is copied from DSP to host in 1ms bursts */
spcm->stream[dir].dsp_max_burst_size_in_ms = 1; spcm->stream[dir].dsp_max_burst_size_in_ms = 1;

3
sound/soc/sof/ipc4-topology.h
View File

@ -73,6 +73,9 @@
/* FW requires minimum 4ms DMA buffer size */ /* FW requires minimum 4ms DMA buffer size */
#define SOF_IPC4_MIN_DMA_BUFFER_SIZE 4 #define SOF_IPC4_MIN_DMA_BUFFER_SIZE 4
/* ChainDMA in fw uses 5ms DMA buffer */
#define SOF_IPC4_CHAIN_DMA_BUFFER_SIZE 5
/* /*
* The base of multi-gateways. Multi-gateways addressing starts from * The base of multi-gateways. Multi-gateways addressing starts from
* ALH_MULTI_GTW_BASE and there are ALH_MULTI_GTW_COUNT multi-sources * ALH_MULTI_GTW_BASE and there are ALH_MULTI_GTW_COUNT multi-sources