summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-03-16 18:19:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-05-30 01:47:32 +0200
commit2b2a87a12d2e0aede29e45911aeb0c520066b0c0 (patch)
tree4f7f2e8528238eae06c66ab8d84b3939b476b7ca /arch/arm
parentARM: l2c: rename OF specific things, making l2x0_of_data available to all (diff)
downloadlinux-2b2a87a12d2e0aede29e45911aeb0c520066b0c0.tar.xz
linux-2b2a87a12d2e0aede29e45911aeb0c520066b0c0.zip
ARM: l2c: provide generic function for calling set_debug method
Provide a generic function which always calls the set_debug method. This will be used later in the series as some work-arounds require that the debug register be written. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mm/cache-l2x0.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index d659c4ca46bb..595c50519e41 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -57,6 +57,16 @@ static inline void cache_wait_way(void __iomem *reg, unsigned long mask)
cpu_relax();
}
+/*
+ * This should only be called when we have a requirement that the
+ * register be written due to a work-around, as platforms running
+ * in non-secure mode may not be able to access this register.
+ */
+static inline void l2c_set_debug(void __iomem *base, unsigned long val)
+{
+ outer_cache.set_debug(val);
+}
+
#ifdef CONFIG_CACHE_PL310
static inline void cache_wait(void __iomem *reg, unsigned long mask)
{
@@ -92,7 +102,7 @@ static inline void l2x0_inv_line(unsigned long addr)
static inline void debug_writel(unsigned long val)
{
if (outer_cache.set_debug)
- outer_cache.set_debug(val);
+ l2c_set_debug(l2x0_base, val);
}
static void pl310_set_debug(unsigned long val)