gpu: nvgpu: Separate timer from bus

Code touching timer registers was combined with bus code. They're two
logically separate register spaces, so separate the code accordingly.

JIRA NVGPU-588

Change-Id: I40e2925ff156669f41ddc1f2e7714f92a2da367b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1730893
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index defec775..0106f6c9 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -24,6 +24,7 @@
 
 #include "common/bus/bus_gk20a.h"
 #include "common/clock_gating/gp10b_gating_reglist.h"
+#include "common/ptimer/ptimer_gk20a.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -69,7 +70,7 @@
 #include <nvgpu/debug.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/enabled.h>
-#include <nvgpu/bus.h>
+#include <nvgpu/ptimer.h>
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/error_notifier.h>
 
@@ -650,11 +651,14 @@ static const struct gpu_ops gp10b_ops = {
         .bus = {
                 .init_hw = gk20a_bus_init_hw,
                 .isr = gk20a_bus_isr,
-                .read_ptimer = gk20a_read_ptimer,
-                .get_timestamps_zipper = nvgpu_get_timestamps_zipper,
                 .bar1_bind = gk20a_bus_bar1_bind,
                 .set_bar0_window = gk20a_bus_set_bar0_window,
         },
+        .ptimer = {
+                .isr = gk20a_ptimer_isr,
+                .read_ptimer = gk20a_read_ptimer,
+                .get_timestamps_zipper = nvgpu_get_timestamps_zipper,
+        },
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         .css = {
                 .enable_snapshot = css_hw_enable_snapshot,
@@ -705,6 +709,7 @@ int gp10b_init_hal(struct gk20a *g)
         gops->debugger = gp10b_ops.debugger;
         gops->dbg_session_ops = gp10b_ops.dbg_session_ops;
         gops->bus = gp10b_ops.bus;
+        gops->ptimer = gp10b_ops.ptimer;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gops->css = gp10b_ops.css;
 #endif