summaryrefslogtreecommitdiffstats
path: root/sound/soc/sof
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>2021-12-23 12:36:21 +0100
committerMark Brown <broonie@kernel.org>2021-12-23 14:38:22 +0100
commitb54b3a4e08bc0210768a1839af2ff888376cae4c (patch)
tree84c86e40fe19f678aa6e924cbb8e805945612589 /sound/soc/sof
parentASoC: SOF: Set SOF_FW_BOOT_FAILED in case we have failure during boot (diff)
downloadlinux-b54b3a4e08bc0210768a1839af2ff888376cae4c.tar.xz
linux-b54b3a4e08bc0210768a1839af2ff888376cae4c.zip
ASoC: SOF: pm: Force DSP off on suspend in BOOT_FAILED state also
Try to force the DSP to be turned off next time if the fw_state is either CRASHED or BOOT_FAILED when a suspend happens in order to attempt a clean boot to recover. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://lore.kernel.org/r/20211223113628.18582-14-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof')
-rw-r--r--sound/soc/sof/pm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index 022b19669735..197a88695fef 100644
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -315,10 +315,11 @@ int snd_sof_prepare(struct device *dev)
sdev->system_suspend_target = SOF_SUSPEND_S3;
/*
- * if the firmware is crashed then we try to aim for S3 to reboot the
- * firmware
+ * if the firmware is crashed or boot failed then we try to aim for S3
+ * to reboot the firmware
*/
- if (sdev->fw_state == SOF_FW_CRASHED)
+ if (sdev->fw_state == SOF_FW_CRASHED ||
+ sdev->fw_state == SOF_FW_BOOT_FAILED)
return 0;
if (!desc->use_acpi_target_states)