Unverified Commit e51f4951 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: ipc4: Ensure DSP is in D0I0 during sof_ipc4_set_get_data() 



The set_get_data() IPC op bypasses the check for the no_pm flag as done
with the regular IPC tx_msg op. Since set_get_data should be performed
when the DSP is in D0I0, set the DSP power state to D0I0 before sending
the IPC's in sof_ipc4_set_get_data().

Fixes: ceb89acc ("ASoC: SOF: ipc4: Add support for mandatory message handling functionality")
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230322085538.10214-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 205efd46

sound/soc/sof/ipc4.c

+8 −0
Original line number Diff line number Diff line
@@ -405,6 +405,9 @@ static int sof_ipc4_tx_msg(struct snd_sof_dev *sdev, void *msg_data, size_t msg_ 
static int sof_ipc4_set_get_data(struct snd_sof_dev *sdev, void *data,

				 size_t payload_bytes, bool set)

{

	const struct sof_dsp_power_state target_state = {

			.state = SOF_DSP_PM_D0,

	};

	size_t payload_limit = sdev->ipc->max_payload_size;

	struct sof_ipc4_msg *ipc4_msg = data;

	struct sof_ipc4_msg tx = {{ 0 }};
@@ -435,6 +438,11 @@ static int sof_ipc4_set_get_data(struct snd_sof_dev *sdev, void *data, 


	tx.extension |= SOF_IPC4_MOD_EXT_MSG_FIRST_BLOCK(1);



	/* ensure the DSP is in D0i0 before sending IPC */

	ret = snd_sof_dsp_set_power_state(sdev, &target_state);

	if (ret < 0)

		return ret;



	/* Serialise IPC TX */

	mutex_lock(&sdev->ipc->tx_mutex);