Unverified Commit fbfa22ec authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: modify the SOF_DBG flags 



The SOF_DBG_* macros are used for dual purposes right now, for the
sof_core_debug module parameter and for the dbg_dump() ops. So, separate
these two types of flags into different types to avoid confusion.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20201211100743.3188821-3-kai.vehmanen@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b278fc55

sound/soc/sof/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev) 
	}



	/* dump vital information to the logs */

	snd_sof_dsp_dbg_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX);

	snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);

	snd_sof_ipc_dump(sdev);

	snd_sof_trace_notify_for_error(sdev);

}

sound/soc/sof/intel/byt.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int byt_run(struct snd_sof_dev *sdev) 
	}

	if (tries < 0) {

		dev_err(sdev->dev, "error:  unable to run DSP firmware\n");

		byt_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX);

		byt_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);

		return -ENODEV;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) 
			__func__);



err:

	hda_dsp_dump(sdev, SOF_DBG_REGS | SOF_DBG_PCI | SOF_DBG_MBOX);

	hda_dsp_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX);

	hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);



	return ret;
@@ -411,7 +411,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
	if (!ret) {

		dev_dbg(sdev->dev, "Firmware download successful, booting...\n");

	} else {

		hda_dsp_dump(sdev, SOF_DBG_REGS | SOF_DBG_PCI | SOF_DBG_MBOX);

		hda_dsp_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX);

		dev_err(sdev->dev, "error: load fw failed ret: %d\n", ret);

	}

sound/soc/sof/loader.c

+2 −2
Original line number Diff line number Diff line
@@ -856,8 +856,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");

		snd_sof_dsp_dbg_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX |

			SOF_DBG_TEXT | SOF_DBG_PCI);

		snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX |

			SOF_DBG_DUMP_TEXT | SOF_DBG_DUMP_PCI);

		sdev->fw_state = SOF_FW_BOOT_FAILED;

		return -EIO;

	}

sound/soc/sof/ops.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void snd_sof_dsp_panic(struct snd_sof_dev *sdev, u32 offset) 
		dev_dbg(sdev->dev, "panic: dsp_oops_offset %zu offset %d\n",

			sdev->dsp_oops_offset, offset);



	snd_sof_dsp_dbg_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX);

	snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);

	snd_sof_trace_notify_for_error(sdev);

}

EXPORT_SYMBOL(snd_sof_dsp_panic);

CRA Git | Maintained and supported by SUSTech CRA and CCSE