diff options
| author | Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2019-09-27 15:05:26 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-01 18:30:28 +0100 |
| commit | 798614885a0e1b867ceb0197c30c2d82575c73b0 (patch) | |
| tree | 83f76b1596946075fa7bee8431c65c21f51377fa /sound/soc/sof/loader.c | |
| parent | 9daf4fd0302b2559223cf90dae7dc510c6679047 (diff) | |
| download | linux-798614885a0e1b867ceb0197c30c2d82575c73b0.tar.gz linux-798614885a0e1b867ceb0197c30c2d82575c73b0.tar.bz2 linux-798614885a0e1b867ceb0197c30c2d82575c73b0.zip | |
ASoC: SOF: loader: fix kernel oops on firmware boot failure
When we fail to boot the firmware, we encounter a kernel oops in
hda_dsp_get_registers(), which is called conditionally in
hda_dsp_dump() when the sdev_>boot_complete flag is set.
Setting this flag _after_ dumping the data fixes the issue and does
not change the programming flow.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190927200538.660-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/loader.c')
| -rw-r--r-- | sound/soc/sof/loader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c index d7f32745fefe..9a9a381a908d 100644 --- a/sound/soc/sof/loader.c +++ b/sound/soc/sof/loader.c @@ -546,10 +546,10 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev) msecs_to_jiffies(sdev->boot_timeout)); if (ret == 0) { dev_err(sdev->dev, "error: firmware boot failure\n"); - /* after this point FW_READY msg should be ignored */ - sdev->boot_complete = true; snd_sof_dsp_dbg_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX | SOF_DBG_TEXT | SOF_DBG_PCI); + /* after this point FW_READY msg should be ignored */ + sdev->boot_complete = true; return -EIO; } |