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

Commit dd0efb3f authored by Paul Mackerras's avatar Paul Mackerras Committed by Michael Ellerman
Browse files

powerpc: Book E: Remove unused CPU_FTR_L2CSR bit 



The CPU_FTR_L2CSR bit is never tested anywhere, so let's reclaim the
bit.

The last usage was removed in 86d63363 ("powerpc/e500mc: Remove
dead L2 flushing code in idle_e500.S") (Jun 2015).

Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c0d64cf9

arch/powerpc/include/asm/cputable.h

+3 −4
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ static inline void cpu_feature_keys_init(void) { } 
#define CPU_FTR_TAU			ASM_CONST(0x00000010)

#define CPU_FTR_CAN_DOZE		ASM_CONST(0x00000020)

#define CPU_FTR_USE_RTC			ASM_CONST(0x00000040)

#define CPU_FTR_L2CSR			ASM_CONST(0x00000080)

#define CPU_FTR_601			ASM_CONST(0x00000100)

#define CPU_FTR_DBELL			ASM_CONST(0x00000200)

#define CPU_FTR_CAN_NAP			ASM_CONST(0x00000400)
@@ -385,18 +384,18 @@ static inline void cpu_feature_keys_init(void) { } 
	    CPU_FTR_SPE_COMP | CPU_FTR_MAYBE_CAN_NAP | \

	    CPU_FTR_NODSISRALIGN | CPU_FTR_NOEXECUTE)

#define CPU_FTRS_E500MC	(CPU_FTR_NODSISRALIGN | \

	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_DBELL | CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV)

/*

 * e5500/e6500 erratum A-006958 is a timebase bug that can use the

 * same workaround as CPU_FTR_CELL_TB_BUG.

 */

#define CPU_FTRS_E5500	(CPU_FTR_NODSISRALIGN | \

	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \

	    CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV | CPU_FTR_CELL_TB_BUG)

#define CPU_FTRS_E6500	(CPU_FTR_NODSISRALIGN | \

	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \

	    CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV | CPU_FTR_ALTIVEC_COMP | \

	    CPU_FTR_CELL_TB_BUG | CPU_FTR_SMT)