diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-10-20 14:37:05 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-25 11:54:18 +1000 |
| commit | 859deea949c382d9ccb6397fe33df3703ecef45d (patch) | |
| tree | b0fe2d7a814143f3ff61a73a0727522a1a3dd6e4 /include/asm-powerpc/timex.h | |
| parent | 21c4ff80cba5e24932f3ef79c8482c0491630b2b (diff) | |
| download | linux-859deea949c382d9ccb6397fe33df3703ecef45d.tar.gz linux-859deea949c382d9ccb6397fe33df3703ecef45d.tar.bz2 linux-859deea949c382d9ccb6397fe33df3703ecef45d.zip | |
[POWERPC] Cell timebase bug workaround
The Cell CPU timebase has an erratum. When reading the entire 64 bits
of the timebase with one mftb instruction, there is a handful of cycles
window during which one might read a value with the low order 32 bits
already reset to 0x00000000 but the high order bits not yet incremeted
by one. This fixes it by reading the timebase again until the low order
32 bits is no longer 0. That might introduce occasional latencies if
hitting mftb just at the wrong time, but no more than 70ns on a cell
blade, and that was considered acceptable.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/timex.h')
| -rw-r--r-- | include/asm-powerpc/timex.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/asm-powerpc/timex.h b/include/asm-powerpc/timex.h index e3f08cf91486..92dedde761d1 100644 --- a/include/asm-powerpc/timex.h +++ b/include/asm-powerpc/timex.h @@ -8,6 +8,7 @@ */ #include <asm/cputable.h> +#include <asm/reg.h> #define CLOCK_TICK_RATE 1024000 /* Underlying HZ */ @@ -15,13 +16,11 @@ typedef unsigned long cycles_t; static inline cycles_t get_cycles(void) { - cycles_t ret; - #ifdef __powerpc64__ - - __asm__ __volatile__("mftb %0" : "=r" (ret) : ); - + return mftb(); #else + cycles_t ret; + /* * For the "cycle" counter we use the timebase lower half. * Currently only used on SMP. @@ -41,9 +40,8 @@ static inline cycles_t get_cycles(void) " .long 99b-98b\n" ".previous" : "=r" (ret) : "i" (CPU_FTR_601)); -#endif - return ret; +#endif } #endif /* __KERNEL__ */ |