1 files changed, 49 insertions, 0 deletions

diff --git a/nvdebug.h b/nvdebug.h
index aa5d0cf..b4ff0a4 100644
--- a/nvdebug.h
+++ b/nvdebug.h
@@ -2,6 +2,10 @@
  * SPDX-License-Identifier: MIT
  */
 
+// TODO(jbakita): Don't depend on these.
+#include <nvgpu/gk20a.h>  // For struct gk20a
+#include <os/linux/os_linux.h>  // For struct nvgpu_os_linux
+
 /* Runlist Channel
   A timeslice group (TSG) is composed of channels. Each channel is a FIFO queue
   of GPU commands. These commands are typically queued from userspace.
@@ -125,3 +129,48 @@ typedef union {
         } __attribute__((packed));
         uint32_t raw;
 } runlist_info_t;
+
+// TODO(jbakita): Maybe put the above GPU types in a different file.
+
+#define for_chan_in_tsg(chan, tsg) \
+        for (chan = (struct runlist_chan*)(tsg + 1); \
+             (void*)chan < (void*)(tsg + 1) + sizeof(struct runlist_chan) * tsg->tsg_length; \
+             chan++)
+
+#define next_tsg(tsg) \
+        (void*)(tsg + 1) + sizeof(struct runlist_chan) * tsg->tsg_length
+
+struct runlist_iter {
+        struct entry_tsg *curr_tsg;
+        runlist_info_t rl_info;
+};
+
+// Defined in runlist.c
+int get_runlist_iter(struct runlist_iter *rl_iter);
+
+static inline struct gk20a *get_gk20a(struct device *dev) {
+        // XXX: Only works because gk20a* is the first member of gk20a_platform
+        return *((struct gk20a**)dev_get_drvdata(dev));
+}
+
+// Functionally identical to nvgpu_readl()
+// (except we don't try to resolve situations where regs is NULL)
+static inline u32 nvdebug_readl(struct gk20a* g, u32 r) {
+        struct nvgpu_os_linux* g_os = container_of(g, struct nvgpu_os_linux, g);
+        if (unlikely(!g_os->regs)) {
+                printk(KERN_ERR "[nvdebug] Attempted nvgpu_readl on non-existent registers!\n");
+                return -1;
+        }
+        return readl(g_os->regs + r);
+}
+
+// Functionally identical to nvgpu_writel()
+static inline void nvdebug_writel(struct gk20a* g, u32 r, u32 v) {
+        struct nvgpu_os_linux* g_os = container_of(g, struct nvgpu_os_linux, g);
+        if (unlikely(!g_os->regs)) {
+                printk(KERN_ERR "[nvdebug] Attempted nvgpu_writel on non-existent registers!\n");
+                return;
+        }
+        writel_relaxed(v, g_os->regs + r);
+        wmb();
+}