13 files changed, 100 insertions, 63 deletions

diff --git a/drivers/gpu/nvgpu/common/as.c b/drivers/gpu/nvgpu/common/as.c
index 5458614e..75537ecc 100644
--- a/drivers/gpu/nvgpu/common/as.c
+++ b/drivers/gpu/nvgpu/common/as.c
@@ -168,3 +168,8 @@ release_fail:
 
         return err;
 }
+
+struct gk20a *gk20a_from_as(struct gk20a_as *as)
+{
+        return container_of(as, struct gk20a, as);
+}
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
index 53f04188..a7e5de68 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
@@ -29,6 +29,7 @@
 #include <nvgpu/barrier.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/soc.h>
+#include <nvgpu/ptimer.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c
index c642a7bc..b9ac50be 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu.c
@@ -594,3 +594,8 @@ void nvgpu_pmu_surface_free(struct gk20a *g, struct nvgpu_mem *mem)
         nvgpu_dma_free(g, mem);
         memset(mem, 0, sizeof(struct nvgpu_mem));
 }
+
+struct gk20a *gk20a_from_pmu(struct nvgpu_pmu *pmu)
+{
+        return container_of(pmu, struct gk20a, pmu);
+}
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 53134f71..8d6c3b70 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -42,6 +42,7 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/os_sched.h>
 #include <nvgpu/log2.h>
+#include <nvgpu/ptimer.h>
 
 #include "gk20a.h"
 #include "dbg_gpu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 57cb0019..9086e468 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -40,6 +40,7 @@
 #include <nvgpu/barrier.h>
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/error_notifier.h>
+#include <nvgpu/ptimer.h>
 
 #include "gk20a.h"
 #include "mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index afd18658..4fe93e3b 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -64,12 +64,12 @@ struct nvgpu_ctxsw_trace_filter;
 #include <nvgpu/nvlink.h>
 #include <nvgpu/sim.h>
 #include <nvgpu/ecc.h>
+#include <nvgpu/utils.h>
 
 #include "clk_gk20a.h"
 #include "ce2_gk20a.h"
 #include "fifo_gk20a.h"
 #include "tsg_gk20a.h"
-#include "gr_gk20a.h"
 #include "pmu_gk20a.h"
 #include "priv_ring_gk20a.h"
 #include "therm_gk20a.h"
@@ -78,10 +78,6 @@ struct nvgpu_ctxsw_trace_filter;
 #include "pmgr/pmgr.h"
 #include "therm/thrm.h"
 
