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

powerpc/64e: Remove unnecessary #ifdef CONFIG_PPC_FSL_BOOK3E 



CONFIG_PPC_BOOK3E_64 implies CONFIG_PPC_FSL_BOOK3E so no need of
additional #ifdefs in files built exclusively for CONFIG_PPC_BOOK3E_64.

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/df16255c13b63b0221c9be63b94a6864bed22c12.1663606875.git.christophe.leroy@csgroup.eu
parent 0069f3d1

arch/powerpc/kernel/exceptions-64e.S

+0 −8
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ ret_from_mc_except: 
#define SPRN_MC_SRR0	SPRN_MCSRR0

#define SPRN_MC_SRR1	SPRN_MCSRR1



#ifdef CONFIG_PPC_FSL_BOOK3E

#define GEN_BTB_FLUSH			\

	START_BTB_FLUSH_SECTION		\

		beq 1f;			\
@@ -307,13 +306,6 @@ ret_from_mc_except: 
#define DBG_BTB_FLUSH CRIT_BTB_FLUSH

#define MC_BTB_FLUSH CRIT_BTB_FLUSH

#define GDBELL_BTB_FLUSH GEN_BTB_FLUSH

#else

#define GEN_BTB_FLUSH

#define CRIT_BTB_FLUSH

#define DBG_BTB_FLUSH

#define MC_BTB_FLUSH

#define GDBELL_BTB_FLUSH

#endif



#define NORMAL_EXCEPTION_PROLOG(n, intnum, addition)			    \

	EXCEPTION_PROLOG(n, intnum, GEN, addition##_GEN(n))

arch/powerpc/mm/nohash/tlb_low_64e.S

+0 −6
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV) 
	ld	r14,PACAPGD(r13)

	std	r15,EX_TLB_R15(r12)

	std	r10,EX_TLB_CR(r12)

#ifdef CONFIG_PPC_FSL_BOOK3E

START_BTB_FLUSH_SECTION

	mfspr r11, SPRN_SRR1

	andi. r10,r11,MSR_PR
@@ -70,14 +69,11 @@ START_BTB_FLUSH_SECTION 
1:

END_BTB_FLUSH_SECTION

	std	r7,EX_TLB_R7(r12)

#endif

.endm



.macro tlb_epilog_bolted

	ld	r14,EX_TLB_CR(r12)

#ifdef CONFIG_PPC_FSL_BOOK3E

	ld	r7,EX_TLB_R7(r12)

#endif

	ld	r10,EX_TLB_R10(r12)

	ld	r11,EX_TLB_R11(r12)

	ld	r13,EX_TLB_R13(r12)
@@ -248,7 +244,6 @@ itlb_miss_fault_bolted: 
	beq	tlb_miss_user_bolted

	b	itlb_miss_kernel_bolted



#ifdef CONFIG_PPC_FSL_BOOK3E

/*

 * TLB miss handling for e6500 and derivatives, using hardware tablewalk.

 *
@@ -515,7 +510,6 @@ dtlb_miss_fault_e6500: 
itlb_miss_fault_e6500:

	tlb_epilog_bolted

	b	exc_instruction_storage_book3e

#endif /* CONFIG_PPC_FSL_BOOK3E */



/**********************************************************************

 *                                                                    *