Hi John,
On Tue, May 28, 2013 at 01:24:17PM -0700, John Stultz wrote:
> On 05/26/2013 05:12 AM, Baruch Siach wrote:
> >ARM is the only architecture providing sched_clock.h and setup_sched_clock().
> >Implement sched_clock() for use by other architectures.
> >
> >Cc: Ingo Molnar <[email protected]>
> >Cc: Peter Zijlstra <[email protected]>
> >Cc: John Stultz <[email protected]>
> >Cc: Thomas Gleixner <[email protected]>
> >Cc: Jamie Iles <[email protected]>
> >Cc: Dinh Nguyen <[email protected]>
> >Signed-off-by: Baruch Siach <[email protected]>
> >---
[snip]
> >@@ -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
> > }
>
> Can you rework this to not use #ifdefs within the function? They
> make it annoying to read the code.
>
> Instead maybe have a local setup_sched_clock() function that sets
> the mult value for the !CONFIG_HAVE_SETUP_SCHED_CLOCK case?
>
> > 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
>
> Also, can you try to condense the number of #ifndef
> CONFIG_HAVE_SETUP_SCHED_CLOCK checks to one, and consolidate the
> needed functions all in that one conditional?
Thanks for your comments. I'll rework the patch and resubmit.
I've just noticed that I have a bigger problem. read_sched_clock() returns
u32, not u64. This means that in a rate of, say, 100MHz it will wrap around
after a little more than 40 seconds. Would it make sense to put ARM's 32 bin
sched_clock extension code (arch/arm/kernel/sched_clock.c) is a common place
(maybe drivers/clocksource), and use that? There seems to be nothing ARM
specific in this code, after all.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- [email protected] - tel: +972.2.679.5364, http://www.tkos.co.il -
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
