ASoC: SOF: Intel: hda: Skip IMR boot after a firmware crash or boot failure

To make sure that we start from a clean state next time when the DSP is
powered up after a firmware crash or boot failure we must skip the IMR
booting attempt.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220823124359.24865-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
index eddfd77..671c3e0 100644 (file)
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@ -620,8 +620,13 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend)
        /*
         * The memory used for IMR boot loses its content in deeper than S3 state
         * We must not try IMR boot on next power up (as it will fail).
+        *
+        * In case of firmware crash or boot failure set the skip_imr_boot to true
+        * as well in order to try to re-load the firmware to do a 'cold' boot.
         */
-       if (sdev->system_suspend_target > SOF_SUSPEND_S3)
+       if (sdev->system_suspend_target > SOF_SUSPEND_S3 ||
+           sdev->fw_state == SOF_FW_CRASHED ||
+           sdev->fw_state == SOF_FW_BOOT_FAILED)
                hda->skip_imr_boot = true;
 
        hda_sdw_int_enable(sdev, false);