ASoC: SOF: debug: Clarify the IPC timeout handling path
Subsystems (3)
Peter Ujfalusi
maintainerPATCH 1/1 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.
--- sound/soc/sof/debug.c | 5 ++--- sound/soc/sof/ipc3.c | 2 +- sound/soc/sof/sof-priv.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
sound/soc/sof/debug.c +2 -3
@@ -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
@@ -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
@@ -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,
Signature · 1 line
2.36.1
Mark Brown
maintainerQuoted 9 lines · Peter Ujfalusi
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.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: debug: Clarify the IPC timeout handling path
commit: 145cb4e7a9ee12326f99948d8980ad258462b6c4
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark