ASoC: SOF: Set SOF_FW_BOOT_FAILED in case we have failure during boot

Change the fw_state to SOF_FW_BOOT_FAILED if we encountered an error during
booting the firmware.

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-13-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 00f8ffee2866b7fa37448728c7093398d5f8f3c9..aa7a721f34e4a67b887e09b3175ad6779b3a0721 100644 (file)
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -202,6 +202,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
        if (ret < 0) {
                dev_err(sdev->dev, "error: failed to load DSP firmware %d\n",
                        ret);
+               sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
                goto fw_load_err;
        }
 
@@ -215,6 +216,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
        if (ret < 0) {
                dev_err(sdev->dev, "error: failed to boot DSP firmware %d\n",
                        ret);
+               sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
                goto fw_run_err;
        }
 

diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
index f81f2473279965b5831db27fbbbd7c595823cb40..697f03565a70daa8cadcc8f66841a23e5c298a0b 100644 (file)
--- a/sound/soc/sof/loader.c
+++ b/sound/soc/sof/loader.c
@@ -838,7 +838,6 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
                snd_sof_dsp_dbg_dump(sdev, "Firmware boot failure due to timeout",
                                     SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX |
                                     SOF_DBG_DUMP_TEXT | SOF_DBG_DUMP_PCI);
-               sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
                return -EIO;
        }
 

diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index f22b5ee2347868b2d2bb2bffbba8c4b6fcc4cb51..022b19669735134db1549b4a2743f27b97460508 100644 (file)
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -130,6 +130,7 @@ static int sof_resume(struct device *dev, bool runtime_resume)
                dev_err(sdev->dev,
                        "error: failed to load DSP firmware after resume %d\n",
                        ret);
+               sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
                return ret;
        }
 
@@ -144,6 +145,7 @@ static int sof_resume(struct device *dev, bool runtime_resume)
                dev_err(sdev->dev,
                        "error: failed to boot DSP firmware after resume %d\n",
                        ret);
+               sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
                return ret;
        }