gpu: nvgpu: Move time correlation to common code

Time correlation does not have chip or OS specific dependencies, so
move it to generic new source file bus.c.

JIRA NVGPU-38

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

2 files changed, 51 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/bus.c b/drivers/gpu/nvgpu/common/bus.c
new file mode 100644
index 00000000..9fd827bc
--- /dev/null
+++ b/drivers/gpu/nvgpu/common/bus.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <nvgpu/bus.h>
+
+#include "gk20a/gk20a.h"
+
+int nvgpu_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;
+
+        if (source_id != NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_TSC) {
+                nvgpu_err(g, "source_id %u not supported", source_id);
+                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 = (u64)get_cycles();
+        }
+
+end:
+        gk20a_idle(g);
+        return err;
+}
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index 025a30fe..caf8d309 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -24,6 +24,7 @@
 #include <nvgpu/bitops.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/bus.h>
 
 #include "ioctl_ctrl.h"
 #include "ioctl_tsg.h"