iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: l2c: move L2 cache register saving to a more sensible location

Browse Source 
Move the L2 cache register saving to a more sensible location - after
the cache has been enabled, and fixups have been run.  We move the
saving of the auxiliary control register into the ->save function as
well which makes everything operate in a sane and maintainable way.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2014-03-28 14:18:35 +00:00
parent d9d1f3e2d7
commit ddf7d79bc7
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm/mm/cache-l2x0.c
View File

@ -202,6 +202,11 @@ static void l2x0_disable(void)
raw_spin_unlock_irqrestore(&l2x0_lock, flags); raw_spin_unlock_irqrestore(&l2x0_lock, flags);
} }
static void l2c_save(void __iomem *base)
{
l2x0_saved_regs.aux_ctrl = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
}
/* /*
* L2C-210 specific code. * L2C-210 specific code.
* *
@ -295,6 +300,7 @@ static const struct l2c_init_data l2c210_data __initconst = {
.way_size_0 = SZ_8K, .way_size_0 = SZ_8K,
.num_lock = 1, .num_lock = 1,
.enable = l2c_enable, .enable = l2c_enable,
.save = l2c_save,
.outer_cache = { .outer_cache = {
.inv_range = l2c210_inv_range, .inv_range = l2c210_inv_range,
.clean_range = l2c210_clean_range, .clean_range = l2c210_clean_range,
@ -439,6 +445,7 @@ static const struct l2c_init_data l2c220_data = {
.way_size_0 = SZ_8K, .way_size_0 = SZ_8K,
.num_lock = 1, .num_lock = 1,
.enable = l2c_enable, .enable = l2c_enable,
.save = l2c_save,
.outer_cache = { .outer_cache = {
.inv_range = l2c220_inv_range, .inv_range = l2c220_inv_range,
.clean_range = l2c220_clean_range, .clean_range = l2c220_clean_range,
@ -575,6 +582,8 @@ static void __init l2c310_save(void __iomem *base)
{ {
unsigned revision; unsigned revision;
l2c_save(base);
l2x0_saved_regs.tag_latency = readl_relaxed(base + l2x0_saved_regs.tag_latency = readl_relaxed(base +
L310_TAG_LATENCY_CTRL); L310_TAG_LATENCY_CTRL);
l2x0_saved_regs.data_latency = readl_relaxed(base + l2x0_saved_regs.data_latency = readl_relaxed(base +
@ -712,13 +721,6 @@ static void __init __l2c_init(const struct l2c_init_data *data,
unsigned way_size_bits, ways; unsigned way_size_bits, ways;
u32 aux; u32 aux;
/*
* It is strange to save the register state before initialisation,
* but hey, this is what the DT implementations decided to do.
*/
if (data->save)
data->save(l2x0_base);
aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
aux &= aux_mask; aux &= aux_mask;
@ -777,14 +779,18 @@ static void __init __l2c_init(const struct l2c_init_data *data,
if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN))
data->enable(l2x0_base, aux, data->num_lock); data->enable(l2x0_base, aux, data->num_lock);
outer_cache = fns;
/*
* It is strange to save the register state before initialisation,
* but hey, this is what the DT implementations decided to do.
*/
if (data->save)
data->save(l2x0_base);
/* Re-read it in case some bits are reserved. */ /* Re-read it in case some bits are reserved. */
aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
/* Save the value for resuming. */
l2x0_saved_regs.aux_ctrl = aux;
outer_cache = fns;
pr_info("%s cache controller enabled, %d ways, %d kB\n", pr_info("%s cache controller enabled, %d ways, %d kB\n",
data->type, ways, l2x0_size >> 10); data->type, ways, l2x0_size >> 10);
pr_info("%s: CACHE_ID 0x%08x, AUX_CTRL 0x%08x\n", pr_info("%s: CACHE_ID 0x%08x, AUX_CTRL 0x%08x\n",
@ -865,6 +871,7 @@ static const struct l2c_init_data of_l2c210_data __initconst = {
.num_lock = 1, .num_lock = 1,
.of_parse = l2x0_of_parse, .of_parse = l2x0_of_parse,
.enable = l2c_enable, .enable = l2c_enable,
.save = l2c_save,
.outer_cache = { .outer_cache = {
.inv_range = l2c210_inv_range, .inv_range = l2c210_inv_range,
.clean_range = l2c210_clean_range, .clean_range = l2c210_clean_range,
@ -882,6 +889,7 @@ static const struct l2c_init_data of_l2c220_data __initconst = {
.num_lock = 1, .num_lock = 1,
.of_parse = l2x0_of_parse, .of_parse = l2x0_of_parse,
.enable = l2c_enable, .enable = l2c_enable,
.save = l2c_save,
.outer_cache = { .outer_cache = {
.inv_range = l2c220_inv_range, .inv_range = l2c220_inv_range,
.clean_range = l2c220_clean_range, .clean_range = l2c220_clean_range,
@ -1296,6 +1304,8 @@ static const struct l2c_init_data of_bcm_l2x0_data __initconst = {
static void __init tauros3_save(void __iomem *base) static void __init tauros3_save(void __iomem *base)
{ {
l2c_save(base);
l2x0_saved_regs.aux2_ctrl = l2x0_saved_regs.aux2_ctrl =
readl_relaxed(base + TAUROS3_AUX2_CTRL); readl_relaxed(base + TAUROS3_AUX2_CTRL);
l2x0_saved_regs.prefetch_ctrl = l2x0_saved_regs.prefetch_ctrl =