Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clocksource: arm_arch_timer: Change clocksource name if CP15 unavailable

The arm and arm64 VDSOs need CP15 access to the architected counter.
If this is unavailable (which is allowed by ARM v7), indicate this by
changing the clocksource name to "arch_mem_counter" before registering
the clocksource.

Suggested by Stephen Boyd.

Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>

authored by

Nathan Lynch and committed by
Daniel Lezcano
423bd69e 28cf3567

+10 -2
+10 -2
drivers/clocksource/arm_arch_timer.c
··· 429 429 u64 start_count; 430 430 431 431 /* Register the CP15 based counter if we have one */ 432 - if (type & ARCH_CP15_TIMER) 432 + if (type & ARCH_CP15_TIMER) { 433 433 arch_timer_read_counter = arch_counter_get_cntvct; 434 - else 434 + } else { 435 435 arch_timer_read_counter = arch_counter_get_cntvct_mem; 436 + 437 + /* If the clocksource name is "arch_sys_counter" the 438 + * VDSO will attempt to read the CP15-based counter. 439 + * Ensure this does not happen when CP15-based 440 + * counter is not available. 441 + */ 442 + clocksource_counter.name = "arch_mem_counter"; 443 + } 436 444 437 445 start_count = arch_timer_read_counter(); 438 446 clocksource_register_hz(&clocksource_counter, arch_timer_rate);