Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

[fio.git] / arch / arch-ppc.h

diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h
index 0a23c01a56d2c07325930c433e50c6dded20d949..d495a1b21aff4df9e4bd16c71f47435c04fa88dc 100644 (file)
--- a/arch/arch-ppc.h
+++ b/arch/arch-ppc.h
@@ -20,6 +20,14 @@
 
 #define nop    do { } while (0)
 
+#ifdef __powerpc64__
+#define read_barrier() __asm__ __volatile__ ("lwsync" : : : "memory")
+#else
+#define read_barrier() __asm__ __volatile__ ("sync" : : : "memory")
+#endif
+
+#define write_barrier()        __asm__ __volatile__ ("sync" : : : "memory")
+
 static inline int __ilog2(unsigned long bitmask)
 {
        int lz;
@@ -28,11 +36,29 @@ static inline int __ilog2(unsigned long bitmask)
        return 31 - lz;
 }
 
-static inline int fio_ffz(unsigned long bitmask)
+static inline int arch_ffz(unsigned long bitmask)
 {
        if ((bitmask = ~bitmask) == 0)
                return 32;
        return  __ilog2(bitmask & -bitmask);
 }
 
+static inline unsigned long long get_cpu_clock(void)
+{
+       unsigned int tbl, tbu0, tbu1;
+       unsigned long long ret;
+
+       do {
+               __asm__ __volatile__ ("mftbu %0" : "=r"(tbu0));
+               __asm__ __volatile__ ("mftb %0"  : "=r"(tbl) );
+               __asm__ __volatile__ ("mftbu %0" : "=r"(tbu1));
+       } while (tbu0 != tbu1);
+
+       ret = (((unsigned long long)tbu0) << 32) | tbl;
+       return ret;
+}
+
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
+
 #endif