3 files changed, 74 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
index 52ef08e4..7f0ca013 100644
--- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
@@ -128,6 +128,66 @@ int gk20a_read_ptimer(struct gk20a *g, u64 *value)
         return -EBUSY;
 }
 
+static inline u64 get_cpu_timestamp_tsc(void)
+{
+        return ((u64) get_cycles());
+}
+
+static inline u64 get_cpu_timestamp_jiffies(void)
+{
+        return (get_jiffies_64() - INITIAL_JIFFIES);
+}
+
+static inline u64 get_cpu_timestamp_timeofday(void)
+{
+        struct timeval tv;
+
+        do_gettimeofday(&tv);
+        return timeval_to_jiffies(&tv);
+}
+
+int gk20a_get_timestamps_zipper(struct gk20a *g,
+                u32 source_id, u32 count,
+                struct nvgpu_cpu_time_correlation_sample *samples)
+{
+        int err = 0;
+        unsigned int i = 0;
+        u64 (*get_cpu_timestamp)(void) = NULL;
+
+        switch (source_id) {
+        case NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_TSC:
+                get_cpu_timestamp = get_cpu_timestamp_tsc;
+                break;
+        case NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_JIFFIES:
+                get_cpu_timestamp = get_cpu_timestamp_jiffies;
+                break;
+        case NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_TIMEOFDAY:
+                get_cpu_timestamp = get_cpu_timestamp_timeofday;
+                break;
+        default:
+                nvgpu_err(g, "invalid cpu clock source id\n");
+                return -EINVAL;
+        }
+
+        if (gk20a_busy(g)) {
+                nvgpu_err(g, "GPU not powered on\n");
+                err = -EINVAL;
+                goto end;
+        }
+
+        for (i = 0; i < count; i++) {
+                err = g->ops.bus.read_ptimer(g, &samples[i].gpu_timestamp);
+                if (err)
+                        return err;
+
+                samples[i].cpu_timestamp = get_cpu_timestamp();
+        }
+
+end:
+        gk20a_idle(g);
+        return err;
+}
+
 static int gk20a_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst)
 {
         u64 iova = gk20a_mm_inst_block_addr(g, bar1_inst);
@@ -150,5 +210,6 @@ void gk20a_init_bus(struct gpu_ops *gops)
         gops->bus.init_hw = gk20a_bus_init_hw;
         gops->bus.isr = gk20a_bus_isr;
         gops->bus.read_ptimer = gk20a_read_ptimer;
+        gops->bus.get_timestamps_zipper = gk20a_get_timestamps_zipper;
         gops->bus.bar1_bind = gk20a_bus_bar1_bind;
 }
diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.h b/drivers/gpu/nvgpu/gk20a/bus_gk20a.h
index 72710c35..088c385e 100644
--- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.h
@@ -22,10 +22,19 @@ struct gk20a;
 struct gpu_ops;
 struct nvgpu_mem;
 
+struct nvgpu_cpu_time_correlation_sample {
+        u64 cpu_timestamp;
+        u64 gpu_timestamp;
+};
+
 void gk20a_init_bus(struct gpu_ops *gops);
 
 void gk20a_bus_isr(struct gk20a *g);
 int gk20a_read_ptimer(struct gk20a *g, u64 *value);
 void gk20a_bus_init_hw(struct gk20a *g);
 
+int gk20a_get_timestamps_zipper(struct gk20a *g,
+                u32 source_id, u32 count,
+                struct nvgpu_cpu_time_correlation_sample *samples);
+
 #endif /* GK20A_H */
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 34f89fc8..d1a55104 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -63,6 +63,7 @@ struct nvgpu_nvhost_dev;
 #include "priv_ring_gk20a.h"
 #include "therm_gk20a.h"
 #include "gm20b/acr_gm20b.h"
+#include "gk20a/bus_gk20a.h"
 #include "cde_gk20a.h"
 #include "sched_gk20a.h"
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
@@ -905,6 +906,9 @@ struct gpu_ops {
                 void (*init_hw)(struct gk20a *g);
                 void (*isr)(struct gk20a *g);
                 int (*read_ptimer)(struct gk20a *g, u64 *value);
+                int (*get_timestamps_zipper)(struct gk20a *g,
+                        u32 source_id, u32 count,
+                        struct nvgpu_cpu_time_correlation_sample *);
                 int (*bar1_bind)(struct gk20a *g, struct nvgpu_mem *bar1_inst);
         } bus;