ASoC: Intel: avs: Event tracing
Define tracing macros for easy avs debug. These cover all IPC message types: requests, replies and notifications as well as DSP-core operations and d0ix toggling. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20220516101116.190192-10-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Cezary Rojewski
Mark Brown
Родитель
335c4cbd20
Коммит
69b23b3937
|
|
@ -4,4 +4,8 @@ snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \
|
|||
topology.o path.o pcm.o
|
||||
snd-soc-avs-objs += cldma.o
|
||||
|
||||
snd-soc-avs-objs += trace.o
|
||||
# tell define_trace.h where to find the trace header
|
||||
CFLAGS_trace.o := -I$(src)
|
||||
|
||||
obj-$(CONFIG_SND_SOC_INTEL_AVS) += snd-soc-avs.o
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
#include <sound/hdaudio_ext.h>
|
||||
#include "avs.h"
|
||||
#include "registers.h"
|
||||
#include "trace.h"
|
||||
|
||||
#define AVS_ADSPCS_INTERVAL_US 500
|
||||
#define AVS_ADSPCS_TIMEOUT_US 50000
|
||||
|
|
@ -19,6 +20,9 @@ int avs_dsp_core_power(struct avs_dev *adev, u32 core_mask, bool power)
|
|||
u32 value, mask, reg;
|
||||
int ret;
|
||||
|
||||
value = snd_hdac_adsp_readl(adev, AVS_ADSP_REG_ADSPCS);
|
||||
trace_avs_dsp_core_op(value, core_mask, "power", power);
|
||||
|
||||
mask = AVS_ADSPCS_SPA_MASK(core_mask);
|
||||
value = power ? mask : 0;
|
||||
|
||||
|
|
@ -43,6 +47,9 @@ int avs_dsp_core_reset(struct avs_dev *adev, u32 core_mask, bool reset)
|
|||
u32 value, mask, reg;
|
||||
int ret;
|
||||
|
||||
value = snd_hdac_adsp_readl(adev, AVS_ADSP_REG_ADSPCS);
|
||||
trace_avs_dsp_core_op(value, core_mask, "reset", reset);
|
||||
|
||||
mask = AVS_ADSPCS_CRST_MASK(core_mask);
|
||||
value = reset ? mask : 0;
|
||||
|
||||
|
|
@ -64,6 +71,9 @@ int avs_dsp_core_stall(struct avs_dev *adev, u32 core_mask, bool stall)
|
|||
u32 value, mask, reg;
|
||||
int ret;
|
||||
|
||||
value = snd_hdac_adsp_readl(adev, AVS_ADSP_REG_ADSPCS);
|
||||
trace_avs_dsp_core_op(value, core_mask, "stall", stall);
|
||||
|
||||
mask = AVS_ADSPCS_CSTALL_MASK(core_mask);
|
||||
value = stall ? mask : 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,13 @@
|
|||
// Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>
|
||||
//
|
||||
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/slab.h>
|
||||
#include <sound/hdaudio_ext.h>
|
||||
#include "avs.h"
|
||||
#include "messages.h"
|
||||
#include "registers.h"
|
||||
#include "trace.h"
|
||||
|
||||
#define AVS_IPC_TIMEOUT_MS 300
|
||||
#define AVS_D0IX_DELAY_MS 300
|
||||
|
|
@ -179,6 +181,10 @@ static void avs_dsp_receive_rx(struct avs_dev *adev, u64 header)
|
|||
{
|
||||
struct avs_ipc *ipc = adev->ipc;
|
||||
union avs_reply_msg msg = AVS_MSG(header);
|
||||
u64 reg;
|
||||
|
||||
reg = readq(avs_sram_addr(adev, AVS_FW_REGS_WINDOW));
|
||||
trace_avs_ipc_reply_msg(header, reg);
|
||||
|
||||
ipc->rx.header = header;
|
||||
/* Abort copying payload if request processing was unsuccessful. */
|
||||
|
|
@ -189,6 +195,7 @@ static void avs_dsp_receive_rx(struct avs_dev *adev, u64 header)
|
|||
ipc->rx.size = msg.ext.large_config.data_off_size;
|
||||
|
||||
memcpy_fromio(ipc->rx.data, avs_uplink_addr(adev), ipc->rx.size);
|
||||
trace_avs_msg_payload(ipc->rx.data, ipc->rx.size);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -198,6 +205,10 @@ static void avs_dsp_process_notification(struct avs_dev *adev, u64 header)
|
|||
union avs_notify_msg msg = AVS_MSG(header);
|
||||
size_t data_size = 0;
|
||||
void *data = NULL;
|
||||
u64 reg;
|
||||
|
||||
reg = readq(avs_sram_addr(adev, AVS_FW_REGS_WINDOW));
|
||||
trace_avs_ipc_notify_msg(header, reg);
|
||||
|
||||
/* Ignore spurious notifications until handshake is established. */
|
||||
if (!adev->ipc->ready && msg.notify_msg_type != AVS_NOTIFY_FW_READY) {
|
||||
|
|
@ -239,6 +250,7 @@ static void avs_dsp_process_notification(struct avs_dev *adev, u64 header)
|
|||
return;
|
||||
|
||||
memcpy_fromio(data, avs_uplink_addr(adev), data_size);
|
||||
trace_avs_msg_payload(data, data_size);
|
||||
}
|
||||
|
||||
/* Perform notification-specific operations. */
|
||||
|
|
@ -422,9 +434,15 @@ static void avs_ipc_msg_init(struct avs_ipc *ipc, struct avs_ipc_msg *reply)
|
|||
reinit_completion(&ipc->busy_completion);
|
||||
}
|
||||
|
||||
static void avs_dsp_send_tx(struct avs_dev *adev, struct avs_ipc_msg *tx)
|
||||
static void avs_dsp_send_tx(struct avs_dev *adev, struct avs_ipc_msg *tx, bool read_fwregs)
|
||||
{
|
||||
u64 reg = ULONG_MAX;
|
||||
|
||||
tx->header |= SKL_ADSP_HIPCI_BUSY;
|
||||
if (read_fwregs)
|
||||
reg = readq(avs_sram_addr(adev, AVS_FW_REGS_WINDOW));
|
||||
|
||||
trace_avs_request(tx, reg);
|
||||
|
||||
if (tx->size)
|
||||
memcpy_toio(avs_downlink_addr(adev), tx->data, tx->size);
|
||||
|
|
@ -445,7 +463,7 @@ static int avs_dsp_do_send_msg(struct avs_dev *adev, struct avs_ipc_msg *request
|
|||
|
||||
spin_lock(&ipc->rx_lock);
|
||||
avs_ipc_msg_init(ipc, reply);
|
||||
avs_dsp_send_tx(adev, request);
|
||||
avs_dsp_send_tx(adev, request, true);
|
||||
spin_unlock(&ipc->rx_lock);
|
||||
|
||||
ret = avs_ipc_wait_busy_completion(ipc, timeout);
|
||||
|
|
@ -477,6 +495,7 @@ static int avs_dsp_send_msg_sequence(struct avs_dev *adev, struct avs_ipc_msg *r
|
|||
{
|
||||
int ret;
|
||||
|
||||
trace_avs_d0ix("wake", wake_d0i0, request->header);
|
||||
if (wake_d0i0) {
|
||||
ret = avs_dsp_wake_d0i0(adev, request);
|
||||
if (ret)
|
||||
|
|
@ -487,6 +506,7 @@ static int avs_dsp_send_msg_sequence(struct avs_dev *adev, struct avs_ipc_msg *r
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
trace_avs_d0ix("schedule", schedule_d0ix, request->header);
|
||||
if (schedule_d0ix)
|
||||
avs_dsp_schedule_d0ix(adev, request);
|
||||
|
||||
|
|
@ -530,7 +550,11 @@ static int avs_dsp_do_send_rom_msg(struct avs_dev *adev, struct avs_ipc_msg *req
|
|||
|
||||
spin_lock(&ipc->rx_lock);
|
||||
avs_ipc_msg_init(ipc, NULL);
|
||||
avs_dsp_send_tx(adev, request);
|
||||
/*
|
||||
* with hw still stalled, memory windows may not be
|
||||
* configured properly so avoid accessing SRAM
|
||||
*/
|
||||
avs_dsp_send_tx(adev, request, false);
|
||||
spin_unlock(&ipc->rx_lock);
|
||||
|
||||
/* ROM messages must be sent before main core is unstalled */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
//
|
||||
// Copyright(c) 2021-2022 Intel Corporation. All rights reserved.
|
||||
//
|
||||
// Author: Cezary Rojewski <cezary.rojewski@intel.com>
|
||||
// Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>
|
||||
//
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include "trace.h"
|
||||
|
||||
#define BYTES_PER_LINE 16
|
||||
#define MAX_CHUNK_SIZE ((PAGE_SIZE - 150) /* Place for trace header */ \
|
||||
/ (2 * BYTES_PER_LINE + 4) /* chars per line */ \
|
||||
* BYTES_PER_LINE)
|
||||
|
||||
void trace_avs_msg_payload(const void *data, size_t size)
|
||||
{
|
||||
size_t remaining = size;
|
||||
size_t offset = 0;
|
||||
|
||||
while (remaining > 0) {
|
||||
u32 chunk;
|
||||
|
||||
chunk = min(remaining, (size_t)MAX_CHUNK_SIZE);
|
||||
trace_avs_ipc_msg_payload(data, chunk, offset, size);
|
||||
|
||||
remaining -= chunk;
|
||||
offset += chunk;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#undef TRACE_SYSTEM
|
||||
#define TRACE_SYSTEM intel_avs
|
||||
|
||||
#if !defined(_TRACE_INTEL_AVS_H) || defined(TRACE_HEADER_MULTI_READ)
|
||||
#define _TRACE_INTEL_AVS_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/tracepoint.h>
|
||||
|
||||
TRACE_EVENT(avs_dsp_core_op,
|
||||
|
||||
TP_PROTO(unsigned int reg, unsigned int mask, const char *op, bool flag),
|
||||
|
||||
TP_ARGS(reg, mask, op, flag),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(unsigned int, reg )
|
||||
__field(unsigned int, mask )
|
||||
__string(op, op )
|
||||
__field(bool, flag )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->reg = reg;
|
||||
__entry->mask = mask;
|
||||
__assign_str(op, op);
|
||||
__entry->flag = flag;
|
||||
),
|
||||
|
||||
TP_printk("%s: %d, core mask: 0x%X, prev state: 0x%08X",
|
||||
__get_str(op), __entry->flag, __entry->mask, __entry->reg)
|
||||
);
|
||||
|
||||
#ifndef __TRACE_INTEL_AVS_TRACE_HELPER
|
||||
#define __TRACE_INTEL_AVS_TRACE_HELPER
|
||||
|
||||
void trace_avs_msg_payload(const void *data, size_t size);
|
||||
|
||||
#define trace_avs_request(msg, fwregs) \
|
||||
({ \
|
||||
trace_avs_ipc_request_msg((msg)->header, fwregs); \
|
||||
trace_avs_msg_payload((msg)->data, (msg)->size); \
|
||||
})
|
||||
|
||||
#define trace_avs_reply(msg, fwregs) \
|
||||
({ \
|
||||
trace_avs_ipc_reply_msg((msg)->header, fwregs); \
|
||||
trace_avs_msg_payload((msg)->data, (msg)->size); \
|
||||
})
|
||||
|
||||
#define trace_avs_notify(msg, fwregs) \
|
||||
({ \
|
||||
trace_avs_ipc_notify_msg((msg)->header, fwregs); \
|
||||
trace_avs_msg_payload((msg)->data, (msg)->size); \
|
||||
})
|
||||
#endif
|
||||
|
||||
DECLARE_EVENT_CLASS(avs_ipc_msg_hdr,
|
||||
|
||||
TP_PROTO(u64 header, u64 fwregs),
|
||||
|
||||
TP_ARGS(header, fwregs),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(u64, header)
|
||||
__field(u64, fwregs)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->header = header;
|
||||
__entry->fwregs = fwregs;
|
||||
),
|
||||
|
||||
TP_printk("primary: 0x%08X, extension: 0x%08X,\n"
|
||||
"fwstatus: 0x%08X, fwerror: 0x%08X",
|
||||
lower_32_bits(__entry->header), upper_32_bits(__entry->header),
|
||||
lower_32_bits(__entry->fwregs), upper_32_bits(__entry->fwregs))
|
||||
);
|
||||
|
||||
DEFINE_EVENT(avs_ipc_msg_hdr, avs_ipc_request_msg,
|
||||
TP_PROTO(u64 header, u64 fwregs),
|
||||
TP_ARGS(header, fwregs)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(avs_ipc_msg_hdr, avs_ipc_reply_msg,
|
||||
TP_PROTO(u64 header, u64 fwregs),
|
||||
TP_ARGS(header, fwregs)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(avs_ipc_msg_hdr, avs_ipc_notify_msg,
|
||||
TP_PROTO(u64 header, u64 fwregs),
|
||||
TP_ARGS(header, fwregs)
|
||||
);
|
||||
|
||||
TRACE_EVENT_CONDITION(avs_ipc_msg_payload,
|
||||
|
||||
TP_PROTO(const u8 *data, size_t size, size_t offset, size_t total),
|
||||
|
||||
TP_ARGS(data, size, offset, total),
|
||||
|
||||
TP_CONDITION(data && size),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__dynamic_array(u8, buf, size )
|
||||
__field(size_t, offset )
|
||||
__field(size_t, pos )
|
||||
__field(size_t, total )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
memcpy(__get_dynamic_array(buf), data + offset, size);
|
||||
__entry->offset = offset;
|
||||
__entry->pos = offset + size;
|
||||
__entry->total = total;
|
||||
),
|
||||
|
||||
TP_printk("range %zu-%zu out of %zu bytes%s",
|
||||
__entry->offset, __entry->pos, __entry->total,
|
||||
__print_hex_dump("", DUMP_PREFIX_NONE, 16, 4,
|
||||
__get_dynamic_array(buf),
|
||||
__get_dynamic_array_len(buf), false))
|
||||
);
|
||||
|
||||
TRACE_EVENT(avs_d0ix,
|
||||
|
||||
TP_PROTO(const char *op, bool proceed, u64 header),
|
||||
|
||||
TP_ARGS(op, proceed, header),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__string(op, op )
|
||||
__field(bool, proceed )
|
||||
__field(u64, header )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__assign_str(op, op);
|
||||
__entry->proceed = proceed;
|
||||
__entry->header = header;
|
||||
),
|
||||
|
||||
TP_printk("%s%s for request: 0x%08X 0x%08X",
|
||||
__entry->proceed ? "" : "ignore ", __get_str(op),
|
||||
lower_32_bits(__entry->header), upper_32_bits(__entry->header))
|
||||
);
|
||||
|
||||
#endif /* _TRACE_INTEL_AVS_H */
|
||||
|
||||
/* This part must be outside protection */
|
||||
#undef TRACE_INCLUDE_PATH
|
||||
#define TRACE_INCLUDE_PATH .
|
||||
#define TRACE_INCLUDE_FILE trace
|
||||
#include <trace/define_trace.h>
|
||||
Загрузка…
Ссылка в новой задаче