X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch-ppc.h;h=0f2037550da32f85041ed2a720878fdbcd1fa383;hp=4839122e9328688a486aaff57b83ddcbcfbbafa5;hb=9ff1c070210a697c599abd1019737d79cd3351e6;hpb=69ebbd397e80b23ec4281c99e9f7242a089cc771

diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h
index 4839122e..0f203755 100644
--- a/arch/arch-ppc.h
+++ b/arch/arch-ppc.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_PPC_H
 #define ARCH_PPH_H
 
-#define ARCH	(arch_ppc)
+#define FIO_ARCH	(arch_ppc)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set		273
@@ -42,40 +42,30 @@ static inline int arch_ffz(unsigned long bitmask)
 		return 32;
 	return  __ilog2(bitmask & -bitmask);
 }
-#define ARCH_HAVE_FFZ
-
-typedef struct {
-	volatile unsigned int lock;
-} spinlock_t;
 
-static inline void spin_trylock(spinlock_t *lock)
+static inline unsigned long long get_cpu_clock(void)
 {
-	unsigned long tmp;
-
-	__asm__ __volatile__(
-		"1:     lwarx           %0,0,%2\n\
-		cmpwi           0,%0,0\n\
-		bne-            2f\n\
-		stwcx.          1,0,%2\n\
-		bne-            1b\n\
-		isync\n\
-		2:"     : "=&r" (tmp)
-		: (&lock->lock)
-		: "cr0", "memory");
-
-	return tmp;
-}
+	unsigned int tbl, tbu0, tbu1;
+	unsigned long long ret;
 
-static inline void spin_lock(spinlock_t *lock)
-{
-	while (spin_trylock(lock))
-		;
+	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;
 }
 
-static inline void spin_unlock(spinlock_t *lock)
+#define ARCH_HAVE_INIT
+extern int tsc_reliable;
+static inline int arch_init(char *envp[])
 {
-	read_barrier();
-	lock->lock = 0;
+	tsc_reliable = 1;
 }
 
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
+
 #endif