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

powerpc/32: Entry cpu time accounting in C 



There is no need for this to be in asm,
use the new interrupt entry wrapper.

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/daca4c3e05cdfe54d237162a0718b3aaca897662.1615552866.git.christophe.leroy@csgroup.eu
parent be39e105

arch/powerpc/include/asm/interrupt.h

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup 
#ifdef CONFIG_PPC32

	if (!arch_irq_disabled_regs(regs))

		trace_hardirqs_off();



	if (user_mode(regs))

		account_cpu_user_entry();

#endif

	/*

	 * Book3E reconciles irq soft mask in asm

arch/powerpc/include/asm/ppc_asm.h

+0 −10
Original line number Diff line number Diff line
@@ -23,18 +23,8 @@ 
 */



#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE

#define ACCOUNT_CPU_USER_ENTRY(ptr, ra, rb)

#define ACCOUNT_CPU_USER_EXIT(ptr, ra, rb)

#else

#define ACCOUNT_CPU_USER_ENTRY(ptr, ra, rb)				\

	MFTB(ra);			/* get timebase */		\

	PPC_LL	rb, ACCOUNT_STARTTIME_USER(ptr);			\

	PPC_STL	ra, ACCOUNT_STARTTIME(ptr);				\

	subf	rb,rb,ra;		/* subtract start value */	\

	PPC_LL	ra, ACCOUNT_USER_TIME(ptr);				\

	add	ra,ra,rb;		/* add on to user time */	\

	PPC_STL	ra, ACCOUNT_USER_TIME(ptr);				\



#define ACCOUNT_CPU_USER_EXIT(ptr, ra, rb)				\

	MFTB(ra);			/* get timebase */		\

	PPC_LL	rb, ACCOUNT_STARTTIME(ptr);				\

arch/powerpc/kernel/entry_32.S

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ transfer_to_handler: 
	lwz	r12,THREAD_DBCR0(r12)

	andis.	r12,r12,DBCR0_IDM@h

#endif

	ACCOUNT_CPU_USER_ENTRY(r2, r11, r12)

#ifdef CONFIG_PPC_BOOK3S_32

	kuep_lock r11, r12

#endif