UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: SOF: Intel: hda: fix link DMA config 

For this bug, there are two capture pcm streams active, with one
stream and its related stream tag released before suspend. Later
when system suspend is done, the stream tag for the remaining
active stream is released by SOF driver. After system resume, hda
codec driver restores the stream tag for the active pcm stream,
but SOF goes to assign a new one, which now doesn't match with the
stream tag used by codec driver, and this causes DMA to fail
receiving data, leading to unrecoverable XRUN condition in FW.

For stream tag is stored in both hda codec and SOF driver, it
shouldn't be released only in SOF driver. This patch just keeps the
stream information in dma data and checks whether there is a stored
DMA data for stream resuming from S3 and restores it. And it also
removes DMA data when the stream is released.

Tested on Whiskey Lake platform.

GitHub issue: https://github.com/thesofproject/sof/issues/1594
Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190722141402.7194-19-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Rander Wang 2019-07-22 09:13:59 -05:00 committed by Mark Brown
parent 7ccafa2b38
commit 934bf82203
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/sof/intel/hda-dai.c
View File

@ -210,9 +210,13 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream,
int stream_tag; int stream_tag;
int ret; int ret;
/* get stored dma data if resuming from system suspend */
link_dev = snd_soc_dai_get_dma_data(dai, substream);
if (!link_dev) {
link_dev = hda_link_stream_assign(bus, substream); link_dev = hda_link_stream_assign(bus, substream);
if (!link_dev) if (!link_dev)
return -EBUSY; return -EBUSY;
}
stream_tag = hdac_stream(link_dev)->stream_tag; stream_tag = hdac_stream(link_dev)->stream_tag;
@ -316,7 +320,7 @@ static int hda_link_pcm_trigger(struct snd_pcm_substream *substream,
case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_STOP:
/* /*
* clear and release link DMA channel. It will be assigned when * clear link DMA channel. It will be assigned when
* hw_params is set up again after resume. * hw_params is set up again after resume.
*/ */
ret = hda_link_config_ipc(hda_stream, dai->name, ret = hda_link_config_ipc(hda_stream, dai->name,
@ -325,8 +329,6 @@ static int hda_link_pcm_trigger(struct snd_pcm_substream *substream,
return ret; return ret;
stream_tag = hdac_stream(link_dev)->stream_tag; stream_tag = hdac_stream(link_dev)->stream_tag;
snd_hdac_ext_link_clear_stream_id(link, stream_tag); snd_hdac_ext_link_clear_stream_id(link, stream_tag);
snd_hdac_ext_stream_release(link_dev,
HDAC_EXT_STREAM_TYPE_LINK);
link_dev->link_prepared = 0; link_dev->link_prepared = 0;
/* fallthrough */ /* fallthrough */
@ -369,6 +371,7 @@ static int hda_link_hw_free(struct snd_pcm_substream *substream,
stream_tag = hdac_stream(link_dev)->stream_tag; stream_tag = hdac_stream(link_dev)->stream_tag;
snd_hdac_ext_link_clear_stream_id(link, stream_tag); snd_hdac_ext_link_clear_stream_id(link, stream_tag);
snd_soc_dai_set_dma_data(dai, substream, NULL);
snd_hdac_ext_stream_release(link_dev, HDAC_EXT_STREAM_TYPE_LINK); snd_hdac_ext_stream_release(link_dev, HDAC_EXT_STREAM_TYPE_LINK);
link_dev->link_prepared = 0; link_dev->link_prepared = 0;

10
sound/soc/sof/intel/hda-dsp.c
View File

@ -439,10 +439,10 @@ int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev)
stream = stream_to_hdac_ext_stream(s); stream = stream_to_hdac_ext_stream(s);
/* /*
* clear and release stream. This should already be taken care * clear stream. This should already be taken care for running
* for running streams when the SUSPEND trigger is called. * streams when the SUSPEND trigger is called. But paused
* But paused streams do not get suspended, so this needs to be * streams do not get suspended, so this needs to be done
* done explicitly during suspend. * explicitly during suspend.
*/ */
if (stream->link_substream) { if (stream->link_substream) {
rtd = snd_pcm_substream_chip(stream->link_substream); rtd = snd_pcm_substream_chip(stream->link_substream);
@ -452,8 +452,6 @@ int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev)
return -EINVAL; return -EINVAL;
stream_tag = hdac_stream(stream)->stream_tag; stream_tag = hdac_stream(stream)->stream_tag;
snd_hdac_ext_link_clear_stream_id(link, stream_tag); snd_hdac_ext_link_clear_stream_id(link, stream_tag);
snd_hdac_ext_stream_release(stream,
HDAC_EXT_STREAM_TYPE_LINK);
stream->link_prepared = 0; stream->link_prepared = 0;
} }
} }