ASoC: SOF: ignore unrecoverable CTX_SAVE IPC errors at suspend

As part of the suspend flow, a context save IPC message is
sent to the firmware before powering down the DSP. If errors
are met, the suspend flow is aborted with current code.

Change the behaviour such that if firmware returns -EBUSY or
-EAGAIN, return the error codes to PM core as before. The device
is left in active state in this case.

If other errors are reported, print a warning but do not block the
suspend flow. As per interface specification, no valid error can be
returned in this scenario. If the hardware has hit a fatal error and
is not able to respond successfully, best recovery method is to
proceed with suspend and power off the DSP.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index 8ef1d51025d8bb0929644691a21421a94d126c95..b7843f02ef671ec9b9952c5da30caf582f9f8d7d 100644 (file)
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -343,11 +343,20 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
 #endif
        /* notify DSP of upcoming power down */
        ret = sof_send_pm_ipc(sdev, SOF_IPC_PM_CTX_SAVE);
-       if (ret < 0) {
+       if (ret == -EBUSY || ret == -EAGAIN) {
+               /*
+                * runtime PM has logic to handle -EBUSY/-EAGAIN so
+                * pass these errors up
+                */
                dev_err(sdev->dev,
                        "error: ctx_save ipc error during suspend %d\n",
                        ret);
                return ret;
+       } else if (ret < 0) {
+               /* FW in unexpected state, continue to power down */
+               dev_warn(sdev->dev,
+                        "ctx_save ipc error %d, proceeding with suspend\n",
+                        ret);
        }
 
        /* power down all DSP cores */