github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 04:34:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: SOF: make dma_config_tlv be an array

Browse Source 
Each stream needs a dma_config_tlv. We will handle multi dma_config_tlv
in the follow up commits.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240402151828.175002-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bard Liao 2024-04-02 10:18:15 -05:00 committed by Mark Brown
parent 1d0fb3d0c3
commit e9c6b118de
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/sof/intel/hda-dai.c
View File

@ -392,7 +392,7 @@ static int non_hda_dai_hw_params(struct snd_pcm_substream *substream,
/* configure TLV */ /* configure TLV */
ipc4_copier = widget_to_copier(w); ipc4_copier = widget_to_copier(w);
dma_config_tlv = &ipc4_copier->dma_config_tlv; dma_config_tlv = &ipc4_copier->dma_config_tlv[0];
dma_config_tlv->type = SOF_IPC4_GTW_DMA_CONFIG_ID; dma_config_tlv->type = SOF_IPC4_GTW_DMA_CONFIG_ID;
/* dma_config_priv_size is zero */ /* dma_config_priv_size is zero */
dma_config_tlv->length = sizeof(dma_config_tlv->dma_config); dma_config_tlv->length = sizeof(dma_config_tlv->dma_config);

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

@ -1454,6 +1454,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
u32 deep_buffer_dma_ms = 0; u32 deep_buffer_dma_ms = 0;
int output_fmt_index; int output_fmt_index;
bool single_output_format; bool single_output_format;
int i;
dev_dbg(sdev->dev, "copier %s, type %d", swidget->widget->name, swidget->id); dev_dbg(sdev->dev, "copier %s, type %d", swidget->widget->name, swidget->id);
@ -1679,7 +1680,6 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
u32 ch_map; u32 ch_map;
u32 step; u32 step;
u32 mask; u32 mask;
int i;
blob = (struct sof_ipc4_alh_configuration_blob *)ipc4_copier->copier_config; blob = (struct sof_ipc4_alh_configuration_blob *)ipc4_copier->copier_config;
@ -1789,19 +1789,18 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
gtw_cfg_config_length = copier_data->gtw_cfg.config_length * 4; gtw_cfg_config_length = copier_data->gtw_cfg.config_length * 4;
ipc_size = sizeof(*copier_data) + gtw_cfg_config_length; ipc_size = sizeof(*copier_data) + gtw_cfg_config_length;
if (ipc4_copier->dma_config_tlv.type == SOF_IPC4_GTW_DMA_CONFIG_ID && dma_config_tlv_size = 0;
ipc4_copier->dma_config_tlv.length) { for (i = 0; i < SOF_IPC4_DMA_DEVICE_MAX_COUNT; i++) {
dma_config_tlv_size = sizeof(ipc4_copier->dma_config_tlv) + if (ipc4_copier->dma_config_tlv[i].type != SOF_IPC4_GTW_DMA_CONFIG_ID)
ipc4_copier->dma_config_tlv.dma_config.dma_priv_config_size; continue;
dma_config_tlv_size += ipc4_copier->dma_config_tlv[i].length;
/* paranoia check on TLV size/length */ dma_config_tlv_size +=
if (dma_config_tlv_size != ipc4_copier->dma_config_tlv.length + ipc4_copier->dma_config_tlv[i].dma_config.dma_priv_config_size;
sizeof(uint32_t) * 2) { dma_config_tlv_size += (sizeof(ipc4_copier->dma_config_tlv[i]) -
dev_err(sdev->dev, "Invalid configuration, TLV size %d length %d\n", sizeof(ipc4_copier->dma_config_tlv[i].dma_config));
dma_config_tlv_size, ipc4_copier->dma_config_tlv.length); }
return -EINVAL;
}
if (dma_config_tlv_size) {
ipc_size += dma_config_tlv_size; ipc_size += dma_config_tlv_size;
/* we also need to increase the size at the gtw level */ /* we also need to increase the size at the gtw level */

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

@ -313,7 +313,7 @@ struct sof_ipc4_copier {
struct sof_ipc4_gtw_attributes *gtw_attr; struct sof_ipc4_gtw_attributes *gtw_attr;
u32 dai_type; u32 dai_type;
int dai_index; int dai_index;
struct sof_ipc4_dma_config_tlv dma_config_tlv; struct sof_ipc4_dma_config_tlv dma_config_tlv[SOF_IPC4_DMA_DEVICE_MAX_COUNT];
}; };
/** /**