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: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220712120936.28072-2-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
index 2afaee91b982a976bfdeebac7bd13e7d0891e765..eddfd77ad90f4e2250fc12e7cc8ad9603c308c46 100644 (file)
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@ -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 */

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 819b3b08c6557efce94dc649840f5fc84c0e1b9c..eb22eb3f6fee17fc38f53f77e8e1383a22fd2fcf 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -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:
        /*

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index dc713c20ba1d9ea9a3bbe9c2d490467972421b5b..2b4d23af6054e840faa056e9dd77c68fa357d23b 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -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;