diff options
| author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2022-12-20 14:56:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-12-21 12:11:49 +0000 |
| commit | 6f95eec6fb89e195dbdf30de65553c7fc57d9372 (patch) | |
| tree | b84b723c32d6f37905f89fbc4b75784cdc945a9e /sound/soc/sof/pm.c | |
| parent | a12a383e59ce486abd719b6bda33c353a3b385e7 (diff) | |
| download | linux-stable-6f95eec6fb89e195dbdf30de65553c7fc57d9372.tar.gz linux-stable-6f95eec6fb89e195dbdf30de65553c7fc57d9372.tar.bz2 linux-stable-6f95eec6fb89e195dbdf30de65553c7fc57d9372.zip | |
ASoC: SOF: pm: Set target state earlier
If the DSP crashes before the system suspends, the setting of target state
will be skipped because the firmware state will no longer be
SOF_FW_BOOT_COMPLETE. This leads to the incorrect assumption that the
DSP should suspend to D0I3 instead of suspending to D3. To fix this,
set the target_state before we skip to DSP suspend even when the DSP has
crashed.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Curtis Malainey <cujomalainey@chromium.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20221220125629.8469-2-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/pm.c')
| -rw-r--r-- | sound/soc/sof/pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c index df740be645e8..5f88c4a01fa3 100644 --- a/sound/soc/sof/pm.c +++ b/sound/soc/sof/pm.c @@ -182,7 +182,7 @@ static int sof_suspend(struct device *dev, bool runtime_suspend) const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm; const struct sof_ipc_tplg_ops *tplg_ops = sdev->ipc->ops->tplg; pm_message_t pm_state; - u32 target_state = 0; + u32 target_state = snd_sof_dsp_power_target(sdev); int ret; /* do nothing if dsp suspend callback is not set */ @@ -206,7 +206,6 @@ static int sof_suspend(struct device *dev, bool runtime_suspend) } } - target_state = snd_sof_dsp_power_target(sdev); pm_state.event = target_state; /* Skip to platform-specific suspend if DSP is entering D0 */ |