diff options
| author | Kai Vehmanen <kai.vehmanen@linux.intel.com> | 2019-05-09 23:10:23 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-13 14:37:12 +0300 |
| commit | a69270d8bfeb35fc89d047ea6db803cd75a74f12 (patch) | |
| tree | 4e59a25e93eada96c8d0e74b3d976f730fa5670f | |
| parent | 8d01c3c73cefbb5bacffe804427daed3e6051435 (diff) | |
| download | linux-a69270d8bfeb35fc89d047ea6db803cd75a74f12.tar.xz | |
ASoC: SOF: fix race in FW boot timeout handling
A race condition exists in handling firmware boot timeout.
If FW sends FW_READY just after boot timeout has expired in
driver, a kernel exception will result as FW_READY handler
will be run while the state is still being cleaned up in
snd_sof_run_firmware(). Avoid the race by setting
boot_complete also in the error case.
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/sof/loader.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c index 81c7452aae17..628fae552442 100644 --- a/sound/soc/sof/loader.c +++ b/sound/soc/sof/loader.c @@ -372,6 +372,8 @@ 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); return -EIO; |