diff mbox series

ASoC: SOF: reset enabled_cores state at suspend

Message ID 20210528144330.2551-1-kai.vehmanen@linux.intel.com
State Accepted
Commit b640e8a4bd24e17ce24a064d704aba14831651a8
Headers show
Series ASoC: SOF: reset enabled_cores state at suspend | expand

Commit Message

Kai Vehmanen May 28, 2021, 2:43 p.m. UTC
The recent changes to use common code to power up/down DSP cores also
removed the reset of the core state at suspend. It turns out this is
still needed. When the firmware state is reset to
SOF_FW_BOOT_NOT_STARTED, also enabled_cores should be reset, and
existing DSP drivers depend on this.

BugLink: https://github.com/thesofproject/linux/issues/2824
Fixes: 42077f08b3 ("ASoC: SOF: update dsp core power status in common APIs")
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 sound/soc/sof/pm.c | 1 +
 1 file changed, 1 insertion(+)


base-commit: 058efb40641845432c52777443b3372dbc97c032

Comments

Mark Brown June 1, 2021, 5:38 p.m. UTC | #1
On Fri, 28 May 2021 17:43:30 +0300, Kai Vehmanen wrote:
> The recent changes to use common code to power up/down DSP cores also
> removed the reset of the core state at suspend. It turns out this is
> still needed. When the firmware state is reset to
> SOF_FW_BOOT_NOT_STARTED, also enabled_cores should be reset, and
> existing DSP drivers depend on this.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: reset enabled_cores state at suspend
      commit: b640e8a4bd24e17ce24a064d704aba14831651a8

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index fd265803f7bc..c83fb6255961 100644
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -256,6 +256,7 @@  static int sof_suspend(struct device *dev, bool runtime_suspend)
 
 	/* reset FW state */
 	sdev->fw_state = SOF_FW_BOOT_NOT_STARTED;
+	sdev->enabled_cores_mask = 0;
 
 	return ret;
 }