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>

diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
index a448be60f6ddf14330ab121b5c5d6ce701af2e8c..2b5e2b8c69c28f1855ca4e7144f7a50062509da3 100644 (file)
--- a/sound/soc/sof/intel/hda-dai.c
+++ b/sound/soc/sof/intel/hda-dai.c
@@ -210,9 +210,13 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream,
        int stream_tag;
        int ret;
 
-       link_dev = hda_link_stream_assign(bus, substream);
-       if (!link_dev)
-               return -EBUSY;
+       /* 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);
+               if (!link_dev)
+                       return -EBUSY;
+       }
 
        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_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.
                 */
                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;
                stream_tag = hdac_stream(link_dev)->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;
 
                /* fallthrough */
@@ -369,6 +371,7 @@ static int hda_link_hw_free(struct snd_pcm_substream *substream,
 
        stream_tag = hdac_stream(link_dev)->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);
        link_dev->link_prepared = 0;
 

diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
index e82ecaad1763e95dd578f89b9f6e5952e4fd2a09..e38008194574ec365b8b6cb2d14c2f2ae54c65d9 100644 (file)
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@ -439,10 +439,10 @@ int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev)
                stream = stream_to_hdac_ext_stream(s);
 
                /*
-                * clear and release stream. This should already be taken care
-                * for running streams when the SUSPEND trigger is called.
-                * But paused streams do not get suspended, so this needs to be
-                * done explicitly during suspend.
+                * clear stream. This should already be taken care for running
+                * streams when the SUSPEND trigger is called. But paused
+                * streams do not get suspended, so this needs to be done
+                * explicitly during suspend.
                 */
                if (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;
                        stream_tag = hdac_stream(stream)->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;
                }
        }