Skip to content

Commit b9782ad

Browse files
author
Jyri Sarha
committed
ASoC: SOF: ipc4: Use generic function for mapping "exception" debugfs file
Remove sof_ipc4_create_exception_debugfs_node() and ipc4-telemetry.c, and use sof_ipc4_create_debug_slot_debugfs_node() instead for mapping "exception" debugfs file. In running system the SOF_IPC4_DEBUG_SLOT_TELEMETRY is used for telemetry data, but if configured, Zephyr exception data is dumped in the same debug window slot, right after the separator word. Signed-off-by: Jyri Sarha <[email protected]>
1 parent e645843 commit b9782ad

File tree

4 files changed

+4
-99
lines changed

4 files changed

+4
-99
lines changed

sound/soc/sof/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ snd-sof-y += ipc3.o ipc3-loader.o ipc3-topology.o ipc3-control.o ipc3-pcm.o\
1111
endif
1212
ifneq ($(CONFIG_SND_SOC_SOF_IPC4),)
1313
snd-sof-y += ipc4.o ipc4-loader.o ipc4-topology.o ipc4-control.o ipc4-pcm.o\
14-
ipc4-mtrace.o ipc4-telemetry.o ipc4-debug-slot-debugfs.o
14+
ipc4-mtrace.o ipc4-debug-slot-debugfs.o
1515
endif
1616

1717
# SOF client support

sound/soc/sof/ipc4-telemetry.c

Lines changed: 0 additions & 95 deletions
This file was deleted.

sound/soc/sof/ipc4-telemetry.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,4 @@ struct sof_ipc4_telemetry_slot_data {
6969
u32 arch_data[];
7070
} __packed;
7171

72-
void sof_ipc4_create_exception_debugfs_node(struct snd_sof_dev *sdev);
7372
#endif

sound/soc/sof/ipc4.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "sof-audio.h"
1616
#include "ipc4-fw-reg.h"
1717
#include "ipc4-priv.h"
18-
#include "ipc4-telemetry.h"
1918
#include "ops.h"
2019

2120
static const struct sof_ipc4_fw_status {
@@ -621,7 +620,9 @@ static int ipc4_fw_ready(struct snd_sof_dev *sdev, struct sof_ipc4_msg *ipc4_msg
621620
return 0;
622621
}
623622

624-
sof_ipc4_create_exception_debugfs_node(sdev);
623+
/* sizeof(u32)is for skiping the first separator magic number */
624+
sof_ipc4_create_debug_slot_debugfs_node(sdev, SOF_IPC4_DEBUG_SLOT_TELEMETRY,
625+
sizeof(u32), "exception");
625626

626627
sof_ipc4_create_debug_slot_debugfs_node(sdev, SOF_IPC4_DEBUG_SLOT_DEBUG_STREAM,
627628
0, "debug_stream");

0 commit comments

Comments
 (0)