Fix: ASoC add component to set_bias_level events in linux 6.9-rc1

[lttng-modules.git] / include / instrumentation / events / asoc.h

diff --git a/include/instrumentation/events/asoc.h b/include/instrumentation/events/asoc.h
index 21d13a0fea52f019ffef21510a04b78797962493..47069cefcf3efe13d2416258eb18991b9125420a 100644 (file)
--- a/include/instrumentation/events/asoc.h
+++ b/include/instrumentation/events/asoc.h
@@ -10,6 +10,7 @@
 #include <lttng/kernel-version.h>
 
 #define DAPM_DIRECT "(direct)"
+#define DAPM_COMPONENT_NONE "(none)"
 
 #ifndef _TRACE_ASOC_DEF
 #define _TRACE_ASOC_DEF
@@ -19,6 +20,40 @@ struct snd_soc_dapm_widget;
 struct snd_soc_dapm_path;
 #endif
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_context,
+
+       TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
+
+       TP_ARGS(dapm, val),
+
+       TP_FIELDS(
+               ctf_string(name, dapm->card->name)
+               ctf_string(component, dapm->component ? dapm->component->name : DAPM_COMPONENT_NONE)
+               ctf_integer(int, val, val)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_context, snd_soc_bias_level_start,
+
+       asoc_snd_soc_bias_level_start,
+
+       TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
+
+       TP_ARGS(dapm, val)
+
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_context, snd_soc_bias_level_done,
+
+       asoc_snd_soc_bias_level_done,
+
+       TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
+
+       TP_ARGS(dapm, val)
+
+)
+#else
 LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_card,
 
        TP_PROTO(struct snd_soc_card *card, int val),
@@ -50,7 +85,40 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done,
        TP_ARGS(card, val)
 
 )
+#endif
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic,
+
+       TP_PROTO(struct snd_soc_card *card, int event),
+
+       TP_ARGS(card, event),
+
+       TP_FIELDS(
+               ctf_string(name, card->name)
+               ctf_integer(int, event, event)
+       )
+)
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_start,
+
+       asoc_snd_soc_dapm_start,
+
+       TP_PROTO(struct snd_soc_card *card, int event),
 
+       TP_ARGS(card, event)
+
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done,
+
+       asoc_snd_soc_dapm_done,
+
+       TP_PROTO(struct snd_soc_card *card, int event),
+
+       TP_ARGS(card, event)
+
+)
+#else
 LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic,
 
        TP_PROTO(struct snd_soc_card *card),
@@ -81,6 +149,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done,
        TP_ARGS(card)
 
 )
+#endif
 
 LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_widget,