From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Date: Wed, 22 Mar 2023 10:55:38 +0200

Subject: [PATCH] ASoC: SOF: ipc4: Ensure DSP is in D0I0 during

 sof_ipc4_set_get_data()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

References: bsc#1012628

Patch-mainline: 6.2.11

Git-commit: e51f49512d98783b90799c9cc2002895ec3aa0eb

[ Upstream commit e51f49512d98783b90799c9cc2002895ec3aa0eb ]

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: ceb89acc4dc8 ("ASoC: SOF: ipc4: Add support for mandatory message handling functionality")

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

Link: https://lore.kernel.org/r/20230322085538.10214-1-peter.ujfalusi@linux.intel.com

Signed-off-by: Mark Brown <broonie@kernel.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 sound/soc/sof/ipc4.c | 8 ++++++++

 1 file changed, 8 insertions(+)

diff --git a/sound/soc/sof/ipc4.c b/sound/soc/sof/ipc4.c

index 74cd7e95..280fc890 100644

--- a/sound/soc/sof/ipc4.c

+++ b/sound/soc/sof/ipc4.c

@@ -393,6 +393,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 }};

@@ -423,6 +426,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);

-- 

2.35.3