Skip to content

Commit 8969765

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_ro_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 <jyri.sarha@linux.intel.com>
1 parent fe3165e commit 8969765

4 files changed

Lines changed: 4 additions & 99 deletions

File tree

sound/soc/sof/Makefile

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

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
@@ -16,7 +16,6 @@
1616
#include "ipc4-fw-reg.h"
1717
#include "ipc4-priv.h"
1818
#include "ipc4-topology.h"
19-
#include "ipc4-telemetry.h"
2019
#include "ops.h"
2120

2221
static const struct sof_ipc4_fw_status {
@@ -741,7 +740,9 @@ static int ipc4_fw_ready(struct snd_sof_dev *sdev, struct sof_ipc4_msg *ipc4_msg
741740
return 0;
742741
}
743742

744-
sof_ipc4_create_exception_debugfs_node(sdev);
743+
/* sizeof(u32)is for skiping the first separator magic number */
744+
sof_ipc4_create_debug_slot_ro_debugfs_node(sdev, SOF_IPC4_DEBUG_SLOT_TELEMETRY,
745+
sizeof(u32), "exception");
745746

746747
sof_ipc4_create_debug_slot_ro_debugfs_node(sdev, SOF_IPC4_DEBUG_SLOT_DEBUG_STREAM,
747748
0, "debug_stream");

0 commit comments

Comments
 (0)