Unverified Commit 36c6cdc0 authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-loader: use small buffer for iccmax stream 



The data received via iccmax stream is not used anywhere, so no need to
allocate a big DMA buffer for it. This is especially important as the
allocation is done even in cases where reload of the firmware is skipped
and execution happens directly from the firmware stored in IMR.

Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20221107072621.28904-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/intel/hda-loader.c

+5 −10
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev) 
{

	struct hdac_ext_stream *iccmax_stream;

	struct hdac_bus *bus = sof_to_bus(sdev);

	struct firmware stripped_firmware;

	struct snd_dma_buffer dmab_bdl;

	int ret, ret1;

	u8 original_gb;
@@ -330,15 +329,11 @@ int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev) 
	/* save the original LTRP guardband value */

	original_gb = snd_hdac_chip_readb(bus, VS_LTRP) & HDA_VS_INTEL_LTRP_GB_MASK;



	if (sdev->basefw.fw->size <= sdev->basefw.payload_offset) {

		dev_err(sdev->dev, "error: firmware size must be greater than firmware offset\n");

		return -EINVAL;

	}



	stripped_firmware.size = sdev->basefw.fw->size - sdev->basefw.payload_offset;



	/* prepare capture stream for ICCMAX */

	iccmax_stream = hda_cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT, stripped_firmware.size,

	/*

	 * Prepare capture stream for ICCMAX. We do not need to store

	 * the data, so use a buffer of PAGE_SIZE for receiving.

	 */

	iccmax_stream = hda_cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT, PAGE_SIZE,

					      &dmab_bdl, SNDRV_PCM_STREAM_CAPTURE);

	if (IS_ERR(iccmax_stream)) {

		dev_err(sdev->dev, "error: dma prepare for ICCMAX stream failed\n");