Unverified Commit 04ea642f authored May 24, 2019 by Libin Yang Committed by Mark Brown May 28, 2019

ASoC: SOF: pcm: clear hw_params_upon_resume flag correctly



sof_pcm_hw_params() can only be called once to setup the FW hw_params.
So after calling sof_pcm_hw_params(), hw_params_upon_resume flag must
be cleared to avoid multiple invoking sof_pcm_hw_params() by prepare.

For example, after resume, there is an xrun happened, prepare() will
be called. As the hw_params_upon_resume flag is not cleared,
sof_pcm_hw_params() will be called and this will cause IPC timeout.

This patch fixes such issues.

Fixes: 868bd00f ("ASoC: SOF: Add PCM operations support")
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 0bce512e

sound/soc/sof/pcm.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -214,6 +214,9 @@ static int sof_pcm_hw_params(struct snd_pcm_substream *substream,
		INIT_WORK(&spcm->stream[substream->stream].period_elapsed_work,
		sof_pcm_period_elapsed_work);

		/* clear hw_params_upon_resume flag */
		spcm->hw_params_upon_resume[substream->stream] = 0;

		return ret;
		}

		@@ -429,9 +432,6 @@ static int sof_pcm_open(struct snd_pcm_substream *substream)
		dev_dbg(sdev->dev, "pcm: open stream %d dir %d\n", spcm->pcm.pcm_id,
		substream->stream);

		/* clear hw_params_upon_resume flag */
		spcm->hw_params_upon_resume[substream->stream] = 0;

		caps = &spcm->pcm.caps[substream->stream];

		ret = pm_runtime_get_sync(sdev->dev);

Admin message