Unverified Commit 58ecb11e authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: disable IMR boot when resuming from ACPI S4 and S5 states 

The IMR was assumed to be preserved when suspending to S4 and S5
states, but community reports invalidate that assumption, the hardware
seems to be powered off and the IMR memory content cleared.

Make sure regular boot with firmware download is used for S4 and S5.

BugLink: https://github.com/thesofproject/sof/issues/5892


Fixes: 5fb5f511 ("ASoC: SOF: Intel: hda-loader: add IMR restore support")
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220616201818.130802-4-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/intel/hda-loader.c

+2 −1
Original line number Diff line number Diff line
@@ -389,7 +389,8 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
	struct snd_dma_buffer dmab;

	int ret, ret1, i;



	if (hda->imrboot_supported && !sdev->first_boot) {

	if (sdev->system_suspend_target < SOF_SUSPEND_S4 &&

	    hda->imrboot_supported && !sdev->first_boot) {

		dev_dbg(sdev->dev, "IMR restore supported, booting from IMR directly\n");

		hda->boot_iteration = 0;

		ret = hda_dsp_boot_imr(sdev);