From: Baruch Siach <baruch@tkos.co.il>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Baruch Siach <baruch@tkos.co.il>, Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
John Stultz <john.stultz@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Jamie Iles <jamie@jamieiles.com>,
Dinh Nguyen <dinguyen@altera.com>
Subject: [RFC PATCH 2/2] clocksource: dw_apb: allow build for architectures other than arm
Date: Sun, 26 May 2013 15:12:47 +0300 [thread overview]
Message-ID: <1369570367-994-2-git-send-email-baruch@tkos.co.il> (raw)
ARM is the only architecture providing sched_clock.h and setup_sched_clock().
Implement sched_clock() for use by other architectures.
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jamie Iles <jamie@jamieiles.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
arch/arm/Kconfig | 1 +
drivers/clocksource/Kconfig | 3 +++
drivers/clocksource/dw_apb_timer_of.c | 18 ++++++++++++++++++
3 files changed, 22 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1cacda4..7489604 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -47,6 +47,7 @@ config ARM
select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
select HAVE_PERF_EVENTS
select HAVE_REGS_AND_STACK_ACCESS_API
+ select HAVE_SETUP_SCHED_CLOCK
select HAVE_SYSCALL_TRACEPOINTS
select HAVE_UID16
select KTIME_SCALAR
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index e507ab7..0fd6d13 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -1,3 +1,6 @@
+config HAVE_SETUP_SCHED_CLOCK
+ bool
+
config CLKSRC_OF
bool
diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
index 5a61ebc..9fdb4d3 100644
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@ -21,7 +21,11 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
+#ifdef CONFIG_HAVE_SETUP_SCHED_CLOCK
#include <asm/sched_clock.h>
+#else
+#include <linux/sched.h>
+#endif
static void timer_get_base_and_rate(struct device_node *np,
void __iomem **base, u32 *rate)
@@ -73,6 +77,9 @@ static void add_clocksource(struct device_node *source_timer)
}
static void __iomem *sched_io_base;
+#ifndef CONFIG_HAVE_SETUP_SCHED_CLOCK
+static u64 sched_clock_mult __read_mostly;
+#endif
static u32 read_sched_clock(void)
{
@@ -97,7 +104,11 @@ static void init_sched_clock(void)
timer_get_base_and_rate(sched_timer, &sched_io_base, &rate);
of_node_put(sched_timer);
+#ifdef CONFIG_HAVE_SETUP_SCHED_CLOCK
setup_sched_clock(read_sched_clock, 32, rate);
+#else
+ sched_clock_mult = NSEC_PER_SEC / rate;
+#endif
}
static const struct of_device_id osctimer_ids[] __initconst = {
@@ -124,3 +135,10 @@ void __init dw_apb_timer_init(void)
init_sched_clock();
}
+
+#ifndef CONFIG_HAVE_SETUP_SCHED_CLOCK
+unsigned long long notrace sched_clock()
+{
+ return read_sched_clock() * sched_clock_mult;
+}
+#endif
--
1.7.10.4
next reply other threads:[~2013-05-26 13:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-26 12:12 Baruch Siach [this message]
2013-05-28 20:24 ` [RFC PATCH 2/2] clocksource: dw_apb: allow build for architectures other than arm John Stultz
2013-05-30 5:32 ` Baruch Siach
2013-05-30 16:11 ` John Stultz
2013-05-31 5:32 ` Baruch Siach
2013-06-20 14:44 ` Pavel Machek
2013-06-20 15:03 ` Baruch Siach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369570367-994-2-git-send-email-baruch@tkos.co.il \
--to=baruch@tkos.co.il \
--cc=dinguyen@altera.com \
--cc=jamie@jamieiles.com \
--cc=john.stultz@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).