fio: Eliminate compilation warning in ppc

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

diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h
index e73093df86f5f25ed68c44e4e3662d1ab3210891..d4a080c4e91f31050404cab8c61b6d23bbe7f371 100644 (file)
--- a/arch/arch-ppc.h
+++ b/arch/arch-ppc.h
@@ -1,5 +1,10 @@
 #ifndef ARCH_PPC_H
-#define ARCH_PPH_H
+#define ARCH_PPC_H
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #define FIO_ARCH       (arch_ppc)
 
@@ -43,30 +48,86 @@ static inline int arch_ffz(unsigned long bitmask)
        return  __ilog2(bitmask & -bitmask);
 }
 
+static inline unsigned int mfspr(unsigned int reg)
+{
+       unsigned int val;
+
+       asm volatile("mfspr %0,%1": "=r" (val) : "K" (reg));
+       return val;
+}
+
+#define SPRN_TBRL  0x10C /* Time Base Register Lower */
+#define SPRN_TBRU  0x10D /* Time Base Register Upper */
+#define SPRN_ATBL  0x20E /* Alternate Time Base Lower */
+#define SPRN_ATBU  0x20F /* Alternate Time Base Upper */
+
 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));
+               if (arch_flags & ARCH_FLAG_1) {
+                       tbu0 = mfspr(SPRN_ATBU);
+                       tbl = mfspr(SPRN_ATBL);
+                       tbu1 = mfspr(SPRN_ATBU);
+               } else {
+                       tbu0 = mfspr(SPRN_TBRU);
+                       tbl = mfspr(SPRN_TBRL);
+                       tbu1 = mfspr(SPRN_TBRU);
+               }
        } while (tbu0 != tbu1);
 
        ret = (((unsigned long long)tbu0) << 32) | tbl;
        return ret;
 }
 
+#if 0
+static void atb_child(void)
+{
+       arch_flags |= ARCH_FLAG_1;
+       get_cpu_clock();
+       _exit(0);
+}
+
+static void atb_clocktest(void)
+{
+       pid_t pid;
+
+       pid = fork();
+       if (!pid)
+               atb_child();
+       else if (pid != -1) {
+               int status;
+
+               pid = wait(&status);
+               if (pid == -1 || !WIFEXITED(status))
+                       arch_flags &= ~ARCH_FLAG_1;
+               else
+                       arch_flags |= ARCH_FLAG_1;
+       }
+}
+#endif
+
 #define ARCH_HAVE_INIT
 extern int tsc_reliable;
+
 static inline int arch_init(char *envp[])
 {
+#if 0
        tsc_reliable = 1;
+       atb_clocktest();
+#endif
        return 0;
 }
 
 #define ARCH_HAVE_FFZ
-#define ARCH_HAVE_CPU_CLOCK
+
+/*
+ * We don't have it on all platforms, lets comment this out until we
+ * can handle it more intelligently.
+ *
+ * #define ARCH_HAVE_CPU_CLOCK
+ */
 
 #endif