ASoC: SOF: Intel: hda: remove duplicated status dump (b278fc55) · Commits · 戴 / test

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>

sound/soc/sof/intel/hda-loader.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -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,

Admin message