From: Steven Noonan <steven@uplinklabs.net>
Date: Thu, 28 Feb 2013 19:08:06 +0000 (+0100)
Subject: powerpc: use mfspr for Time Base Register reads
X-Git-Tag: fio-2.0.15~47
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f2dc46ad091681a0746aacef900d3974f05d9fc9;p=fio.git

powerpc: use mfspr for Time Base Register reads

The 'mftb' and 'mftbu' instructions are deprecated in Power ISA v2.06 in favor
of mfspr. Since CPUs supporting mftb/mftbu also support the TBR SPRs, there's
no known reason to keep mftb/mftbu.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h
index 0cc0cbda..65e6b74a 100644
--- a/arch/arch-ppc.h
+++ b/arch/arch-ppc.h
@@ -72,9 +72,9 @@ 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);