Unverified Commit a0659f81 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-topology: add DMA config TLV to IPC data 



This patch adds a DMA config TLV structure and the relevant code to
copy this TLV after the gateway configuration. For now this is an
iso-functionality change, the TLVs are not configured just
yet. Additional patches will be needed for DMIC/SSP/ALH (aka
SoundWire).

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230602205620.310879-8-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 116bc150

sound/soc/sof/ipc4-topology.c

+31 −3
Original line number Diff line number Diff line
@@ -1383,6 +1383,8 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, 
	struct snd_sof_dai *dai;

	struct snd_mask *fmt;

	int out_sample_valid_bits;

	u32 gtw_cfg_config_length;

	u32 dma_config_tlv_size = 0;

	void **ipc_config_data;

	int *ipc_config_size;

	u32 **data;
@@ -1699,7 +1701,27 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, 
	ipc_config_data = &ipc4_copier->ipc_config_data;



	/* config_length is DWORD based */

	ipc_size = sizeof(*copier_data) + 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;



	if (ipc4_copier->dma_config_tlv.type == SOF_IPC4_GTW_DMA_CONFIG_ID &&

	    ipc4_copier->dma_config_tlv.length) {

		dma_config_tlv_size = sizeof(ipc4_copier->dma_config_tlv) +

			ipc4_copier->dma_config_tlv.dma_config.dma_priv_config_size;



		/* paranoia check on TLV size/length */

		if (dma_config_tlv_size != ipc4_copier->dma_config_tlv.length +

		    sizeof(uint32_t) * 2) {

			dev_err(sdev->dev, "Invalid configuration, TLV size %d length %d\n",

				dma_config_tlv_size, ipc4_copier->dma_config_tlv.length);

			return -EINVAL;

		}



		ipc_size += dma_config_tlv_size;



		/* we also need to increase the size at the gtw level */

		copier_data->gtw_cfg.config_length += dma_config_tlv_size / 4;

	}



	dev_dbg(sdev->dev, "copier %s, IPC size is %d", swidget->widget->name, ipc_size);
@@ -1711,9 +1733,15 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, 


	/* copy IPC data */

	memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data));

	if (copier_data->gtw_cfg.config_length)

	if (gtw_cfg_config_length)

		memcpy(*ipc_config_data + sizeof(*copier_data),

		       *data, copier_data->gtw_cfg.config_length * 4);

		       *data, gtw_cfg_config_length);



	/* add DMA Config TLV, if configured */

	if (dma_config_tlv_size)

		memcpy(*ipc_config_data + sizeof(*copier_data) +

		       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);

sound/soc/sof/ipc4-topology.h

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ struct sof_ipc4_alh_configuration_blob { 
 * @gtw_attr: Gateway attributes for copier blob

 * @dai_type: DAI type

 * @dai_index: DAI index

 * @dma_config_tlv: DMA configuration

 */

struct sof_ipc4_copier {

	struct sof_ipc4_copier_data data;
@@ -312,6 +313,7 @@ struct sof_ipc4_copier { 
	struct sof_ipc4_gtw_attributes *gtw_attr;

	u32 dai_type;

	int dai_index;

	struct sof_ipc4_dma_config_tlv dma_config_tlv;

};



/**