[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1335235280-25148-1-git-send-email-ylmao@marvell.com>
Date: Tue, 24 Apr 2012 10:41:20 +0800
From: Yilu Mao <ylmao@...vell.com>
To: linux-kernel@...r.kernel.org
Cc: linux@....linux.org.uk, Baohua.Song@....com,
santosh.shilimkar@...com, robherring2@...il.com,
catalin.marinas@....com, linux-arm-kernel@...ts.infradead.org,
Yilu Mao <ylmao@...vell.com>
Subject: [PATCH] ARM: cache-l2x0.c: save aux ctrl for resume in case that l2x0 is enabled before init
If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl
register will not be saved in l2x0_saved_regs. Therefore we can not use
l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem
by saving aux ctrl in l2x0_saved_regs just after it's being read from
the register.
Signed-off-by: Yilu Mao <ylmao@...vell.com>
---
arch/arm/mm/cache-l2x0.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index a53fd2a..3034b06 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -320,6 +320,12 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID);
aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
+ /* In case l2x controller is enabled, the aux ctrl register
+ * can't be set. So the original value should be stored in
+ * the l2x0_saved_regs for restoring when resume.
+ */
+ l2x0_saved_regs.aux_ctrl = aux;
+
aux &= aux_mask;
aux |= aux_val;
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists