X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-ppc.h;h=804d596aecc632cb27f547c90a5b2b997ef79b42;hb=4b34a0ebcc434df76721c5f6fb68bed2229fba30;hp=751762750dd5081b5710466b0d4b3c9b6d60b353;hpb=4247d1a9a27b6a23092a2c75e94e0545ad6a3376;p=fio.git

diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h
index 75176275..804d596a 100644
--- a/arch/arch-ppc.h
+++ b/arch/arch-ppc.h
@@ -1,5 +1,5 @@
 #ifndef ARCH_PPC_H
-#define ARCH_PPH_H
+#define ARCH_PPC_H
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -8,21 +8,6 @@
 
 #define FIO_ARCH	(arch_ppc)
 
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set		273
-#define __NR_ioprio_get		274
-#endif
-
-#ifndef __NR_fadvise64
-#define __NR_fadvise64		233
-#endif
-
-#ifndef __NR_sys_splice
-#define __NR_sys_splice		283
-#define __NR_sys_tee		284
-#define __NR_sys_vmsplice	285
-#endif
-
 #define nop	do { } while (0)
 
 #ifdef __powerpc64__
@@ -33,18 +18,24 @@
 
 #define write_barrier()	__asm__ __volatile__ ("sync" : : : "memory")
 
+#ifdef __powerpc64__
+#define PPC_CNTLZL "cntlzd"
+#else
+#define PPC_CNTLZL "cntlzw"
+#endif
+
 static inline int __ilog2(unsigned long bitmask)
 {
 	int lz;
 
-	asm ("cntlzw %0,%1" : "=r" (lz) : "r" (bitmask));
-	return 31 - lz;
+	asm (PPC_CNTLZL " %0,%1" : "=r" (lz) : "r" (bitmask));
+	return BITS_PER_LONG - 1 - lz;
 }
 
 static inline int arch_ffz(unsigned long bitmask)
 {
 	if ((bitmask = ~bitmask) == 0)
-		return 32;
+		return BITS_PER_LONG;
 	return  __ilog2(bitmask & -bitmask);
 }
 
@@ -61,6 +52,22 @@ static inline unsigned int mfspr(unsigned int reg)
 #define SPRN_ATBL  0x20E /* Alternate Time Base Lower */
 #define SPRN_ATBU  0x20F /* Alternate Time Base Upper */
 
+#ifdef __powerpc64__
+static inline unsigned long long get_cpu_clock(void)
+{
+	unsigned long long rval;
+
+	asm volatile(
+		"90:	mfspr %0, %1;\n"
+		"	cmpwi %0,0;\n"
+		"	beq-  90b;\n"
+	: "=r" (rval)
+	: "i" (SPRN_TBRL)
+	: "cr0");
+
+	return rval;
+}
+#else
 static inline unsigned long long get_cpu_clock(void)
 {
 	unsigned int tbl, tbu0, tbu1;
@@ -72,16 +79,18 @@ static inline unsigned long long get_cpu_clock(void)
 			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));
+			tbu0 = mfspr(SPRN_TBRU);
+			tbl = mfspr(SPRN_TBRL);
+			tbu1 = mfspr(SPRN_TBRU);
 		}
 	} while (tbu0 != tbu1);
 
 	ret = (((unsigned long long)tbu0) << 32) | tbl;
 	return ret;
 }
+#endif
 
+#if 0
 static void atb_child(void)
 {
 	arch_flags |= ARCH_FLAG_1;
@@ -96,28 +105,45 @@ static void atb_clocktest(void)
 	pid = fork();
 	if (!pid)
 		atb_child();
-	else {
+	else if (pid != -1) {
 		int status;
 
-		wait(&status);
-		if (!WIFEXITED(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;
+extern bool tsc_reliable;
 
 static inline int arch_init(char *envp[])
 {
-	tsc_reliable = 1;
+#if 0
+	tsc_reliable = true;
 	atb_clocktest();
+#endif
 	return 0;
 }
 
 #define ARCH_HAVE_FFZ
+
+/*
+ * We don't have it on all platforms, lets comment this out until we
+ * can handle it more intelligently.
+ *
+ * #define ARCH_HAVE_CPU_CLOCK
+ */
+
+/*
+ * Let's have it defined for ppc64
+ */
+
+#ifdef __powerpc64__
 #define ARCH_HAVE_CPU_CLOCK
+#endif
 
 #endif