@@ -20,6 +20,9 @@
 
 #include "bpmp-private.h"
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/tegra_bpmp.h>
+
 #define MSG_ACK		BIT(0)
 #define MSG_RING	BIT(1)
 #define TAG_SZ		32

@@ -227,6 +230,7 @@ static ssize_t tegra_bpmp_channel_read(struct tegra_bpmp_channel *channel,
 unlock:
 	up(&bpmp->threaded.lock);
 
+	trace_tegra_bpmp_channel_read(channel, data, size, ret, err);
 	return err;
 }
 

@@ -240,6 +244,8 @@ static ssize_t __tegra_bpmp_channel_write(struct tegra_bpmp_channel *channel,
 	if (data && size > 0)
 		tegra_bpmp_mb_write(&channel->ob, data, size);
 
+	trace_tegra_bpmp_channel_write(channel, mrq, flags, data, size);
+
 	return tegra_bpmp_post_request(channel);
 }
 

@@ -350,8 +356,12 @@ int tegra_bpmp_transfer_atomic(struct tegra_bpmp *bpmp,
 	if (err < 0)
 		return err;
 
-	return __tegra_bpmp_channel_read(channel, msg->rx.data, msg->rx.size,
+	err =  __tegra_bpmp_channel_read(channel, msg->rx.data, msg->rx.size,
 					 &msg->rx.ret);
+
+	trace_tegra_bpmp_channel_read(channel, msg->rx.data, msg->rx.size,
+				      &msg->rx.ret, err);
+	return err;
 }
 EXPORT_SYMBOL_GPL(tegra_bpmp_transfer_atomic);
 

@@ -368,6 +378,8 @@ int tegra_bpmp_transfer(struct tegra_bpmp *bpmp,
 	if (!tegra_bpmp_message_valid(msg))
 		return -EINVAL;
 
+	trace_tegra_bpmp_transfer(bpmp, msg);
+
 	if (bpmp->suspended) {
 		/* Reset BPMP IPC channels during resume based on flags passed */
 		if (msg->flags & TEGRA_BPMP_MESSAGE_RESET)

@@ -812,6 +824,7 @@ static int __maybe_unused tegra_bpmp_suspend(struct device *dev)
 {
 	struct tegra_bpmp *bpmp = dev_get_drvdata(dev);
 
+	trace_tegra_bpmp_pm(bpmp, true);
 	bpmp->suspended = true;
 
 	return 0;

@@ -821,6 +834,7 @@ static int __maybe_unused tegra_bpmp_resume(struct device *dev)
 {
 	struct tegra_bpmp *bpmp = dev_get_drvdata(dev);
 
+	trace_tegra_bpmp_pm(bpmp, false);
 	bpmp->suspended = false;
 
 	if (bpmp->soc->ops->resume)

@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* tegra memory controller tracepoints
+ *
+ * Copyright (c) 2025 Codethink Ltd.
+ * Ben Dooks <ben.dooks@codethink.co.uk>
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM tegra_bpmp
+
+#if !defined(_TRACE_TEGRA_BPMP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TEGRA_BPMP_H
+
+#include <linux/tracepoint.h>
+
+#include <soc/tegra/bpmp.h>
+
+#ifdef CREATE_TRACE_POINTS
+static inline const char *tegra_bpmp_mrq_name(unsigned mrq)
+{
+	switch (mrq) {
+	case MRQ_PING: return "ping";
+	case MRQ_QUERY_TAG: return "query-tag";
+	case MRQ_THREADED_PING: return "threaded-ping";
+	case MRQ_DEBUGFS: return "debugfs";
+	case MRQ_RESET: return "reset";
+	case MRQ_I2C: return "i2c";
+	case MRQ_CLK: return "clk";
+	case MRQ_QUERY_ABI: return "query-abi";
+	case MRQ_THERMAL: return "thermal";
+	case MRQ_CPU_VHINT: return "cpu-vhint";
+	case MRQ_ABI_RATCHET: return "abi-ratchet";
+	case MRQ_EMC_DVFS_LATENCY: return "emc-dvfs-latency";
+	case MRQ_RINGBUF_CONSOLE: return "ringbuf-console";
+	case MRQ_PG: return "pg";
+	case MRQ_CPU_NDIV_LIMITS: return "cpu-ndiv-limits";
+	case MRQ_STRAP: return "strap";
+	case MRQ_UPHY: return "uphy";
+	case MRQ_CPU_AUTO_CC3: return "cpu-auto-cc3";
+	case MRQ_QUERY_FW_TAG: return "query-fw-tag";
+	case MRQ_FMON: return "fwmon";
+	case MRQ_EC: return "ec";
+	case MRQ_DEBUG: return "debug";
+	case MRQ_EMC_DVFS_EMCHUB: return "emc-dvfs-emchub";
+	case MRQ_BWMGR: return "bwmgr";
+	case MRQ_ISO_CLIENT: return "iso-client";
+	case MRQ_EMC_DISP_RFL: return "emc-disp-rfl";
+	case MRQ_TELEMETRY: return "telemetry";
+	case MRQ_PWR_LIMIT: return "pwr-limit";
+	case MRQ_GEARS: return "gears";
+	case MRQ_BWMGR_INT: return "bwmgr-int";
+	case MRQ_OC_STATUS: return "oc-status";
+	}
+
+	return "";
+}
+
+#define __pm_state(__s) ((__s) ? "suspended" : "active")
+#endif /* CREATE_TRACE_POINTS */
+
+TRACE_EVENT(tegra_bpmp_pm,
+	    TP_PROTO(struct tegra_bpmp *bpmp, bool suspend),
+	    TP_ARGS(bpmp, suspend),
+	    TP_STRUCT__entry(
+		    __string(dev, dev_name(bpmp->dev))
+		    __field(bool, suspend)
+		    __field(bool, prev)),
+	    TP_fast_assign(
+		    __assign_str(dev);
+		    __entry->prev = bpmp->suspended;
+		    __entry->suspend = suspend;
+		    ),
+	    TP_printk("bpmp %s: pm %s to %s",
+		      __get_str(dev),
+		      __pm_state(__entry->prev), __pm_state(__entry->suspend))
+);
+
+TRACE_EVENT(tegra_bpmp_transfer,
+	    TP_PROTO(struct tegra_bpmp *bpmp,
+		     struct tegra_bpmp_message *msg),
+	    TP_ARGS(bpmp, msg),
+	    TP_STRUCT__entry(
+			     __string(dev, dev_name(bpmp->dev))
+			     __field_struct(struct tegra_bpmp_message, msg)
+	    ),
+	    TP_fast_assign(
+			   __assign_str(dev);
+			   __entry->msg = *msg;
+	    ),
+	    TP_printk("bpmp %s: tx %px, %zd rx %px, %zd, mrq %u (%s), flags %lu",
+		      __get_str(dev),
+		      __entry->msg.tx.data, __entry->msg.tx.size,
+		      __entry->msg.rx.data, __entry->msg.rx.size,
+		      __entry->msg.mrq, tegra_bpmp_mrq_name(__entry->msg.mrq),
+		      __entry->msg.flags)
+);
+
+TRACE_EVENT(tegra_bpmp_channel_write,
+	    TP_PROTO(struct tegra_bpmp_channel *channel,
+		     unsigned int mrq, unsigned long flags,
+		     const void *data, size_t size),
+	    TP_ARGS(channel, mrq, flags, data, size),
+	    TP_STRUCT__entry(
+			     __field(unsigned int, index)
+			     __field(unsigned int, mrq)
+			     __field(unsigned long, flags)
+			     ),
+	    TP_fast_assign(
+		    __entry->index = channel->index;
+		    __entry->mrq = mrq;
+		    __entry->flags = flags;
+		    ),
+	    TP_printk("channel %u: mrq %u (%s), flags %lu",
+		      __entry->index,
+		      __entry->mrq, tegra_bpmp_mrq_name(__entry->mrq),
+		      __entry->flags)
+);
+
+TRACE_EVENT(tegra_bpmp_channel_read,
+	    TP_PROTO(struct tegra_bpmp_channel *channel,
+		     void *data, size_t size, int *ret, int err),
+	    TP_ARGS(channel, data, size, ret, err),
+	    TP_STRUCT__entry(
+		    __field(unsigned int, index)
+		    __field(int, ret)
+		    __field(int, err)
+		    ),
+	    TP_fast_assign(
+		    __entry->index = channel->index;
+		    __entry->ret = ret ? *ret : -ENOENT;
+		    __entry->err = err;
+		    ),
+	    TP_printk("channel %u: read returned %d, err %d",
+		      __entry->index, __entry->ret, __entry->err)
+);
+
+#endif /* _TRACE_TEGRA_BPMP_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>