timer: Avoid masking EVENTEN bit in CNTKCTL register

Will Deacon has a better solution and his patch should
be coming in soon.  In the mean time please consider for inclusion.

This is an in-between solution that prevents the EVENTEN bit in
the CNTKCTL register from being mask, resulting in events between
clusters being lost.

Bug: LP1188778

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>

diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index 7c1bfc0aea0c200a268ec82c62fd4cb624c17ecf..4928cdacedf0169324f2aa6bd36cc2bfef869cf0 100644 (file)
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -105,7 +105,7 @@ static inline void __cpuinit arch_counter_set_user_access(void)
        asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl));
 
        /* disable user access to everything */
-       cntkctl &= ~((3 << 8) | (7 << 0));
+       cntkctl &= ~((3 << 8) | (3 << 0));
 
        asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
 }