From: John Stultz <john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> To: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>, Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>, Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Re: [PATCH] arch_timer: Do not register arch_sys_counter twice Date: Tue, 15 Oct 2013 09:51:21 -0700 [thread overview] Message-ID: <525D7289.2010900@linaro.org> (raw) In-Reply-To: <1381843911-31962-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> On 10/15/2013 06:31 AM, Thierry Reding wrote: > Commit 65cd4f6 (arch_timer: Move to generic sched_clock framework) added > code to register the arch_sys_counter in arch_timer_register() but it is > already registered in arch_counter_register(). This results in the timer > being added to the clocksource list twice, therefore causing an infinite > loop in the list. > > Remove the duplicate registration and register the scheduler clock after > the original registration instead. > > This fixes a hang during boot on Tegra114 (Cortex-A15). > > Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Acked-by: John Stultz <john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Ingo/Thomas, apologies here, I miss-resolved the conflict updating Stephens' patch (and also didn't add a note in the commit about it!), which is causing issues in -next. Would you mind applying this to tip/timers/core? thanks -john > --- > While I've only tested this on Tegra114, I suspect the same hang during > boot happens for all processors that use this clock source. > > drivers/clocksource/arm_arch_timer.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index f655036..95fb944 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -436,6 +436,9 @@ static void __init arch_counter_register(unsigned type) > cyclecounter.mult = clocksource_counter.mult; > cyclecounter.shift = clocksource_counter.shift; > timecounter_init(&timecounter, &cyclecounter, start_count); > + > + /* 56 bits minimum, so we assume worst case rollover */ > + sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate); > } > > static void arch_timer_stop(struct clock_event_device *clk) > @@ -515,15 +518,6 @@ static int __init arch_timer_register(void) > goto out; > } > > - clocksource_register_hz(&clocksource_counter, arch_timer_rate); > - cyclecounter.mult = clocksource_counter.mult; > - cyclecounter.shift = clocksource_counter.shift; > - timecounter_init(&timecounter, &cyclecounter, > - arch_counter_get_cntvct()); > - > - /* 56 bits minimum, so we assume worst case rollover */ > - sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate); > - > if (arch_timer_use_virtual) { > ppi = arch_timer_ppi[VIRT_PPI]; > err = request_percpu_irq(ppi, arch_timer_handler_virt,
WARNING: multiple messages have this Message-ID (diff)
From: john.stultz@linaro.org (John Stultz) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arch_timer: Do not register arch_sys_counter twice Date: Tue, 15 Oct 2013 09:51:21 -0700 [thread overview] Message-ID: <525D7289.2010900@linaro.org> (raw) In-Reply-To: <1381843911-31962-1-git-send-email-treding@nvidia.com> On 10/15/2013 06:31 AM, Thierry Reding wrote: > Commit 65cd4f6 (arch_timer: Move to generic sched_clock framework) added > code to register the arch_sys_counter in arch_timer_register() but it is > already registered in arch_counter_register(). This results in the timer > being added to the clocksource list twice, therefore causing an infinite > loop in the list. > > Remove the duplicate registration and register the scheduler clock after > the original registration instead. > > This fixes a hang during boot on Tegra114 (Cortex-A15). > > Signed-off-by: Thierry Reding <treding@nvidia.com> Acked-by: John Stultz <john.stultz@linaro.org> Ingo/Thomas, apologies here, I miss-resolved the conflict updating Stephens' patch (and also didn't add a note in the commit about it!), which is causing issues in -next. Would you mind applying this to tip/timers/core? thanks -john > --- > While I've only tested this on Tegra114, I suspect the same hang during > boot happens for all processors that use this clock source. > > drivers/clocksource/arm_arch_timer.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index f655036..95fb944 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -436,6 +436,9 @@ static void __init arch_counter_register(unsigned type) > cyclecounter.mult = clocksource_counter.mult; > cyclecounter.shift = clocksource_counter.shift; > timecounter_init(&timecounter, &cyclecounter, start_count); > + > + /* 56 bits minimum, so we assume worst case rollover */ > + sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate); > } > > static void arch_timer_stop(struct clock_event_device *clk) > @@ -515,15 +518,6 @@ static int __init arch_timer_register(void) > goto out; > } > > - clocksource_register_hz(&clocksource_counter, arch_timer_rate); > - cyclecounter.mult = clocksource_counter.mult; > - cyclecounter.shift = clocksource_counter.shift; > - timecounter_init(&timecounter, &cyclecounter, > - arch_counter_get_cntvct()); > - > - /* 56 bits minimum, so we assume worst case rollover */ > - sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate); > - > if (arch_timer_use_virtual) { > ppi = arch_timer_ppi[VIRT_PPI]; > err = request_percpu_irq(ppi, arch_timer_handler_virt,
next prev parent reply other threads:[~2013-10-15 16:51 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-15 13:31 [PATCH] arch_timer: Do not register arch_sys_counter twice Thierry Reding 2013-10-15 13:31 ` Thierry Reding [not found] ` <1381843911-31962-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2013-10-15 14:23 ` Will Deacon 2013-10-15 14:23 ` Will Deacon [not found] ` <20131015142313.GC850-MRww78TxoiP5vMa5CHWGZ34zcgK1vI+I0E9HWUfgJXw@public.gmane.org> 2013-10-15 15:03 ` Thierry Reding 2013-10-15 15:03 ` Thierry Reding [not found] ` <20131015150314.GA10535-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org> 2013-10-15 16:46 ` John Stultz 2013-10-15 16:46 ` John Stultz 2013-10-15 16:51 ` John Stultz [this message] 2013-10-15 16:51 ` John Stultz 2013-10-17 16:49 ` [tip:timers/core] clocksource: " tip-bot for Thierry Reding
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=525D7289.2010900@linaro.org \ --to=john.stultz-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \ --cc=daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \ --cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \ --cc=tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org \ --cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=will.deacon-5wv7dgnIgG8@public.gmane.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.