ASoC: SOF: Intel: hda-loader: improve error handling

If a ROM timeout is detected, we still stop the DMA but will return
the initial error should the DMA stop also fail.

Likewise the cleanup is handled regardless of the status, but we
return the initial error.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191022192844.21022-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 65c2af3fcaab71ebc559d8e2a4a1b8e9b173b5d1..7956dbf5be8882527bd095d0fcbacfb16cd890b1 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -253,10 +253,16 @@ static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *stream)
                                        HDA_DSP_REG_POLL_INTERVAL_US,
                                        HDA_DSP_BASEFW_TIMEOUT_US);
 
+       /*
+        * even in case of errors we still need to stop the DMAs,
+        * but we return the initial error should the DMA stop also fail
+        */
+
        ret = cl_trigger(sdev, stream, SNDRV_PCM_TRIGGER_STOP);
        if (ret < 0) {
                dev_err(sdev->dev, "error: DMA trigger stop failed\n");
-               return ret;
+               if (!status)
+                       status = ret;
        }
 
        return status;
@@ -341,13 +347,15 @@ cleanup:
        /*
         * Perform codeloader stream cleanup.
         * This should be done even if firmware loading fails.
+        * If the cleanup also fails, we return the initial error
         */
        ret1 = cl_cleanup(sdev, &sdev->dmab, stream);
        if (ret1 < 0) {
                dev_err(sdev->dev, "error: Code loader DSP cleanup failed\n");
 
                /* set return value to indicate cleanup failure */
-               ret = ret1;
+               if (!ret)
+                       ret = ret1;
        }
 
        /*