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

diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h
index e73093df86f5f25ed68c44e4e3662d1ab3210891..0cc0cbda7d69890e10ff41816d836b4189684963 100644 (file)
--- a/arch/arch-ppc.h
+++ b/arch/arch-ppc.h
@@ -1,6 +1,11 @@
 #ifndef ARCH_PPC_H
 #define ARCH_PPH_H
 
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
 #define FIO_ARCH       (arch_ppc)
 
 #ifndef __NR_ioprio_set
@@ -43,26 +48,72 @@ 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 {
+                       __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;
 }
 
+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;
+       }
+}
+
 #define ARCH_HAVE_INIT
 extern int tsc_reliable;
+
 static inline int arch_init(char *envp[])
 {
        tsc_reliable = 1;
+       atb_clocktest();
        return 0;
 }
 

diff --git a/arch/arch.h b/arch/arch.h
index 4165c9f95dba610951dd72c7e81f3af4ec8021c5..31d96d403167dd3435b6f9e66e68a055f605e7b6 100644 (file)
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -27,6 +27,8 @@ enum {
        ARCH_FLAG_4     = 1 << 3,
 };
 
+extern unsigned long arch_flags;
+
 #if defined(__i386__)
 #include "arch-x86.h"
 #elif defined(__x86_64__)

diff --git a/gettime.c b/gettime.c
index 660ba4c8864ddfbe1147fe84eb213e1309462bad..4c998e5ff89f1dc72503f01f2552cdde78538437 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -497,7 +497,8 @@ static void *clock_thread_fn(void *data)
                c->tsc = tsc;
        }
 
-       log_info("cs: cpu%3d: %lu clocks seen\n", t->cpu, t->entries[i - 1].tsc - t->entries[0].tsc);
+       log_info("cs: cpu%3d: %llu clocks seen\n", t->cpu,
+               (unsigned long long) t->entries[i - 1].tsc - t->entries[0].tsc);
 
        /*
         * The most common platform clock breakage is returning zero