diff options
| author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2020-12-11 12:07:41 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-11 13:22:56 +0000 |
| commit | b278fc55b47739da49ea7f95e6ad58d436091ba2 (patch) | |
| tree | 2046cc96a3a1aefab365ce949c05b8a0c0af8c23 /sound/soc | |
| parent | 3759d5edc07598d55124d87bd292a95f79f47997 (diff) | |
| download | linux-b278fc55b47739da49ea7f95e6ad58d436091ba2.tar.gz linux-b278fc55b47739da49ea7f95e6ad58d436091ba2.tar.bz2 linux-b278fc55b47739da49ea7f95e6ad58d436091ba2.zip | |
ASoC: SOF: Intel: hda: remove duplicated status dump
Remove the duplicate status dump in case DSP init fails. The core will
be powered down in this case and the status dump will be invalid anyway.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20201211100743.3188821-2-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/sof/intel/hda-loader.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c index 02c3ff897274..d8fb4e277c19 100644 --- a/sound/soc/sof/intel/hda-loader.c +++ b/sound/soc/sof/intel/hda-loader.c @@ -408,10 +408,12 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) * should be ready for code loading and firmware boot */ ret = cl_copy_fw(sdev, stream); - if (!ret) + if (!ret) { dev_dbg(sdev->dev, "Firmware download successful, booting...\n"); - else + } else { + hda_dsp_dump(sdev, SOF_DBG_REGS | SOF_DBG_PCI | SOF_DBG_MBOX); dev_err(sdev->dev, "error: load fw failed ret: %d\n", ret); + } cleanup: /* @@ -435,9 +437,6 @@ cleanup: if (!ret) return chip_info->init_core_mask; - /* dump dsp registers and disable DSP upon error */ - hda_dsp_dump(sdev, SOF_DBG_REGS | SOF_DBG_PCI | SOF_DBG_MBOX); - /* disable DSP */ snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL, |