Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18486508 authored by Libin Yang's avatar Libin Yang Committed by Takashi Iwai
Browse files

ALSA: hda - rename hda_intel_trace.h to hda_controller_trace.h 



This patch does:

1. Rename the hda_intel_trace.h to hda_controller_trace.h as
this trace is used in hda_controller.c

2. Add some trace function for pcm flow.

Signed-off-by: default avatarLibin Yang <libin.yang@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 598dfb56

sound/pci/hda/hda_controller.c

+5 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "hda_controller.h"



#define CREATE_TRACE_POINTS

#include "hda_intel_trace.h"

#include "hda_controller_trace.h"



/* DSP lock helpers */

#define dsp_lock(dev)		snd_hdac_dsp_lock(azx_stream(dev))
@@ -95,6 +95,7 @@ static int azx_pcm_close(struct snd_pcm_substream *substream) 
	struct azx *chip = apcm->chip;

	struct azx_dev *azx_dev = get_azx_dev(substream);



	trace_azx_pcm_close(chip, azx_dev);

	mutex_lock(&chip->open_mutex);

	azx_release_device(azx_dev);

	if (hinfo->ops.close)
@@ -113,6 +114,7 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream, 
	struct azx_dev *azx_dev = get_azx_dev(substream);

	int ret;



	trace_azx_pcm_hw_params(chip, azx_dev);

	dsp_lock(azx_dev);

	if (dsp_is_locked(azx_dev)) {

		ret = -EBUSY;
@@ -163,6 +165,7 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream) 
		snd_hda_spdif_out_of_nid(apcm->codec, hinfo->nid);

	unsigned short ctls = spdif ? spdif->ctls : 0;



	trace_azx_pcm_prepare(chip, azx_dev);

	dsp_lock(azx_dev);

	if (dsp_is_locked(azx_dev)) {

		err = -EBUSY;
@@ -403,6 +406,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream) 
	snd_hda_codec_pcm_get(apcm->info);

	mutex_lock(&chip->open_mutex);

	azx_dev = azx_assign_device(chip, substream);

	trace_azx_pcm_open(chip, azx_dev);

	if (azx_dev == NULL) {

		err = -EBUSY;

		goto unlock;

sound/pci/hda/hda_controller_trace.h

0 → 100644
+98 −0
Original line number Diff line number Diff line 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM hda_controller

#define TRACE_INCLUDE_FILE hda_controller_trace



#if !defined(_TRACE_HDA_CONTROLLER_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_HDA_CONTROLLER_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)->core.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)->core.index;

		__entry->pos = pos;

		__entry->delay = delay;

	),



	TP_printk("[%d:%d] pos=%u, delay=%u", __entry->card, __entry->idx, __entry->pos, __entry->delay)

);



DECLARE_EVENT_CLASS(azx_pcm,

	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),



	TP_ARGS(chip, azx_dev),



	TP_STRUCT__entry(

		__field( unsigned char, stream_tag )

	),



	TP_fast_assign(

		__entry->stream_tag = (azx_dev)->core.stream_tag;

	),



	TP_printk("stream_tag: %d", __entry->stream_tag)

);



DEFINE_EVENT(azx_pcm, azx_pcm_open,

	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),

	TP_ARGS(chip, azx_dev)

);



DEFINE_EVENT(azx_pcm, azx_pcm_close,

	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),

	TP_ARGS(chip, azx_dev)

);



DEFINE_EVENT(azx_pcm, azx_pcm_hw_params,

	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),

	TP_ARGS(chip, azx_dev)

);



DEFINE_EVENT(azx_pcm, azx_pcm_prepare,

	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),

	TP_ARGS(chip, azx_dev)

);



#endif /* _TRACE_HDA_CONTROLLER_H */



/* This part must be outside protection */

#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#include <trace/define_trace.h>

sound/pci/hda/hda_intel_trace.h

+0 −62
Original line number Diff line number Diff line 
#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)->core.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)->core.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>