mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ALSA: hda - Add tracepoints to HD-audio controller driver 

Add a couple of tracepoints to snd-hda-intel for tracing the position
and the trigger timings.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-10-16 15:10:08 +02:00
parent 4ee3bffca4
commit 1a8506d440
3 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/pci/hda/Makefile
View File

@ -8,6 +8,7 @@ snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
# for trace-points
CFLAGS_hda_codec.o := -I$(src)
CFLAGS_hda_intel.o := -I$(src)
snd-hda-codec-realtek-objs := patch_realtek.o
snd-hda-codec-cmedia-objs := patch_cmedia.o

9
sound/pci/hda/hda_intel.c
View File

@ -527,6 +527,9 @@ struct azx {
struct list_head list;
};
#define CREATE_TRACE_POINTS
#include "hda_intel_trace.h"
/* driver types */
enum {
AZX_DRIVER_ICH,
@ -2059,6 +2062,9 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
int rstart = 0, start, nsync = 0, sbits = 0;
int nwait, timeout;
azx_dev = get_azx_dev(substream);
trace_azx_pcm_trigger(chip, azx_dev, cmd);
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
rstart = 1;
@ -2231,6 +2237,7 @@ static unsigned int azx_get_position(struct azx *chip,
{
unsigned int pos;
int stream = azx_dev->substream->stream;
int delay = 0;
switch (chip->position_fix[stream]) {
case POS_FIX_LPIB:
@ -2264,7 +2271,6 @@ static unsigned int azx_get_position(struct azx *chip,
chip->position_fix[stream] == POS_FIX_POSBUF &&
(chip->driver_caps & AZX_DCAPS_COUNT_LPIB_DELAY)) {
unsigned int lpib_pos = azx_sd_readl(azx_dev, SD_LPIB);
int delay;
if (stream == SNDRV_PCM_STREAM_PLAYBACK)
delay = pos - lpib_pos;
else
@ -2279,6 +2285,7 @@ static unsigned int azx_get_position(struct azx *chip,
azx_dev->substream->runtime->delay =
bytes_to_frames(azx_dev->substream->runtime, delay);
}
trace_azx_get_position(chip, azx_dev, pos, delay);
return pos;
}

62
sound/pci/hda/hda_intel_trace.h Normal file
View File

@ -0,0 +1,62 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM hda_intel
#define TRACE_INCLUDE_FILE hda_intel_trace
#if !defined(_TRACE_HDA_INTEL_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HDA_INTEL_H
#include <linux/tracepoint.h>
struct azx;
struct azx_dev;
TRACE_EVENT(azx_pcm_trigger,
TP_PROTO(struct azx *chip, struct azx_dev *dev, int cmd),
TP_ARGS(chip, dev, cmd),
TP_STRUCT__entry(
__field( int, card )
__field( int, idx )
__field( int, cmd )
),
TP_fast_assign(
__entry->card = (chip)->card->number;
__entry->idx = (dev)->index;
__entry->cmd = cmd;
),
TP_printk("[%d:%d] cmd=%d", __entry->card, __entry->idx, __entry->cmd)
);
TRACE_EVENT(azx_get_position,
TP_PROTO(struct azx *chip, struct azx_dev *dev, unsigned int pos, unsigned int delay),
TP_ARGS(chip, dev, pos, delay),
TP_STRUCT__entry(
__field( int, card )
__field( int, idx )
__field( unsigned int, pos )
__field( unsigned int, delay )
),
TP_fast_assign(
__entry->card = (chip)->card->number;
__entry->idx = (dev)->index;
__entry->pos = pos;
__entry->delay = delay;
),
TP_printk("[%d:%d] pos=%u, delay=%u", __entry->card, __entry->idx, __entry->pos, __entry->delay)
);
#endif /* _TRACE_HDA_INTEL_H */
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#include <trace/define_trace.h>