path: root/arch/arm/mm
diff options
authorRob Herring <rob.herring@calxeda.com>2012-12-21 22:42:39 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-01-02 10:34:56 +0000
commit74ddcdb868a84f4a9f65e33c1ca0d24e1134e53a (patch)
treefbcc96fb7e28648990df5d9933149236be98088f /arch/arm/mm
parent4a490b78cb7e0e5efa44425df72a9fedc1c36366 (diff)
ARM: 7608/1: l2x0: Only set .set_debug on PL310 r3p0 and earlier
PL310 errata work-arounds using .set_debug function are only needed on r3p0 and earlier, so check the rev and only set .set_debug on older revs. Avoiding debug register accesses fixes aborts on non-secure platforms like highbank. It is assumed that non-secure platforms needing these work-arounds have already implemented .set_debug with secure monitor calls. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 6911b8b2745..05d577613b1 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -352,7 +352,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
/* Unmapped register. */
sync_reg_offset = L2X0_DUMMY_REG;
- outer_cache.set_debug = pl310_set_debug;
+ if ((cache_id & L2X0_CACHE_ID_RTL_MASK) <= L2X0_CACHE_ID_RTL_R3P0)
+ outer_cache.set_debug = pl310_set_debug;
case L2X0_CACHE_ID_PART_L210:
ways = (aux >> 13) & 0xf;