Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02a7cc3b authored by Thierry Reding's avatar Thierry Reding Committed by Michael Bohan
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarJohn 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: default avatarIngo Molnar <mingo@kernel.org>
Git-commit: 4a7d3e8a9939cf8073c247286d81cbe0ae48eba2
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parent 0139168a

drivers/clocksource/arm_arch_timer.c

+3 −9
Original line number Diff line number Diff line
@@ -459,6 +459,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 __cpuinit arch_timer_stop(struct clock_event_device *clk)
@@ -511,15 +514,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,