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

Commit 98d8821a authored by Mahesh Salgaonkar's avatar Mahesh Salgaonkar Committed by Michael Ellerman
Browse files

powerpc/powernv: Move IDLE_STATE_ENTER_SEQ macro to cpuidle.h 



Move IDLE_STATE_ENTER_SEQ macro to cpuidle.h so that MCE handler changes
in subsequent patch can use it.

No functionality change.

Signed-off-by: default avatarMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e325d76f

arch/powerpc/include/asm/cpuidle.h

+13 −0
Original line number Diff line number Diff line
@@ -19,4 +19,17 @@ extern u64 pnv_first_deep_stop_state; 


#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);					\

1:	cmp	cr0,r0,r0;					\

	bne	1b;						\

	IDLE_INST;						\

	b	.

#endif /* CONFIG_PPC_P7_NAP */



#endif

arch/powerpc/kernel/idle_book3s.S

+0 −12
Original line number Diff line number Diff line
@@ -44,18 +44,6 @@ 
				PSSCR_PSLL_MASK | PSSCR_TR_MASK | \

				PSSCR_MTL_MASK



/* Idle state entry routines */



#define	IDLE_STATE_ENTER_SEQ(IDLE_INST)				\

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

	std	r0,0(r1);					\

	ptesync;						\

	ld	r0,0(r1);					\

1:	cmp	cr0,r0,r0;					\

	bne	1b;						\

	IDLE_INST;						\

	b	.



	.text



/*