mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

powerpc/time: Avoid using get_tbl() and get_tbu() internally

Browse source 
get_tbl() is confusing as it returns the content of TBL register
on PPC32 but the concatenation of TBL and TBU on PPC64.

Use mftb() instead.

Do the same with get_tbu() for consistency allthough it's name
is less confusing.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/41573406a4eab98838decaa91649086fef1e6119.1601556145.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2020-10-01 12:42:41 +00:00 committed by Michael Ellerman
parent ff125fbcd4
commit 942e89115b
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/include/asm/delay.h
View file

@ -54,7 +54,7 @@ extern void udelay(unsigned long usecs);
({ \
typeof(condition) __ret; \
unsigned long __loops = tb_ticks_per_usec * timeout; \
unsigned long __start = get_tbl(); \
unsigned long __start = mftb(); \
\
if (delay) { \
while (!(__ret = (condition)) && \

8
arch/powerpc/include/asm/time.h
View file

@ -76,9 +76,9 @@ static inline u64 get_tb(void)
unsigned int tbhi, tblo, tbhi2;
do {
tbhi = get_tbu();
tblo = get_tbl();
tbhi2 = get_tbu();
tbhi = mftbu();
tblo = mftb();
tbhi2 = mftbu();
} while (tbhi != tbhi2);
return ((u64)tbhi << 32) | tblo;
@ -123,7 +123,7 @@ static inline void set_dec(u64 val)
static inline unsigned long tb_ticks_since(unsigned long tstamp)
{
return get_tbl() - tstamp;
return mftb() - tstamp;
}
#define mulhwu(x,y) \

4
arch/powerpc/kernel/time.c
View file

@ -448,8 +448,8 @@ void __delay(unsigned long loops)
*/
spin_cpu_relax();
} else {
start = get_tbl();
while (get_tbl() - start < loops)
start = mftb();
while (mftb() - start < loops)
spin_cpu_relax();
}
spin_end();