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

ASoC: SOF: Intel: hda-stream: test DMA buffer first in hw_params 



We should be consistent and always test that the DMA buffer is
allocated before continuing with the hw_params setup.

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 avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220715145216.277003-12-pierre-louis.bossart@linux.intel.com


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

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

+10 −5
Original line number Diff line number Diff line
@@ -411,6 +411,11 @@ int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, struct hdac_ext_st 
		return -ENODEV;

	}



	if (!dmab) {

		dev_err(sdev->dev, "error: no dma buffer allocated!\n");

		return -ENODEV;

	}



	if (hstream->posbuf)

		*hstream->posbuf = 0;
@@ -485,16 +490,16 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, 
		return -ENODEV;

	}



	/* decouple host and link DMA */

	mask = 0x1 << hstream->index;

	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

				mask, mask);



	if (!dmab) {

		dev_err(sdev->dev, "error: no dma buffer allocated!\n");

		return -ENODEV;

	}



	/* decouple host and link DMA */

	mask = 0x1 << hstream->index;

	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

				mask, mask);



	/* clear stream status */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, sd_offset,

				SOF_HDA_CL_DMA_SD_INT_MASK |