Commit ff125fbc authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/time: Make mftb() common to PPC32 and PPC64 



No need to have two versions that are identical.

CONFIG_PPC_CELL is only selected by PPC64 targets.
CONFIG_E500 is the only PPC64 target selecting CONFIG_FSL_BOOK3E.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/6bf23ec744aab4ba63506a011f6a145ea35d620d.1601556145.git.christophe.leroy@csgroup.eu
parent 15c10215

arch/powerpc/include/asm/reg.h

+4 −10
Original line number Diff line number Diff line
@@ -1419,8 +1419,7 @@ static inline void msr_check_and_clear(unsigned long bits) 
		__msr_check_and_clear(bits);

}



#ifdef __powerpc64__

#if defined(CONFIG_PPC_CELL) || defined(CONFIG_PPC_FSL_BOOK3E)

#if defined(CONFIG_PPC_CELL) || defined(CONFIG_E500)

#define mftb()		({unsigned long rval;				\

			asm volatile(					\

				"90:	mfspr %0, %2;\n"		\
@@ -1430,28 +1429,23 @@ static inline void msr_check_and_clear(unsigned long bits) 
			: "=r" (rval) \

			: "i" (CPU_FTR_CELL_TB_BUG), "i" (SPRN_TBRL) : "cr0"); \

			rval;})

#elif defined(CONFIG_PPC_8xx)

#define mftb()		({unsigned long rval;	\

			asm volatile("mftbl %0" : "=r" (rval)); rval;})

#else

#define mftb()		({unsigned long rval;	\

			asm volatile("mfspr %0, %1" : \

				     "=r" (rval) : "i" (SPRN_TBRL)); rval;})

#endif /* !CONFIG_PPC_CELL */



#else /* __powerpc64__ */



#if defined(CONFIG_PPC_8xx)

#define mftb()		({unsigned long rval;	\

			asm volatile("mftbl %0" : "=r" (rval)); rval;})

#define mftbu()		({unsigned long rval;	\

			asm volatile("mftbu %0" : "=r" (rval)); rval;})

#else

#define mftb()		({unsigned long rval;	\

			asm volatile("mfspr %0, %1" : "=r" (rval) : \

				"i" (SPRN_TBRL)); rval;})

#define mftbu()		({unsigned long rval;	\

			asm volatile("mfspr %0, %1" : "=r" (rval) : \

				"i" (SPRN_TBRU)); rval;})

#endif

#endif /* !__powerpc64__ */



#define mttbl(v)	asm volatile("mttbl %0":: "r"(v))

#define mttbu(v)	asm volatile("mttbu %0":: "r"(v))

CRA Git | Maintained and supported by SUSTech CRA and CCSE