misc: tegra-profiler: use cntvct as time source

Tegra Profiler: use Virtual Count register (CNTVCT) as
time source.

Bug 1508327

Change-Id: If37e2dbe0a256ec28575d7c1b7d601d6bc1090f5
Signed-off-by: Igor Nabirushkin <inabirushkin@nvidia.com>
Reviewed-on: http://git-master/r/419305
(cherry picked from commit 2e5fe3f706a404a087e110a9289818dd6c855c15)
Reviewed-on: http://git-master/r/454458
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Tested-by: Maxim Morin <mmorin@nvidia.com>
Reviewed-by: Mitch Luban <mluban@nvidia.com>

diff --git a/drivers/misc/tegra-profiler/hrt.c b/drivers/misc/tegra-profiler/hrt.c
index 9bbcb30c990378a85d998dc8a118584543197893..13b131bec5e3f223177acb737c31ef29644775a7 100644 (file)
--- a/drivers/misc/tegra-profiler/hrt.c
+++ b/drivers/misc/tegra-profiler/hrt.c
@@ -24,9 +24,11 @@
 #include <linux/interrupt.h>
 #include <linux/err.h>
 #include <linux/nsproxy.h>
+#include <clocksource/arm_arch_timer.h>
 
 #include <asm/cputype.h>
 #include <asm/irq_regs.h>
+#include <asm/arch_timer.h>
 
 #include <linux/tegra_profiler.h>
 
@@ -91,7 +93,7 @@ static void init_hrtimer(struct quadd_cpu_context *cpu_ctx)
        cpu_ctx->hrtimer.function = hrtimer_handler;
 }
 
-u64 quadd_get_time(void)
+static inline u64 get_posix_clock_monotonic_time(void)
 {
        struct timespec ts;
 
@@ -99,6 +101,25 @@ u64 quadd_get_time(void)
        return timespec_to_ns(&ts);
 }
 
+static inline u64 get_arch_time(struct timecounter *tc)
+{
+       cycle_t value;
+       const struct cyclecounter *cc = tc->cc;
+
+       value = cc->read(cc);
+       return cyclecounter_cyc2ns(cc, value);
+}
+
+u64 quadd_get_time(void)
+{
+       struct timecounter *tc = hrt.tc;
+
+       if (tc)
+               return get_arch_time(tc);
+       else
+               return get_posix_clock_monotonic_time();
+}
+
 static void put_header(void)
 {
        int nr_events = 0, max_events = QUADD_MAX_COUNTERS;
@@ -616,6 +637,7 @@ struct quadd_hrt_ctx *quadd_hrt_init(struct quadd_ctx *ctx)
                hrt.ma_period = 0;
 
        atomic64_set(&hrt.counter_samples, 0);
+       hrt.tc = arch_timer_get_timecounter();
 
        hrt.cpu_ctx = alloc_percpu(struct quadd_cpu_context);
        if (!hrt.cpu_ctx)

diff --git a/drivers/misc/tegra-profiler/hrt.h b/drivers/misc/tegra-profiler/hrt.h
index ef1f6738baaaa4ee0e0f97b969bc56b0635fb6aa..32b891da4f9cb3552ad001233d23f0309fec1cfa 100644 (file)
--- a/drivers/misc/tegra-profiler/hrt.h
+++ b/drivers/misc/tegra-profiler/hrt.h
@@ -39,6 +39,8 @@ struct quadd_cpu_context {
        atomic_t nr_active;
 };
 
+struct timecounter;
+
 struct quadd_hrt_ctx {
        struct quadd_cpu_context * __percpu cpu_ctx;
        u64 sample_period;
@@ -54,6 +56,8 @@ struct quadd_hrt_ctx {
 
        unsigned long vm_size_prev;
        unsigned long rss_size_prev;
+
+       struct timecounter *tc;
 };
 
 #define QUADD_HRT_MIN_FREQ     100

diff --git a/drivers/misc/tegra-profiler/main.c b/drivers/misc/tegra-profiler/main.c
index da0c15ff4916407a5bb1af9ce956247a58b28c74..555cc259a0ce79bc035c4fa3d61b024b5bf043be 100644 (file)
--- a/drivers/misc/tegra-profiler/main.c
+++ b/drivers/misc/tegra-profiler/main.c
@@ -432,6 +432,9 @@ static void get_capabilities(struct quadd_comm_cap *cap)
        extra |= QUADD_COMM_CAP_EXTRA_UNWIND_MIXED;
        extra |= QUADD_COMM_CAP_EXTRA_UNW_ENTRY_TYPE;
 
+       if (ctx.hrt->tc)
+               extra |= QUADD_COMM_CAP_EXTRA_USE_ARCH_TIMER;
+
        cap->reserved[QUADD_COMM_CAP_IDX_EXTRA] = extra;
 }
 

diff --git a/drivers/misc/tegra-profiler/quadd_proc.c b/drivers/misc/tegra-profiler/quadd_proc.c
index 8f656fae213e67548687355d9908315cad1becb9..12f5fc90cd91b524c64b4b8c4f78354a2c44455d 100644 (file)
--- a/drivers/misc/tegra-profiler/quadd_proc.c
+++ b/drivers/misc/tegra-profiler/quadd_proc.c
@@ -96,6 +96,8 @@ static int show_capabilities(struct seq_file *f, void *offset)
                   YES_NO(extra & QUADD_COMM_CAP_EXTRA_UNWIND_MIXED));
        seq_printf(f, "information about unwind entry:        %s\n",
                   YES_NO(extra & QUADD_COMM_CAP_EXTRA_UNW_ENTRY_TYPE));
+       seq_printf(f, "use arch timer:                        %s\n",
+                  YES_NO(extra & QUADD_COMM_CAP_EXTRA_USE_ARCH_TIMER));
 
        seq_puts(f, "\n");
 

diff --git a/drivers/misc/tegra-profiler/version.h b/drivers/misc/tegra-profiler/version.h
index 392ea70b7a913974aeea6a7e98bad2cd76510006..d3913ff5e367ca797d958b65592cadac3c9cc6de 100644 (file)
--- a/drivers/misc/tegra-profiler/version.h
+++ b/drivers/misc/tegra-profiler/version.h
@@ -18,7 +18,7 @@
 #ifndef __QUADD_VERSION_H
 #define __QUADD_VERSION_H
 
-#define QUADD_MODULE_VERSION           "1.72"
+#define QUADD_MODULE_VERSION           "1.73"
 #define QUADD_MODULE_BRANCH            "Dev"
 
 #endif /* __QUADD_VERSION_H */

diff --git a/include/linux/tegra_profiler.h b/include/linux/tegra_profiler.h
index bfab1ee72e80c5389473f297e550740c6c366fbd..b0dccedb25bcd32dd53c246e1c88dc6ab11aa5c5 100644 (file)
--- a/include/linux/tegra_profiler.h
+++ b/include/linux/tegra_profiler.h
@@ -19,7 +19,7 @@
 
 #include <linux/ioctl.h>
 
-#define QUADD_SAMPLES_VERSION  26
+#define QUADD_SAMPLES_VERSION  27
 #define QUADD_IO_VERSION       12
 
 #define QUADD_IO_VERSION_DYNAMIC_RB            5
@@ -39,6 +39,7 @@
 #define QUADD_SAMPLE_VERSION_SPECIAL_MMAP      24
 #define QUADD_SAMPLE_VERSION_UNWIND_MIXED      25
 #define QUADD_SAMPLE_VERSION_UNW_ENTRY_TYPE    26
+#define QUADD_SAMPLE_VERSION_USE_ARCH_TIMER    27
 
 #define QUADD_MAX_COUNTERS     32
 #define QUADD_MAX_PROCESS      64
@@ -368,6 +369,7 @@ enum {
 #define QUADD_COMM_CAP_EXTRA_SPECIAL_ARCH_MMAP (1 << 5)
 #define QUADD_COMM_CAP_EXTRA_UNWIND_MIXED      (1 << 6)
 #define QUADD_COMM_CAP_EXTRA_UNW_ENTRY_TYPE    (1 << 7)
+#define QUADD_COMM_CAP_EXTRA_USE_ARCH_TIMER    (1 << 8)
 
 struct quadd_comm_cap {
        u32     pmu:1,