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

powerpc/process: Remove target specific __set_dabr() 



__set_dabr() are simple functions that can be inline directly
inside set_dabr() and using IS_ENABLED() instead of #ifdef

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/c10b263668e137236c71d76648b03cf2cd1ee66f.1607076733.git.christophe.leroy@csgroup.eu
parent 1e78f723

arch/powerpc/kernel/process.c

+13 −24
Original line number Diff line number Diff line
@@ -806,40 +806,29 @@ static void switch_hw_breakpoint(struct task_struct *new) 
#endif /* !CONFIG_HAVE_HW_BREAKPOINT */

#endif	/* CONFIG_PPC_ADV_DEBUG_REGS */



#ifdef CONFIG_PPC_ADV_DEBUG_REGS

static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)

static inline int set_dabr(struct arch_hw_breakpoint *brk)

{

	unsigned long dabr, dabrx;



	dabr = brk->address | (brk->type & HW_BRK_TYPE_DABR);

	dabrx = ((brk->type >> 3) & 0x7);



	if (ppc_md.set_dabr)

		return ppc_md.set_dabr(dabr, dabrx);



	if (IS_ENABLED(CONFIG_PPC_ADV_DEBUG_REGS)) {

		mtspr(SPRN_DAC1, dabr);

		if (IS_ENABLED(CONFIG_PPC_47x))

			isync();

		return 0;

}

#elif defined(CONFIG_PPC_BOOK3S)

static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)

{

	} else if (IS_ENABLED(CONFIG_PPC_BOOK3S)) {

		mtspr(SPRN_DABR, dabr);

		if (cpu_has_feature(CPU_FTR_DABRX))

			mtspr(SPRN_DABRX, dabrx);

		return 0;

}

#else

static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)

{

	} else {

		return -EINVAL;

	}

#endif



static inline int set_dabr(struct arch_hw_breakpoint *brk)

{

	unsigned long dabr, dabrx;



	dabr = brk->address | (brk->type & HW_BRK_TYPE_DABR);

	dabrx = ((brk->type >> 3) & 0x7);



	if (ppc_md.set_dabr)

		return ppc_md.set_dabr(dabr, dabrx);



	return __set_dabr(dabr, dabrx);

}



static inline int set_breakpoint_8xx(struct arch_hw_breakpoint *brk)

CRA Git | Maintained and supported by SUSTech CRA and CCSE