ASoC: SOF: Intel: tgl: unify core_put on IPC3 & IPC4 path

Firmware may do context saving before powering off primary core, so driver
needs to send ipc msg by set_core_state. In IPC4 path, firmware needs to
save current context to IMR before powering off primary core. Firmware
does nothing for set_core_state message in IPC3 path. So IPC4 and IPC3
can share the same operation sequence.

Signed-off-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@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/20230523103217.20412-4-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index 2713b7dc793124ccae5c95d8bb9540ae9b901804..8e2b07e1612b7693422ac9a87bc6fbc796ce2f85 100644 (file)
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -39,14 +39,18 @@ static int tgl_dsp_core_get(struct snd_sof_dev *sdev, int core)
 static int tgl_dsp_core_put(struct snd_sof_dev *sdev, int core)
 {
        const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm;
+       int ret;
+
+       if (pm_ops->set_core_state) {
+               ret = pm_ops->set_core_state(sdev, core, false);
+               if (ret < 0)
+                       return ret;
+       }
 
        /* power down primary core and return */
        if (core == SOF_DSP_PRIMARY_CORE)
                return hda_dsp_core_reset_power_down(sdev, BIT(core));
 
-       if (pm_ops->set_core_state)
-               return pm_ops->set_core_state(sdev, core, false);
-
        return 0;
 }