-/* PTIMER_REF_FREQ_HZ corresponds to a period of 32 nanoseconds.
-    32 ns is the resolution of ptimer. */
-#define PTIMER_REF_FREQ_HZ                      31250000
-
 #ifdef CONFIG_DEBUG_FS
 struct railgate_stats {
         unsigned long last_rail_gate_start;
@@ -1652,50 +1648,8 @@ enum gk20a_nonstall_ops {
 void __nvgpu_check_gpu_state(struct gk20a *g);
 void __gk20a_warn_on_no_regs(void);
 
-/* convenience */
-static inline struct gk20a *gk20a_from_as(struct gk20a_as *as)
-{
-        return container_of(as, struct gk20a, as);
-}
-static inline struct gk20a *gk20a_from_pmu(struct nvgpu_pmu *pmu)
-{
-        return container_of(pmu, struct gk20a, pmu);
-}
-
-static inline u32 u64_hi32(u64 n)
-{
-        return (u32)((n >> 32) & ~(u32)0);
-}
-
-static inline u32 u64_lo32(u64 n)
-{
-        return (u32)(n & ~(u32)0);
-}
-
-static inline u64 hi32_lo32_to_u64(u32 hi, u32 lo)
-{
-        return  (((u64)hi) << 32) | (u64)lo;
-}
-
-static inline u32 set_field(u32 val, u32 mask, u32 field)
-{
-        return ((val & ~mask) | field);
-}
-
-static inline u32 get_field(u32 reg, u32 mask)
-{
-        return (reg & mask);
-}
-
-/* invalidate channel lookup tlb */
-static inline void gk20a_gr_flush_channel_tlb(struct gr_gk20a *gr)
-{
-        nvgpu_spinlock_acquire(&gr->ch_tlb_lock);
-        memset(gr->chid_tlb, 0,
-                sizeof(struct gr_channel_map_tlb_entry) *
-                GR_CHANNEL_MAP_TLB_SIZE);
-        nvgpu_spinlock_release(&gr->ch_tlb_lock);
-}
+struct gk20a *gk20a_from_as(struct gk20a_as *as);
+struct gk20a *gk20a_from_pmu(struct nvgpu_pmu *pmu);
 
 /* classes that the device supports */
 /* TBD: get these from an open-sourced SDK? */
@@ -1736,18 +1690,6 @@ int gk20a_wait_for_idle(struct gk20a *g);
 
 int gk20a_init_gpu_characteristics(struct gk20a *g);
 
-static inline u32 ptimer_scalingfactor10x(u32 ptimer_src_freq)
-{
-        return (u32)(((u64)(PTIMER_REF_FREQ_HZ * 10)) / ptimer_src_freq);
-}
-static inline u32 scale_ptimer(u32 timeout , u32 scale10x)
-{
-        if (((timeout*10) % scale10x) >= (scale10x/2))
-                return ((timeout * 10) / scale10x) + 1;
-        else
-                return (timeout * 10) / scale10x;
-}
-
 int gk20a_prepare_poweroff(struct gk20a *g);
 int gk20a_finalize_poweron(struct gk20a *g);
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 38570041..40bd5413 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -8777,3 +8777,13 @@ u32 gk20a_gr_get_sm_no_lock_down_hww_global_esr_mask(struct gk20a *g)
 
         return global_esr_mask;
 }
+
+/* invalidate channel lookup tlb */
+void gk20a_gr_flush_channel_tlb(struct gr_gk20a *gr)
+{
+        nvgpu_spinlock_acquire(&gr->ch_tlb_lock);
+        memset(gr->chid_tlb, 0,
+                sizeof(struct gr_channel_map_tlb_entry) *
+                GR_CHANNEL_MAP_TLB_SIZE);
+        nvgpu_spinlock_release(&gr->ch_tlb_lock);
+}
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 92e1dff5..0c6be57b 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -857,4 +857,5 @@ void gk20a_gr_destroy_ctx_buffer(struct gk20a *g,
         struct gr_ctx_buffer_desc *desc);
 int gk20a_gr_alloc_ctx_buffer(struct gk20a *g,
         struct gr_ctx_buffer_desc *desc, size_t size);
+void gk20a_gr_flush_channel_tlb(struct gr_gk20a *gr);
 #endif /*__GR_GK20A_H__*/
diff --git a/drivers/gpu/nvgpu/gv100/fifo_gv100.c b/drivers/gpu/nvgpu/gv100/fifo_gv100.c
index f5e43ea7..242e48f9 100644
--- a/drivers/gpu/nvgpu/gv100/fifo_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/fifo_gv100.c
@@ -1,7 +1,7 @@
 /*
  * GV100 fifo
  *
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,7 @@
 #include "gk20a/gk20a.h"
 #include "fifo_gv100.h"
 #include <nvgpu/timers.h>
+#include <nvgpu/ptimer.h>
 
 #include <nvgpu/hw/gv100/hw_ccsr_gv100.h>
 #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index 210a863b..548371d6 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -36,6 +36,7 @@
 #include <nvgpu/log2.h>
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/io_usermode.h>
+#include <nvgpu/ptimer.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
diff --git a/drivers/gpu/nvgpu/include/nvgpu/ptimer.h b/drivers/gpu/nvgpu/include/nvgpu/ptimer.h
index 54c6b20c..598e064f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/ptimer.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/ptimer.h
@@ -31,8 +31,24 @@ struct nvgpu_cpu_time_correlation_sample {
         u64 gpu_timestamp;
 };
 
+/* PTIMER_REF_FREQ_HZ corresponds to a period of 32 nanoseconds.
+    32 ns is the resolution of ptimer. */
+#define PTIMER_REF_FREQ_HZ                      31250000
+
+static inline u32 ptimer_scalingfactor10x(u32 ptimer_src_freq)
+{
+        return (u32)(((u64)(PTIMER_REF_FREQ_HZ * 10)) / ptimer_src_freq);
+}
+
+static inline u32 scale_ptimer(u32 timeout , u32 scale10x)
+{
+        if (((timeout*10) % scale10x) >= (scale10x/2))
+                return ((timeout * 10) / scale10x) + 1;
+        else
+                return (timeout * 10) / scale10x;
+}
+
 int nvgpu_get_timestamps_zipper(struct gk20a *g,
                 u32 source_id, u32 count,
                 struct nvgpu_cpu_time_correlation_sample *samples);
-
 #endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/utils.h b/drivers/gpu/nvgpu/include/nvgpu/utils.h
new file mode 100644
index 00000000..22102fa3
--- /dev/null
+++ b/drivers/gpu/nvgpu/include/nvgpu/utils.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef NVGPU_UTILS_H
+#define NVGPU_UTILS_H
+
+#include <nvgpu/types.h>
+
+static inline u32 u64_hi32(u64 n)
+{
+        return (u32)((n >> 32) & ~(u32)0);
+}
+
+static inline u32 u64_lo32(u64 n)
+{
+        return (u32)(n & ~(u32)0);
+}
+
+static inline u64 hi32_lo32_to_u64(u32 hi, u32 lo)
+{
+        return  (((u64)hi) << 32) | (u64)lo;
+}
+
+static inline u32 set_field(u32 val, u32 mask, u32 field)
+{
+        return ((val & ~mask) | field);
+}
+
+static inline u32 get_field(u32 reg, u32 mask)
+{
+        return (reg & mask);
+}
+#endif /* NVGPU_UTILS_H */
diff --git a/drivers/gpu/nvgpu/os/linux/sysfs.c b/drivers/gpu/nvgpu/os/linux/sysfs.c
index b607768a..d0a29300 100644
--- a/drivers/gpu/nvgpu/os/linux/sysfs.c
+++ b/drivers/gpu/nvgpu/os/linux/sysfs.c
@@ -20,6 +20,7 @@
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/nvhost.h>
+#include <nvgpu/ptimer.h>
 
 #include "sysfs.h"
 #include "platform_gk20a.h"