Unverified Commit 3a39e0ea authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: clear stream status and wakests properly 



Stream status and WAKESTS registers need to be cleared by writing
to them with snd_sof_dsp_write(). snd_sof_dsp_update_bits() only
writes if the value is changed and will result in not clearing
the status.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9a50ee58

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

+10 −16
Original line number Diff line number Diff line
@@ -217,16 +217,13 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset) 
	/* clear stream status */

	list_for_each_entry(stream, &bus->stream_list, list) {

		sd_offset = SOF_STREAM_SD_OFFSET(stream);

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

					sd_offset +

					SOF_HDA_ADSP_REG_CL_SD_STS,

					SOF_HDA_CL_DMA_SD_INT_MASK,

		snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR,

				  sd_offset + SOF_HDA_ADSP_REG_CL_SD_STS,

				  SOF_HDA_CL_DMA_SD_INT_MASK);

	}



	/* clear WAKESTS */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_WAKESTS,

				SOF_HDA_WAKESTS_INT_MASK,

	snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR, SOF_HDA_WAKESTS,

			  SOF_HDA_WAKESTS_INT_MASK);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
@@ -295,16 +292,13 @@ void hda_dsp_ctrl_stop_chip(struct snd_sof_dev *sdev) 
	/* clear stream status */

	list_for_each_entry(stream, &bus->stream_list, list) {

		sd_offset = SOF_STREAM_SD_OFFSET(stream);

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

					sd_offset +

					SOF_HDA_ADSP_REG_CL_SD_STS,

					SOF_HDA_CL_DMA_SD_INT_MASK,

		snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR,

				  sd_offset + SOF_HDA_ADSP_REG_CL_SD_STS,

				  SOF_HDA_CL_DMA_SD_INT_MASK);

	}



	/* clear WAKESTS */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_WAKESTS,

				SOF_HDA_WAKESTS_INT_MASK,

	snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR, SOF_HDA_WAKESTS,

			  SOF_HDA_WAKESTS_INT_MASK);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

CRA Git | Maintained and supported by SUSTech CRA and CCSE