Commit bda0b74e authored by Russell King's avatar Russell King
Browse files

ARM: l2c: move pl310_set_debug() into l2c-310 code 



Move the pl310_set_debug() into the l2c-310 code area, and don't hide
it with ifdefs.  Rename it to l2c310_set_debug().

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent faf9b2e7

arch/arm/mm/cache-l2x0.c

+6 −8
Original line number Diff line number Diff line
@@ -154,18 +154,11 @@ static inline void debug_writel(unsigned long val) 
	if (outer_cache.set_debug)

		l2c_set_debug(l2x0_base, val);

}



static void pl310_set_debug(unsigned long val)

{

	writel_relaxed(val, l2x0_base + L2X0_DEBUG_CTRL);

}

#else

/* Optimised out for non-errata case */

static inline void debug_writel(unsigned long val)

{

}



#define pl310_set_debug	NULL

#endif



#ifdef CONFIG_PL310_ERRATA_588369
@@ -422,6 +415,11 @@ static const struct l2c_init_data l2x0_init_fns __initconst = { 
 *	Affects: store buffer

 *	store buffer is not automatically drained.

 */

static void l2c310_set_debug(unsigned long val)

{

	writel_relaxed(val, l2x0_base + L2X0_DEBUG_CTRL);

}



static void __init l2c310_save(void __iomem *base)

{

	unsigned revision;
@@ -488,7 +486,7 @@ static void __init l2c310_fixup(void __iomem *base, u32 cache_id, 
	unsigned n = 0;



	if (revision <= L310_CACHE_ID_RTL_R3P0)

		fns->set_debug = pl310_set_debug;

		fns->set_debug = l2c310_set_debug;



	if (IS_ENABLED(CONFIG_PL310_ERRATA_753970) &&

	    revision == L310_CACHE_ID_RTL_R3P0) {