arm/arm64: arch_timer: Use archdata to indicate vdso suitability

Instead of comparing the name to a magic string, use archdata to
explicitly communicate whether the arch timer is suitable for
direct vdso access.

Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Scott Wood <oss@buserror.net>
Signed-off-by: Will Deacon <will.deacon@arm.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index eb5fb4121ac8..73c487da6d2a 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -602,23 +602,18 @@ static void __init arch_counter_register(unsigned type)
                 else
                         arch_timer_read_counter = arch_counter_get_cntpct;
 
+                clocksource_counter.archdata.vdso_direct = true;
+
 #ifdef CONFIG_FSL_ERRATUM_A008585
                 /*
                  * Don't use the vdso fastpath if errata require using
                  * the out-of-line counter accessor.
                  */
                 if (static_branch_unlikely(&arch_timer_read_ool_enabled))
-                        clocksource_counter.name = "arch_sys_counter_ool";
+                        clocksource_counter.archdata.vdso_direct = false;
 #endif
         } else {
                 arch_timer_read_counter = arch_counter_get_cntvct_mem;
-
-                /* If the clocksource name is "arch_sys_counter" the
-                 * VDSO will attempt to read the CP15-based counter.
-                 * Ensure this does not happen when CP15-based
-                 * counter is not available.
-                 */
-                clocksource_counter.name = "arch_mem_counter";
         }
 
         start_count = arch_timer_read_counter();