mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-08 09:39:40 +00:00
ae2163be10
Commit beb2dc0a7a breaks the MPC8xx which
seems to not support using mfspr SPRN_TBRx instead of mftb/mftbu
despite what is written in the reference manual.
This patch reverts to the use of mftb/mftbu when CONFIG_8xx is
selected.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <scottwood@freescale.com>
58 lines
962 B
C
58 lines
962 B
C
#ifndef _ASM_POWERPC_TIMEX_H
|
|
#define _ASM_POWERPC_TIMEX_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/*
|
|
* PowerPC architecture timex specifications
|
|
*/
|
|
|
|
#include <asm/cputable.h>
|
|
#include <asm/reg.h>
|
|
|
|
#define CLOCK_TICK_RATE 1024000 /* Underlying HZ */
|
|
|
|
typedef unsigned long cycles_t;
|
|
|
|
static inline cycles_t get_cycles(void)
|
|
{
|
|
#ifdef __powerpc64__
|
|
return mftb();
|
|
#else
|
|
cycles_t ret;
|
|
|
|
/*
|
|
* For the "cycle" counter we use the timebase lower half.
|
|
* Currently only used on SMP.
|
|
*/
|
|
|
|
ret = 0;
|
|
|
|
__asm__ __volatile__(
|
|
#ifdef CONFIG_8xx
|
|
"97: mftb %0\n"
|
|
#else
|
|
"97: mfspr %0, %2\n"
|
|
#endif
|
|
"99:\n"
|
|
".section __ftr_fixup,\"a\"\n"
|
|
".align 2\n"
|
|
"98:\n"
|
|
" .long %1\n"
|
|
" .long 0\n"
|
|
" .long 97b-98b\n"
|
|
" .long 99b-98b\n"
|
|
" .long 0\n"
|
|
" .long 0\n"
|
|
".previous"
|
|
#ifdef CONFIG_8xx
|
|
: "=r" (ret) : "i" (CPU_FTR_601));
|
|
#else
|
|
: "=r" (ret) : "i" (CPU_FTR_601), "i" (SPRN_TBRL));
|
|
#endif
|
|
return ret;
|
|
#endif
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _ASM_POWERPC_TIMEX_H */
|