Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aafc8a83 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: Move IDLE_STATE_ENTER_SEQ[_NORET] into idle_book3s.S 



This macro is only used in idle_book3s.S, move it in there and add a
more descriptive comment.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
[mpe: Split out of larger patch and write change log]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 82b7fcc0

arch/powerpc/include/asm/cpuidle.h

+0 −16
Original line number Diff line number Diff line
@@ -101,20 +101,4 @@ static inline void report_invalid_psscr_val(u64 psscr_val, int err) 


#endif



/* Idle state entry routines */

#ifdef	CONFIG_PPC_P7_NAP

#define IDLE_STATE_ENTER_SEQ(IDLE_INST)                         \

	/* Magic NAP/SLEEP/WINKLE mode enter sequence */	\

	std	r0,0(r1);					\

	ptesync;						\

	ld	r0,0(r1);					\

236:	cmpd	cr0,r0,r0;					\

	bne	236b;						\

	IDLE_INST;						\



#define	IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST)			\

	IDLE_STATE_ENTER_SEQ(IDLE_INST)                         \

	b	.

#endif /* CONFIG_PPC_P7_NAP */



#endif

arch/powerpc/kernel/idle_book3s.S

+17 −0
Original line number Diff line number Diff line
@@ -205,6 +205,23 @@ pnv_powersave_common: 
	mtmsrd	r7,0

	bctr



/*

 * This is the sequence required to execute idle instructions, as

 * specified in ISA v2.07 (and earlier). MSR[IR] and MSR[DR] must be 0.

 */

#define IDLE_STATE_ENTER_SEQ(IDLE_INST)				\

	/* Magic NAP/SLEEP/WINKLE mode enter sequence */	\

	std	r0,0(r1);					\

	ptesync;						\

	ld	r0,0(r1);					\

236:	cmpd	cr0,r0,r0;					\

	bne	236b;						\

	IDLE_INST;



#define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST)			\

	IDLE_STATE_ENTER_SEQ(IDLE_INST)				\

	b	.



	.globl pnv_enter_arch207_idle_mode

pnv_enter_arch207_idle_mode:

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE