Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756157AbZKIPbz (ORCPT ); Mon, 9 Nov 2009 10:31:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756144AbZKIPby (ORCPT ); Mon, 9 Nov 2009 10:31:54 -0500 Received: from ey-out-2122.google.com ([74.125.78.24]:2838 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756142AbZKIPbw (ORCPT ); Mon, 9 Nov 2009 10:31:52 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=KCOe2k9/sr5sGBGa3qbKNqRfh6Q/0yKbRJik1wVVAJCas9CtLwpMbuD6w2t36RwsHr h1yWILEXx4Z6pmNCqpmxHNL1Hb3+oLoCNIHyMaIp4b/TDpvwtX4e6qk8IW7/YXE2Z37v 8Qs6XNaL1J2CVW+2bkgPZyYSVcvWZ5JxTpM5Q= From: Wu Zhangjin To: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Cc: zhangfx@lemote.com, zhouqg@gmail.com, Wu Zhangjin , Ralf Baechle , rostedt@goodmis.org, Frederic Weisbecker , Ingo Molnar , Nicholas Mc Guire , David Daney , Richard Sandiford , Patrik Kluba , Thomas Gleixner , Michal Simek Subject: [PATCH v7 02/17] tracing: add mips_timecounter_read() for MIPS Date: Mon, 9 Nov 2009 23:31:19 +0800 Message-Id: X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <9dc81a7a9e5a292cccdf465c533a2b08d19d6021.1257779502.git.wuzhangjin@gmail.com> References: <9dc81a7a9e5a292cccdf465c533a2b08d19d6021.1257779502.git.wuzhangjin@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3416 Lines: 137 From: Wu Zhangjin This patch add a new function: mips_timecounter_read() to get high precision timestamp without extra lock. It is based on the clock counter register and the timecounter/cyclecounter abstraction layer of kernel. Signed-off-by: Wu Zhangjin --- arch/mips/include/asm/time.h | 20 ++++++++++++++++++++ arch/mips/kernel/csrc-r4k.c | 41 +++++++++++++++++++++++++++++++++++++++++ arch/mips/kernel/time.c | 2 ++ 3 files changed, 63 insertions(+), 0 deletions(-) diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index df6a430..3fcc481 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h @@ -15,6 +15,7 @@ #define _ASM_TIME_H #include +#include #include #include #include @@ -73,8 +74,18 @@ static inline int mips_clockevent_init(void) */ #ifdef CONFIG_CSRC_R4K_LIB extern int init_r4k_clocksource(void); +extern int init_r4k_timecounter(void); +extern u64 r4k_timecounter_read(void); #endif +static inline u64 mips_timecounter_read(void) +{ +#ifdef CONFIG_CSRC_R4K + return r4k_timecounter_read(); +#else + return sched_clock(); +#endif +} static inline int init_mips_clocksource(void) { #ifdef CONFIG_CSRC_R4K @@ -84,6 +95,15 @@ static inline int init_mips_clocksource(void) #endif } +static inline int init_mips_timecounter(void) +{ +#ifdef CONFIG_CSRC_R4K + return init_r4k_timecounter(); +#else + return 0; +#endif +} + extern void clocksource_set_clock(struct clocksource *cs, unsigned int clock); extern void clockevent_set_clock(struct clock_event_device *cd, unsigned int clock); diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index e95a3cd..4e7705f 100644 --- a/arch/mips/kernel/csrc-r4k.c +++ b/arch/mips/kernel/csrc-r4k.c @@ -7,6 +7,7 @@ */ #include #include +#include #include @@ -36,3 +37,43 @@ int __init init_r4k_clocksource(void) return 0; } + +static struct timecounter r4k_tc = { + .cc = NULL, +}; + +static cycle_t r4k_cc_read(const struct cyclecounter *cc) +{ + return read_c0_count(); +} + +static struct cyclecounter r4k_cc = { + .read = r4k_cc_read, + .mask = CLOCKSOURCE_MASK(32), + .shift = 32, +}; + +int __init init_r4k_timecounter(void) +{ + if (!cpu_has_counter || !mips_hpt_frequency) + return -ENXIO; + + r4k_cc.mult = div_sc((unsigned long)mips_hpt_frequency, NSEC_PER_SEC, + 32); + + timecounter_init(&r4k_tc, &r4k_cc, sched_clock()); + + return 0; +} + +u64 r4k_timecounter_read(void) +{ + u64 clock; + + if (r4k_tc.cc != NULL) + clock = timecounter_read(&r4k_tc); + else + clock = sched_clock(); + + return clock; +} diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 1f467d5..e38cca1 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -156,4 +156,6 @@ void __init time_init(void) if (!mips_clockevent_init() || !cpu_has_mfc0_count_bug()) init_mips_clocksource(); + if (!cpu_has_mfc0_count_bug()) + init_mips_timecounter(); } -- 1.6.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/