From: Mathieu J. Poirier Date: Tue, 11 Jun 2013 23:07:50 +0000 (-0600) Subject: timer: Avoid masking EVENTEN bit in CNTKCTL register X-Git-Tag: firefly_0821_release~3680^2~236^2^2~9^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=49428cc5c3413d8a955923e55c36515e02426d8a;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Sudeep KarkadaNagesha --- diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h index 7c1bfc0aea0c..4928cdacedf0 100644 --- 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)); }