mirror of
git://nv-tegra.nvidia.com/linux-nvgpu.git
synced 2025-12-23 01:50:07 +03:00
gpu: nvgpu: Provide cpu gpu time correlation via ioctl
bug 1648908 Provides pairs of CPU and GPU timestamps that can be used for correlatiing the two timebases - IOCTL made available /dev/nvhost-ctrl-gpu Change-Id: I1458b9d33d794b1b02ec9fd29ed9426756b94bcd Signed-off-by: Arul Sekar <aruls@nvidia.com> Reviewed-on: http://git-master/r/1029732 Reviewed-by: Arun Gona <agona@nvidia.com> Tested-by: Arun Gona <agona@nvidia.com> Reviewed-on: http://git-master/r/1111715 GVS: Gerrit_Virtual_Submit Reviewed-by: Thomas Fleury <tfleury@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
committed by
Terje Bergstrom
parent
97108797a2
commit
032efd066e
@@ -29,6 +29,7 @@
|
|||||||
#include "hw_gr_gk20a.h"
|
#include "hw_gr_gk20a.h"
|
||||||
#include "hw_fb_gk20a.h"
|
#include "hw_fb_gk20a.h"
|
||||||
#include "hw_proj_gk20a.h"
|
#include "hw_proj_gk20a.h"
|
||||||
|
#include "hw_timer_gk20a.h"
|
||||||
|
|
||||||
int gk20a_ctrl_dev_open(struct inode *inode, struct file *filp)
|
int gk20a_ctrl_dev_open(struct inode *inode, struct file *filp)
|
||||||
{
|
{
|
||||||
@@ -530,6 +531,94 @@ static int gk20a_ctrl_get_buffer_info(
|
|||||||
&args->out.id, &args->out.length);
|
&args->out.id, &args->out.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline int get_timestamps_zipper(struct gk20a *g,
|
||||||
|
u64 (*get_cpu_timestamp)(void),
|
||||||
|
struct nvgpu_gpu_get_cpu_time_correlation_info_args *args)
|
||||||
|
{
|
||||||
|
int err = 0;
|
||||||
|
int i = 0;
|
||||||
|
u32 gpu_timestamp_hi_new = 0;
|
||||||
|
u32 gpu_timestamp_hi_old = 0;
|
||||||
|
|
||||||
|
if (gk20a_busy(g->dev)) {
|
||||||
|
gk20a_err(dev_from_gk20a(g), "GPU not powered on\n");
|
||||||
|
err = -EINVAL;
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* get zipper reads of gpu and cpu counter values */
|
||||||
|
gpu_timestamp_hi_old = gk20a_readl(g, timer_time_1_r());
|
||||||
|
for (i = 0; i < args->count; i++) {
|
||||||
|
u32 gpu_timestamp_lo = 0;
|
||||||
|
u32 gpu_timestamp_hi = 0;
|
||||||
|
|
||||||
|
gpu_timestamp_lo = gk20a_readl(g, timer_time_0_r());
|
||||||
|
args->samples[i].cpu_timestamp = get_cpu_timestamp();
|
||||||
|
rmb(); /* maintain zipper read order */
|
||||||
|
gpu_timestamp_hi_new = gk20a_readl(g, timer_time_1_r());
|
||||||
|
|
||||||
|
/* pick the appropriate gpu counter hi bits */
|
||||||
|
gpu_timestamp_hi = (gpu_timestamp_lo & (1L << 31)) ?
|
||||||
|
gpu_timestamp_hi_old : gpu_timestamp_hi_new;
|
||||||
|
|
||||||
|
args->samples[i].gpu_timestamp =
|
||||||
|
((u64)gpu_timestamp_hi << 32) | (u64)gpu_timestamp_lo;
|
||||||
|
|
||||||
|
gpu_timestamp_hi_old = gpu_timestamp_hi_new;
|
||||||
|
}
|
||||||
|
|
||||||
|
end:
|
||||||
|
gk20a_idle(g->dev);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int nvgpu_gpu_get_cpu_time_correlation_info(
|
||||||
|
struct gk20a *g,
|
||||||
|
struct nvgpu_gpu_get_cpu_time_correlation_info_args *args)
|
||||||
|
{
|
||||||
|
int err = 0;
|
||||||
|
u64 (*get_cpu_timestamp)(void) = NULL;
|
||||||
|
|
||||||
|
if (args->count > NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_MAX_COUNT)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
switch (args->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:
|
||||||
|
gk20a_err(dev_from_gk20a(g), "invalid cpu clock source id\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
err = get_timestamps_zipper(g, get_cpu_timestamp, args);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
struct platform_device *dev = filp->private_data;
|
struct platform_device *dev = filp->private_data;
|
||||||
@@ -762,6 +851,11 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg
|
|||||||
(struct nvgpu_gpu_get_buffer_info_args *)buf);
|
(struct nvgpu_gpu_get_buffer_info_args *)buf);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case NVGPU_GPU_IOCTL_GET_CPU_TIME_CORRELATION_INFO:
|
||||||
|
err = nvgpu_gpu_get_cpu_time_correlation_info(g,
|
||||||
|
(struct nvgpu_gpu_get_cpu_time_correlation_info_args *)buf);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
dev_dbg(dev_from_gk20a(g), "unrecognized gpu ioctl cmd: 0x%x", cmd);
|
dev_dbg(dev_from_gk20a(g), "unrecognized gpu ioctl cmd: 0x%x", cmd);
|
||||||
err = -ENOTTY;
|
err = -ENOTTY;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
|
* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
* under the terms and conditions of the GNU General Public License,
|
* under the terms and conditions of the GNU General Public License,
|
||||||
@@ -98,4 +98,12 @@ static inline u32 timer_pri_timeout_fecs_errcode_r(void)
|
|||||||
{
|
{
|
||||||
return 0x0000908c;
|
return 0x0000908c;
|
||||||
}
|
}
|
||||||
|
static inline u32 timer_time_0_r(void)
|
||||||
|
{
|
||||||
|
return 0x00009400;
|
||||||
|
}
|
||||||
|
static inline u32 timer_time_1_r(void)
|
||||||
|
{
|
||||||
|
return 0x00009410;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
|
* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
* under the terms and conditions of the GNU General Public License,
|
* under the terms and conditions of the GNU General Public License,
|
||||||
@@ -98,4 +98,12 @@ static inline u32 timer_pri_timeout_fecs_errcode_r(void)
|
|||||||
{
|
{
|
||||||
return 0x0000908c;
|
return 0x0000908c;
|
||||||
}
|
}
|
||||||
|
static inline u32 timer_time_0_r(void)
|
||||||
|
{
|
||||||
|
return 0x00009400;
|
||||||
|
}
|
||||||
|
static inline u32 timer_time_1_r(void)
|
||||||
|
{
|
||||||
|
return 0x00009410;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -351,6 +351,28 @@ struct nvgpu_gpu_get_buffer_info_args {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_MAX_COUNT 16
|
||||||
|
#define NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_TSC 1
|
||||||
|
#define NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_JIFFIES 2
|
||||||
|
#define NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_TIMEOFDAY 3
|
||||||
|
|
||||||
|
struct nvgpu_gpu_get_cpu_time_correlation_sample {
|
||||||
|
/* gpu timestamp value */
|
||||||
|
__u64 cpu_timestamp;
|
||||||
|
/* raw GPU counter (PTIMER) value */
|
||||||
|
__u64 gpu_timestamp;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct nvgpu_gpu_get_cpu_time_correlation_info_args {
|
||||||
|
/* timestamp pairs */
|
||||||
|
struct nvgpu_gpu_get_cpu_time_correlation_sample samples[
|
||||||
|
NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_MAX_COUNT];
|
||||||
|
/* number of pairs to read */
|
||||||
|
__u32 count;
|
||||||
|
/* cpu clock source id */
|
||||||
|
__u32 source_id;
|
||||||
|
};
|
||||||
|
|
||||||
#define NVGPU_GPU_IOCTL_ZCULL_GET_CTX_SIZE \
|
#define NVGPU_GPU_IOCTL_ZCULL_GET_CTX_SIZE \
|
||||||
_IOR(NVGPU_GPU_IOCTL_MAGIC, 1, struct nvgpu_gpu_zcull_get_ctx_size_args)
|
_IOR(NVGPU_GPU_IOCTL_MAGIC, 1, struct nvgpu_gpu_zcull_get_ctx_size_args)
|
||||||
#define NVGPU_GPU_IOCTL_ZCULL_GET_INFO \
|
#define NVGPU_GPU_IOCTL_ZCULL_GET_INFO \
|
||||||
@@ -397,11 +419,13 @@ struct nvgpu_gpu_get_buffer_info_args {
|
|||||||
_IO(NVGPU_GPU_IOCTL_MAGIC, 22)
|
_IO(NVGPU_GPU_IOCTL_MAGIC, 22)
|
||||||
#define NVGPU_GPU_IOCTL_CLEAR_SM_ERRORS \
|
#define NVGPU_GPU_IOCTL_CLEAR_SM_ERRORS \
|
||||||
_IO(NVGPU_GPU_IOCTL_MAGIC, 23)
|
_IO(NVGPU_GPU_IOCTL_MAGIC, 23)
|
||||||
|
#define NVGPU_GPU_IOCTL_GET_CPU_TIME_CORRELATION_INFO \
|
||||||
|
_IOWR(NVGPU_GPU_IOCTL_MAGIC, 24, \
|
||||||
|
struct nvgpu_gpu_get_cpu_time_correlation_info_args)
|
||||||
#define NVGPU_GPU_IOCTL_LAST \
|
#define NVGPU_GPU_IOCTL_LAST \
|
||||||
_IOC_NR(NVGPU_GPU_IOCTL_CLEAR_SM_ERRORS)
|
_IOC_NR(NVGPU_GPU_IOCTL_GET_CPU_TIME_CORRELATION_INFO)
|
||||||
#define NVGPU_GPU_IOCTL_MAX_ARG_SIZE \
|
#define NVGPU_GPU_IOCTL_MAX_ARG_SIZE \
|
||||||
sizeof(struct nvgpu_gpu_prepare_compressible_read_args)
|
sizeof(struct nvgpu_gpu_get_cpu_time_correlation_info_args)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* /dev/nvhost-tsg-gpu device
|
* /dev/nvhost-tsg-gpu device
|
||||||
|
|||||||
Reference in New Issue
Block a user