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

Commit 09a5d180 authored by Russell King's avatar Russell King
Browse files

ARM: l2c: clean up save/resume functions 



Rename the pl310 save/resume functions to have a l2c310 prefix - this
is it's official name.  Use a local cached copy of the l2x0_base
virtual address, and also realise that many of the resume function
tails are the same as the enable functions, so make a call to the
enable function instead of duplicating that code.

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

arch/arm/mm/cache-l2x0.c

+52 −57
Original line number Diff line number Diff line
@@ -385,17 +385,10 @@ static void l2x0_enable(void __iomem *base, u32 aux, unsigned num_lock) 


static void l2x0_resume(void)

{

	if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) {

		/* restore aux ctrl and enable l2 */

		l2x0_unlock(readl_relaxed(l2x0_base + L2X0_CACHE_ID));



		writel_relaxed(l2x0_saved_regs.aux_ctrl, l2x0_base +

			L2X0_AUX_CTRL);



		l2x0_inv_all();

	void __iomem *base = l2x0_base;



		writel_relaxed(L2X0_CTRL_EN, l2x0_base + L2X0_CTRL);

	}

	if (!(readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN))

		l2x0_enable(base, l2x0_saved_regs.aux_ctrl, 0);

}



static const struct l2c_init_data l2x0_init_fns __initconst = {
@@ -438,10 +431,9 @@ static const struct l2c_init_data l2x0_init_fns __initconst = { 
 *	Affects: store buffer

 *	store buffer is not automatically drained.

 */

static void __init pl310_save(void __iomem *base)

static void __init l2c310_save(void __iomem *base)

{

	u32 l2x0_revision = readl_relaxed(base + L2X0_CACHE_ID) &

		L2X0_CACHE_ID_RTL_MASK;

	unsigned revision;



	l2x0_saved_regs.tag_latency = readl_relaxed(base +

		L2X0_TAG_LATENCY_CTRL);
@@ -452,49 +444,49 @@ static void __init pl310_save(void __iomem *base) 
	l2x0_saved_regs.filter_start = readl_relaxed(base +

		L2X0_ADDR_FILTER_START);



	if (l2x0_revision >= L310_CACHE_ID_RTL_R2P0) {

		/*

		 * From r2p0, there is Prefetch offset/control register

		 */

	revision = readl_relaxed(base + L2X0_CACHE_ID) &

			L2X0_CACHE_ID_RTL_MASK;



	/* From r2p0, there is Prefetch offset/control register */

	if (revision >= L310_CACHE_ID_RTL_R2P0)

		l2x0_saved_regs.prefetch_ctrl = readl_relaxed(base +

							L2X0_PREFETCH_CTRL);

		/*

		 * From r3p0, there is Power control register

		 */

		if (l2x0_revision >= L310_CACHE_ID_RTL_R3P0)



	/* From r3p0, there is Power control register */

	if (revision >= L310_CACHE_ID_RTL_R3P0)

		l2x0_saved_regs.pwr_ctrl = readl_relaxed(base +

							L2X0_POWER_CTRL);

}

}



static void pl310_resume(void)

static void l2c310_resume(void)

{

	u32 l2x0_revision;

	void __iomem *base = l2x0_base;



	if (!(readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN)) {

		unsigned revision;



	if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) {

		/* restore pl310 setup */

		writel_relaxed(l2x0_saved_regs.tag_latency,

			l2x0_base + L2X0_TAG_LATENCY_CTRL);

			       base + L2X0_TAG_LATENCY_CTRL);

		writel_relaxed(l2x0_saved_regs.data_latency,

			l2x0_base + L2X0_DATA_LATENCY_CTRL);

			       base + L2X0_DATA_LATENCY_CTRL);

		writel_relaxed(l2x0_saved_regs.filter_end,

			l2x0_base + L2X0_ADDR_FILTER_END);

			       base + L2X0_ADDR_FILTER_END);

		writel_relaxed(l2x0_saved_regs.filter_start,

			l2x0_base + L2X0_ADDR_FILTER_START);

			       base + L2X0_ADDR_FILTER_START);



		l2x0_revision = readl_relaxed(l2x0_base + L2X0_CACHE_ID) &

		revision = readl_relaxed(base + L2X0_CACHE_ID) &

				L2X0_CACHE_ID_RTL_MASK;



		if (l2x0_revision >= L310_CACHE_ID_RTL_R2P0) {

		if (revision >= L310_CACHE_ID_RTL_R2P0)

			writel_relaxed(l2x0_saved_regs.prefetch_ctrl,

				l2x0_base + L2X0_PREFETCH_CTRL);

			if (l2x0_revision >= L310_CACHE_ID_RTL_R3P0)

				       base + L2X0_PREFETCH_CTRL);

		if (revision >= L310_CACHE_ID_RTL_R3P0)

			writel_relaxed(l2x0_saved_regs.pwr_ctrl,

					l2x0_base + L2X0_POWER_CTRL);

		}

	}

				       base + L2X0_POWER_CTRL);



	l2x0_resume();

		l2c_enable(base, l2x0_saved_regs.aux_ctrl, 8);

	}

}



