From 69c38bb41ac43df9aecfc42664e64e72177411d8 Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Fri, 11 Jan 2013 14:32:33 +0000 Subject: [PATCH] --- yaml --- r: 355822 b: refs/heads/master c: 45801042225c66a66fb2cb50fae6ff71883a99d6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/arch_timer.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a35a4a0b9fb1..ffa338fcf966 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec944c93a293bee6b4cc6b6f1c9560526c7ed635 +refs/heads/master: 45801042225c66a66fb2cb50fae6ff71883a99d6 diff --git a/trunk/arch/arm/include/asm/arch_timer.h b/trunk/arch/arm/include/asm/arch_timer.h index db0fdc4cc9cc..75975d9efd3f 100644 --- a/trunk/arch/arm/include/asm/arch_timer.h +++ b/trunk/arch/arm/include/asm/arch_timer.h @@ -49,6 +49,8 @@ static inline void arch_timer_reg_write(const int access, const int reg, u32 val break; } } + + isb(); } static inline u32 arch_timer_reg_read(const int access, const int reg) @@ -91,6 +93,7 @@ static inline u64 arch_counter_get_cntpct(void) { u64 cval; + isb(); asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (cval)); return cval; } @@ -99,6 +102,7 @@ static inline u64 arch_counter_get_cntvct(void) { u64 cval; + isb(); asm volatile("mrrc p15, 1, %Q0, %R0, c14" : "=r" (cval)); return cval; }