Commit 2cf2ff9f authored by Matthew Leach's avatar Matthew Leach Committed by Daniel Lezcano

clocksource: arm_global_timer: Only check for unusable timer on A9

The check for a usable global timer in the probe code does not enquire
which CPU we are currently running on. This can cause the driver to
incorrectly assume we have an unusable global timer if we are running
on a CPU other than A9.

Before checking the CPU revision, ensure we are running on an A9 CPU.
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarMatthew Leach <matthew.leach@arm.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent a798c10f
...@@ -246,11 +246,12 @@ static void __init global_timer_of_register(struct device_node *np) ...@@ -246,11 +246,12 @@ static void __init global_timer_of_register(struct device_node *np)
int err = 0; int err = 0;
/* /*
* In r2p0 the comparators for each processor with the global timer * In A9 r2p0 the comparators for each processor with the global timer
* fire when the timer value is greater than or equal to. In previous * fire when the timer value is greater than or equal to. In previous
* revisions the comparators fired when the timer value was equal to. * revisions the comparators fired when the timer value was equal to.
*/ */
if ((read_cpuid_id() & 0xf0000f) < 0x200000) { if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9
&& (read_cpuid_id() & 0xf0000f) < 0x200000) {
pr_warn("global-timer: non support for this cpu version.\n"); pr_warn("global-timer: non support for this cpu version.\n");
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment