* [PATCH] arch_timer: Do not register arch_sys_counter twice @ 2013-10-15 13:31 ` Thierry Reding 0 siblings, 0 replies; 11+ messages in thread From: Thierry Reding @ 2013-10-15 13:31 UTC (permalink / raw) To: Daniel Lezcano, Thomas Gleixner, Ingo Molnar Cc: Stephen Boyd, Will Deacon, John Stultz, Stephen Warren, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-tegra-u79uwXL29TY76Z2rM5mHXA 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> --- 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, -- 1.8.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH] arch_timer: Do not register arch_sys_counter twice @ 2013-10-15 13:31 ` Thierry Reding 0 siblings, 0 replies; 11+ messages in thread From: Thierry Reding @ 2013-10-15 13:31 UTC (permalink / raw) To: linux-arm-kernel 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> --- 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, -- 1.8.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
[parent not found: <1381843911-31962-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH] arch_timer: Do not register arch_sys_counter twice 2013-10-15 13:31 ` Thierry Reding @ 2013-10-15 14:23 ` Will Deacon -1 siblings, 0 replies; 11+ messages in thread From: Will Deacon @ 2013-10-15 14:23 UTC (permalink / raw) To: Thierry Reding Cc: Daniel Lezcano, Thomas Gleixner, Ingo Molnar, Stephen Boyd, John Stultz, Stephen Warren, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On Tue, Oct 15, 2013 at 02:31:51PM +0100, 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> > --- > 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, Excuse my ignorance, but I'm failing to apply either this patch or the one that Stephen Boyd proposed: http://lists.infradead.org/pipermail/linux-arm-kernel/2013-October/204665.html The second hunk (deletions) doesn't apply at all, and if I just apply the first hunk then things won't compile. Which tree is this against? Will ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] arch_timer: Do not register arch_sys_counter twice @ 2013-10-15 14:23 ` Will Deacon 0 siblings, 0 replies; 11+ messages in thread From: Will Deacon @ 2013-10-15 14:23 UTC (permalink / raw) To: linux-arm-kernel On Tue, Oct 15, 2013 at 02:31:51PM +0100, 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> > --- > 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, Excuse my ignorance, but I'm failing to apply either this patch or the one that Stephen Boyd proposed: http://lists.infradead.org/pipermail/linux-arm-kernel/2013-October/204665.html The second hunk (deletions) doesn't apply at all, and if I just apply the first hunk then things won't compile. Which tree is this against? Will ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20131015142313.GC850-MRww78TxoiP5vMa5CHWGZ34zcgK1vI+I0E9HWUfgJXw@public.gmane.org>]
* Re: [PATCH] arch_timer: Do not register arch_sys_counter twice 2013-10-15 14:23 ` Will Deacon @ 2013-10-15 15:03 ` Thierry Reding -1 siblings, 0 replies; 11+ messages in thread From: Thierry Reding @ 2013-10-15 15:03 UTC (permalink / raw) To: Will Deacon Cc: Daniel Lezcano, Thomas Gleixner, Ingo Molnar, Stephen Boyd, John Stultz, Stephen Warren, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org [-- Attachment #1: Type: text/plain, Size: 3511 bytes --] On Tue, Oct 15, 2013 at 03:23:14PM +0100, Will Deacon wrote: > On Tue, Oct 15, 2013 at 02:31:51PM +0100, 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> > > --- > > 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, > > Excuse my ignorance, but I'm failing to apply either this patch or the one > that Stephen Boyd proposed: > > http://lists.infradead.org/pipermail/linux-arm-kernel/2013-October/204665.html Hehe, that patch is exactly the same as this one. =) > The second hunk (deletions) doesn't apply at all, and if I just apply the > first hunk then things won't compile. Which tree is this against? This is on top of today's linux-next[0] and will probably apply to yesterday's linux-next too. I think that perhaps the patch or the one that Stephen proposed himself should be squashed with the original because that caused the breakage in the first place. From what I gather from the mailing thread you linked to above it seems like John took an earlier patch from Stephen and rebased it on top of something more recent and that didn't work out as expected. Ingo, any chance you could take this patch and squash it into the patch mentioned above? Applying it as a separate fix will break bisectability inbetween both patches. Thierry [0]: git://gitorious.org/thierryreding/linux-next.git [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] arch_timer: Do not register arch_sys_counter twice @ 2013-10-15 15:03 ` Thierry Reding 0 siblings, 0 replies; 11+ messages in thread From: Thierry Reding @ 2013-10-15 15:03 UTC (permalink / raw) To: linux-arm-kernel On Tue, Oct 15, 2013 at 03:23:14PM +0100, Will Deacon wrote: > On Tue, Oct 15, 2013 at 02:31:51PM +0100, 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> > > --- > > 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, > > Excuse my ignorance, but I'm failing to apply either this patch or the one > that Stephen Boyd proposed: > > http://lists.infradead.org/pipermail/linux-arm-kernel/2013-October/204665.html Hehe, that patch is exactly the same as this one. =) > The second hunk (deletions) doesn't apply at all, and if I just apply the > first hunk then things won't compile. Which tree is this against? This is on top of today's linux-next[0] and will probably apply to yesterday's linux-next too. I think that perhaps the patch or the one that Stephen proposed himself should be squashed with the original because that caused the breakage in the first place. From what I gather from the mailing thread you linked to above it seems like John took an earlier patch from Stephen and rebased it on top of something more recent and that didn't work out as expected. Ingo, any chance you could take this patch and squash it into the patch mentioned above? Applying it as a separate fix will break bisectability inbetween both patches. Thierry [0]: git://gitorious.org/thierryreding/linux-next.git -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131015/cab67725/attachment.sig> ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20131015150314.GA10535-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>]
* Re: [PATCH] arch_timer: Do not register arch_sys_counter twice 2013-10-15 15:03 ` Thierry Reding @ 2013-10-15 16:46 ` John Stultz -1 siblings, 0 replies; 11+ messages in thread From: John Stultz @ 2013-10-15 16:46 UTC (permalink / raw) To: Thierry Reding, Will Deacon Cc: Daniel Lezcano, Thomas Gleixner, Ingo Molnar, Stephen Boyd, Stephen Warren, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On 10/15/2013 08:03 AM, Thierry Reding wrote: > On Tue, Oct 15, 2013 at 03:23:14PM +0100, Will Deacon wrote: >> On Tue, Oct 15, 2013 at 02:31:51PM +0100, 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> >>> --- >>> 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, >> >> Excuse my ignorance, but I'm failing to apply either this patch or the one >> that Stephen Boyd proposed: >> >> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-October/204665.html > > Hehe, that patch is exactly the same as this one. =) > >> The second hunk (deletions) doesn't apply at all, and if I just apply the >> first hunk then things won't compile. Which tree is this against? The problem is from my merge to -tip. > > This is on top of today's linux-next[0] and will probably apply to > yesterday's linux-next too. I think that perhaps the patch or the one > that Stephen proposed himself should be squashed with the original > because that caused the breakage in the first place. From what I gather > from the mailing thread you linked to above it seems like John took an > earlier patch from Stephen and rebased it on top of something more > recent and that didn't work out as expected. Yes, again my apologies. When I applied Stephen's original patch to the recent tree, I mis-resolved the conflict. > Ingo, any chance you could take this patch and squash it into the patch > mentioned above? Applying it as a separate fix will break bisectability > inbetween both patches. I suspect Ingo won't squish down the fix onto the misresolved patch, since -tip usually preserves history. But hopefully we can get this merged quickly. Again, sorry for the trouble! -john ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] arch_timer: Do not register arch_sys_counter twice @ 2013-10-15 16:46 ` John Stultz 0 siblings, 0 replies; 11+ messages in thread From: John Stultz @ 2013-10-15 16:46 UTC (permalink / raw) To: linux-arm-kernel On 10/15/2013 08:03 AM, Thierry Reding wrote: > On Tue, Oct 15, 2013 at 03:23:14PM +0100, Will Deacon wrote: >> On Tue, Oct 15, 2013 at 02:31:51PM +0100, 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> >>> --- >>> 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, >> >> Excuse my ignorance, but I'm failing to apply either this patch or the one >> that Stephen Boyd proposed: >> >> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-October/204665.html > > Hehe, that patch is exactly the same as this one. =) > >> The second hunk (deletions) doesn't apply at all, and if I just apply the >> first hunk then things won't compile. Which tree is this against? The problem is from my merge to -tip. > > This is on top of today's linux-next[0] and will probably apply to > yesterday's linux-next too. I think that perhaps the patch or the one > that Stephen proposed himself should be squashed with the original > because that caused the breakage in the first place. From what I gather > from the mailing thread you linked to above it seems like John took an > earlier patch from Stephen and rebased it on top of something more > recent and that didn't work out as expected. Yes, again my apologies. When I applied Stephen's original patch to the recent tree, I mis-resolved the conflict. > Ingo, any chance you could take this patch and squash it into the patch > mentioned above? Applying it as a separate fix will break bisectability > inbetween both patches. I suspect Ingo won't squish down the fix onto the misresolved patch, since -tip usually preserves history. But hopefully we can get this merged quickly. Again, sorry for the trouble! -john ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] arch_timer: Do not register arch_sys_counter twice 2013-10-15 13:31 ` Thierry Reding @ 2013-10-15 16:51 ` John Stultz -1 siblings, 0 replies; 11+ messages in thread From: John Stultz @ 2013-10-15 16:51 UTC (permalink / raw) To: Thierry Reding, Daniel Lezcano, Thomas Gleixner, Ingo Molnar Cc: Stephen Boyd, Will Deacon, Stephen Warren, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-tegra-u79uwXL29TY76Z2rM5mHXA 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, ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] arch_timer: Do not register arch_sys_counter twice @ 2013-10-15 16:51 ` John Stultz 0 siblings, 0 replies; 11+ messages in thread From: John Stultz @ 2013-10-15 16:51 UTC (permalink / raw) To: linux-arm-kernel 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, ^ permalink raw reply [flat|nested] 11+ messages in thread
* [tip:timers/core] clocksource: arch_timer: Do not register arch_sys_counter twice 2013-10-15 13:31 ` Thierry Reding (?) (?) @ 2013-10-17 16:49 ` tip-bot for Thierry Reding -1 siblings, 0 replies; 11+ messages in thread From: tip-bot for Thierry Reding @ 2013-10-17 16:49 UTC (permalink / raw) To: linux-tip-commits Cc: linux-kernel, swarren, thierry.reding, hpa, mingo, will.deacon, treding, sboyd, john.stultz, tglx, daniel.lezcano Commit-ID: 4a7d3e8a9939cf8073c247286d81cbe0ae48eba2 Gitweb: http://git.kernel.org/tip/4a7d3e8a9939cf8073c247286d81cbe0ae48eba2 Author: Thierry Reding <thierry.reding@gmail.com> AuthorDate: Tue, 15 Oct 2013 15:31:51 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Wed, 16 Oct 2013 08:30:03 +0200 clocksource: arch_timer: Do not register arch_sys_counter twice 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). [ While I've only tested this on Tegra114, I suspect the same hang during boot happens for all processors that use this clock source. ] Signed-off-by: Thierry Reding <treding@nvidia.com> Acked-by: John Stultz <john.stultz@linaro.org> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Will Deacon <will.deacon@arm.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: linux-arm-kernel@lists.infradead.org Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Link: http://lkml.kernel.org/r/1381843911-31962-1-git-send-email-treding@nvidia.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- 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, ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-10-17 16:49 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2013-10-15 16:51 ` John Stultz
2013-10-17 16:49 ` [tip:timers/core] clocksource: " tip-bot for Thierry Reding
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.