Unverified Commit 57724db1 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: Introduce skip_imr_boot flag 



Use a dedicated flag instead of directly checking the
sdev->system_suspend_target to decide if we need to skip IMR boot due to
too deep sleep state where the memory used for IMR booting will not retain
its content.

The skip_imr_boot flag will be set true during suspend if the target state
is deeper than S3 and reset back to false on successful boot to re-enable
IMR booting in shallower sleep states.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220712120936.28072-2-peter.ujfalusi@linux.intel.com


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

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

+7 −0
Original line number Diff line number Diff line
@@ -617,6 +617,13 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) 
#endif

	int ret, j;



	/*

	 * The memory used for IMR boot loses its content in deeper than S3 state

	 * We must not try IMR boot on next power up (as it will fail).

	 */

	if (sdev->system_suspend_target > SOF_SUSPEND_S3)

		hda->skip_imr_boot = true;



	hda_sdw_int_enable(sdev, false);



	/* disable IPC interrupts */

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

+6 −4
Original line number Diff line number Diff line
@@ -395,8 +395,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
	struct snd_dma_buffer dmab;

	int ret, ret1, i;



	if (sdev->system_suspend_target < SOF_SUSPEND_S4 &&

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

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

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

		hda->boot_iteration = 0;

		ret = hda_dsp_boot_imr(sdev);
@@ -480,11 +479,14 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
	 */

	hda->boot_iteration = HDA_FW_BOOT_ATTEMPTS;

	ret = hda_cl_copy_fw(sdev, hext_stream);

	if (!ret)

	if (!ret) {

		dev_dbg(sdev->dev, "Firmware download successful, booting...\n");

	else

		hda->skip_imr_boot = false;

	} else {

		snd_sof_dsp_dbg_dump(sdev, "Firmware download failed",

				     SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX);

		hda->skip_imr_boot = true;

	}



cleanup:

	/*

sound/soc/sof/intel/hda.h

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ enum sof_hda_D0_substate { 
/* represents DSP HDA controller frontend - i.e. host facing control */

struct sof_intel_hda_dev {

	bool imrboot_supported;

	bool skip_imr_boot;



	int boot_iteration;