static void __init l2c310_fixup(void __iomem *base, u32 cache_id,
@@ -530,7 +522,7 @@ static const struct l2c_init_data l2c310_init_fns __initconst = { 
	.num_lock = 8,

	.enable = l2c_enable,

	.fixup = l2c310_fixup,

	.save = pl310_save,

	.save = l2c310_save,

	.outer_cache = {

		.inv_range = l2x0_inv_range,

		.clean_range = l2x0_clean_range,
@@ -538,7 +530,7 @@ static const struct l2c_init_data l2c310_init_fns __initconst = { 
		.flush_all = l2x0_flush_all,

		.disable = l2x0_disable,

		.sync = l2x0_cache_sync,

		.resume = pl310_resume,

		.resume = l2c310_resume,

	},

};
@@ -744,7 +736,7 @@ static const struct l2c_init_data of_pl310_data __initconst = { 
	.of_parse = pl310_of_parse,

	.enable = l2c_enable,

	.fixup = l2c310_fixup,

	.save  = pl310_save,

	.save  = l2c310_save,

	.outer_cache = {

		.inv_range   = l2x0_inv_range,

		.clean_range = l2x0_clean_range,
@@ -752,7 +744,7 @@ static const struct l2c_init_data of_pl310_data __initconst = { 
		.flush_all   = l2x0_flush_all,

		.disable     = l2x0_disable,

		.sync        = l2x0_cache_sync,

		.resume      = pl310_resume,

		.resume      = l2c310_resume,

	},

};
@@ -862,10 +854,11 @@ static void aurora_save(void __iomem *base) 


static void aurora_resume(void)

{

	if (!(readl(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) {

		writel_relaxed(l2x0_saved_regs.aux_ctrl,

				l2x0_base + L2X0_AUX_CTRL);

		writel_relaxed(l2x0_saved_regs.ctrl, l2x0_base + L2X0_CTRL);

	void __iomem *base = l2x0_base;



	if (!(readl(base + L2X0_CTRL) & L2X0_CTRL_EN)) {

		writel_relaxed(l2x0_saved_regs.aux_ctrl, base + L2X0_AUX_CTRL);

		writel_relaxed(l2x0_saved_regs.ctrl, base + L2X0_CTRL);

	}

}
@@ -1089,7 +1082,7 @@ static const struct l2c_init_data of_bcm_l2x0_data __initconst = { 
	.of_parse = pl310_of_parse,

	.enable = l2c_enable,

	.fixup = l2c310_fixup,

	.save  = pl310_save,

	.save  = l2c310_save,

	.outer_cache = {

		.inv_range   = bcm_inv_range,

		.clean_range = bcm_clean_range,
@@ -1097,7 +1090,7 @@ static const struct l2c_init_data of_bcm_l2x0_data __initconst = { 
		.flush_all   = l2x0_flush_all,

		.disable     = l2x0_disable,

		.sync        = l2x0_cache_sync,

		.resume      = pl310_resume,

		.resume      = l2c310_resume,

	},

};
@@ -1111,14 +1104,16 @@ static void __init tauros3_save(void __iomem *base) 


static void tauros3_resume(void)

{

	if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) {

	void __iomem *base = l2x0_base;



	if (!(readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN)) {

		writel_relaxed(l2x0_saved_regs.aux2_ctrl,

			       l2x0_base + TAUROS3_AUX2_CTRL);

			       base + TAUROS3_AUX2_CTRL);

		writel_relaxed(l2x0_saved_regs.prefetch_ctrl,

			       l2x0_base + L2X0_PREFETCH_CTRL);

	}

			       base + L2X0_PREFETCH_CTRL);



	l2x0_resume();

		l2c_enable(base, l2x0_saved_regs.aux_ctrl, 8);

	}

}



static const struct l2c_init_data of_tauros3_data __initconst = {