mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 00:04:15 +08:00
ASoC: SOF: Intel: hda: Add flag to indicate that the firmware is IMR booted
Dynamic loading of external libraries should not be done if the firmware was booted from IMR since in that case the libraries will be restored along with the basefw. The booted_from_imr flag is introduced and set to true if the IMR boot was successful and to false if cold booting is executed. The reason for the new flag is that guessing from existing flags, used to decide if we should try booting from IMR or not is not going to be robust as the IMR boot itself can fail and in that case a full, cold boot is executed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Chao Song <chao.song@intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20221020121238.18339-15-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
a5ab431e18
commit
5d5d915bcd
@ -396,12 +396,16 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)
|
||||
dev_dbg(sdev->dev, "IMR restore supported, booting from IMR directly\n");
|
||||
hda->boot_iteration = 0;
|
||||
ret = hda_dsp_boot_imr(sdev);
|
||||
if (!ret)
|
||||
if (!ret) {
|
||||
hda->booted_from_imr = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
dev_warn(sdev->dev, "IMR restore failed, trying to cold boot\n");
|
||||
}
|
||||
|
||||
hda->booted_from_imr = false;
|
||||
|
||||
chip_info = desc->chip_info;
|
||||
|
||||
if (sdev->basefw.fw->size <= sdev->basefw.payload_offset) {
|
||||
|
@ -481,6 +481,7 @@ enum sof_hda_D0_substate {
|
||||
struct sof_intel_hda_dev {
|
||||
bool imrboot_supported;
|
||||
bool skip_imr_boot;
|
||||
bool booted_from_imr;
|
||||
|
||||
int boot_iteration;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user