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

powerpc: Cleanup idle for e500 



e500 idle setup is a bit messy.

e500_idle() is used for PPC32 while book3e_idle() is used for PPC64.
As they are mutually exclusive, call them all e500_idle().

Use CONFIG_MPC_85xx instead of PPC32 + E500 in Makefile and rename
idle_e500.c to idle_85xx.c .

Rename idle_book3e.c to idle_64e.c and remove #ifdef PPC64 in
as it's only built on PPC64.

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/8039301334e948974c85ec5ef2db37751075185b.1663606876.git.christophe.leroy@csgroup.eu
parent 73d11498

arch/powerpc/include/asm/machdep.h

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ struct machdep_calls { 
extern void e500_idle(void);

extern void power4_idle(void);

extern void ppc6xx_idle(void);

extern void book3e_idle(void);



/*

 * ppc_md contains a copy of the machine description structure for the

arch/powerpc/kernel/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ obj-$(CONFIG_PPC_DAWR) += dawr.o 
obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_ppc970.o cpu_setup_pa6t.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_power.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= mce.o mce_power.o

obj-$(CONFIG_PPC_BOOK3E_64)	+= exceptions-64e.o idle_book3e.o

obj-$(CONFIG_PPC_BOOK3E_64)	+= exceptions-64e.o idle_64e.o

obj-$(CONFIG_PPC_BARRIER_NOSPEC) += security.o

obj-$(CONFIG_PPC64)		+= vdso64_wrapper.o

obj-$(CONFIG_ALTIVEC)		+= vecemu.o
@@ -100,9 +100,7 @@ obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o 
obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_FA_DUMP)		+= fadump.o

obj-$(CONFIG_PRESERVE_FA_DUMP)	+= fadump.o

ifdef CONFIG_PPC32

obj-$(CONFIG_PPC_E500)		+= idle_e500.o

endif

obj-$(CONFIG_PPC_85xx)		+= idle_85xx.o

obj-$(CONFIG_PPC_BOOK3S_32)	+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o

obj-$(CONFIG_TAU)		+= tau_6xx.o

obj-$(CONFIG_HIBERNATION)	+= swsusp.o suspend.o

arch/powerpc/kernel/idle_book3e.S→arch/powerpc/kernel/idle_64e.S

+2 −6
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * Copyright 2010 IBM Corp, Benjamin Herrenschmidt <benh@kernel.crashing.org>

 *

 * Generic idle routine for Book3E processors

 * Generic idle routine for 64 bits e500 processors

 */



#include <linux/threads.h>
@@ -16,8 +16,6 @@ 
#include <asm/hw_irq.h>



/* 64-bit version only for now */

#ifdef CONFIG_PPC64



.macro BOOK3E_IDLE name loop

_GLOBAL(\name)

	/* Save LR for later */
@@ -98,6 +96,4 @@ epapr_ev_idle_start: 


BOOK3E_IDLE epapr_ev_idle EPAPR_EV_IDLE_LOOP



BOOK3E_IDLE book3e_idle BOOK3E_IDLE_LOOP



#endif /* CONFIG_PPC64 */
 
BOOK3E_IDLE e500_idle BOOK3E_IDLE_LOOP

arch/powerpc/platforms/85xx/corenet_generic.c

+0 −4
Original line number Diff line number Diff line
@@ -200,9 +200,5 @@ define_machine(corenet_generic) { 
#endif

	.calibrate_decr		= generic_calibrate_decr,

	.progress		= udbg_progress,

#ifdef CONFIG_PPC64

	.power_save		= book3e_idle,

#else

	.power_save		= e500_idle,

#endif

};