Unverified Commit 145cb4e7 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: debug: Clarify the IPC timeout handling path 



The dmesg log message of "Firmware exception" causes lots of confusion as
the snd_sof_handle_fw_exception() is only called in case of an IPC tx
timeout, where such a message does not make much sense.

To not limit the snd_sof_handle_fw_exception() handler to just one error
case, add a parameter to allow the caller to specify a meaningful message
to be printed.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarYaochun Hung <yc.hung@mediatek.com>
Link: https://lore.kernel.org/r/20220610080421.31453-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/debug.c

+2 −3
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static void snd_sof_ipc_dump(struct snd_sof_dev *sdev) 
	}

}



void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev)

void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev, const char *msg)

{

	if (IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_RETAIN_DSP_CONTEXT) ||

	    sof_debug_check_flag(SOF_DBG_RETAIN_CTX)) {
@@ -441,8 +441,7 @@ void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev) 


	/* dump vital information to the logs */

	snd_sof_ipc_dump(sdev);

	snd_sof_dsp_dbg_dump(sdev, "Firmware exception",

			     SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);

	snd_sof_dsp_dbg_dump(sdev, msg, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);

	sof_fw_trace_fw_crashed(sdev);

}

EXPORT_SYMBOL(snd_sof_handle_fw_exception);

sound/soc/sof/ipc3.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int ipc3_wait_tx_done(struct snd_sof_ipc *ipc, void *reply_data) 
		dev_err(sdev->dev,

			"ipc tx timed out for %#x (msg/reply size: %d/%zu)\n",

			hdr->cmd, hdr->size, msg->reply_size);

		snd_sof_handle_fw_exception(ipc->sdev);

		snd_sof_handle_fw_exception(ipc->sdev, "IPC timeout");

		ret = -ETIMEDOUT;

	} else {

		ret = msg->reply_error;

sound/soc/sof/sof-priv.h

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ void sof_print_oops_and_stack(struct snd_sof_dev *sdev, const char *level, 
			      u32 panic_code, u32 tracep_code, void *oops,

			      struct sof_ipc_panic_info *panic_info,

			      void *stack, size_t stack_words);

void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev);

void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev, const char *msg);

int snd_sof_dbg_memory_info_init(struct snd_sof_dev *sdev);

int snd_sof_debugfs_add_region_item_iomem(struct snd_sof_dev *sdev,

		enum snd_sof_fw_blk_type blk_type, u32 offset, size_t size,