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>

3 files changed, 13 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index 2e12b512..3fa78e54 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -523,11 +523,14 @@ static const struct gpu_ops vgpu_gp10b_ops = {
         .bus = {
                 .init_hw = gk20a_bus_init_hw,
                 .isr = gk20a_bus_isr,
-                .read_ptimer = vgpu_read_ptimer,
-                .get_timestamps_zipper = vgpu_get_timestamps_zipper,
                 .bar1_bind = gk20a_bus_bar1_bind,
                 .set_bar0_window = gk20a_bus_set_bar0_window,
         },
+        .ptimer = {
+                .isr = NULL,
+                .read_ptimer = vgpu_read_ptimer,
+                .get_timestamps_zipper = vgpu_get_timestamps_zipper,
+        },
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         .css = {
                 .enable_snapshot = vgpu_css_enable_snapshot_buffer,
@@ -578,6 +581,7 @@ int vgpu_gp10b_init_hal(struct gk20a *g)
         gops->debugger = vgpu_gp10b_ops.debugger;
         gops->dbg_session_ops = vgpu_gp10b_ops.dbg_session_ops;
         gops->bus = vgpu_gp10b_ops.bus;
+        gops->ptimer = vgpu_gp10b_ops.ptimer;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gops->css = vgpu_gp10b_ops.css;
 #endif
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 0b1aa672..d6b305d4 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -574,11 +574,14 @@ static const struct gpu_ops vgpu_gv11b_ops = {
         .bus = {
                 .init_hw = gk20a_bus_init_hw,
                 .isr = gk20a_bus_isr,
-                .read_ptimer = vgpu_read_ptimer,
-                .get_timestamps_zipper = vgpu_get_timestamps_zipper,
                 .bar1_bind = NULL,
                 .set_bar0_window = gk20a_bus_set_bar0_window,
         },
+        .ptimer = {
+                .isr = NULL,
+                .read_ptimer = vgpu_read_ptimer,
+                .get_timestamps_zipper = vgpu_get_timestamps_zipper,
+        },
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         .css = {
                 .enable_snapshot = vgpu_css_enable_snapshot_buffer,
@@ -625,6 +628,7 @@ int vgpu_gv11b_init_hal(struct gk20a *g)
         gops->debugger = vgpu_gv11b_ops.debugger;
         gops->dbg_session_ops = vgpu_gv11b_ops.dbg_session_ops;
         gops->bus = vgpu_gv11b_ops.bus;
+        gops->ptimer = vgpu_gv11b_ops.ptimer;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gops->css = vgpu_gv11b_ops.css;
 #endif
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 2bdef427..7760b56f 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -21,7 +21,7 @@
  */
 
 #include <nvgpu/enabled.h>
-#include <nvgpu/bus.h>
+#include <nvgpu/ptimer.h>
 #include <nvgpu/vgpu/vgpu_ivc.h>
 #include <nvgpu/vgpu/vgpu.h>