diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-02-14 12:09:08 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-05-21 12:51:22 +0100 |
| commit | ffb66d370de41ad36b249cd9621f58d3a27ecf21 (patch) | |
| tree | 9d66051db27e21ba566bda6de6b081efffeaca64 | |
| parent | 35d5dcd371217884374a2be9af99b659f9366479 (diff) | |
| download | linux-topics-ffb66d370de41ad36b249cd9621f58d3a27ecf21.tar.gz | |
ARM: Set bit 22 in the PL310 (cache controller) AuxCtlr registertracking-previous-armlt-arm-arch-fixes-llt-20121213.0tracking-previous-armlt-arm-arch-fixes-llt-20121210.0tracking-previous-armlt-arm-arch-fixes-llt-20121206.0tracking-previous-armlt-arm-arch-fixes-llt-20121123.0tracking-previous-armlt-arm-arch-fixes-llt-20121016.1tracking-previous-armlt-arm-arch-fixes-llt-20121016.0tracking-previous-armlt-arm-arch-fixes-llt-20120921.0tracking-previous-armlt-arm-arch-fixes-llt-20120827.0tracking-previous-armlt-arm-arch-fixes-llt-20120821.0tracking-previous-armlt-arm-arch-fixes-llt-20120717.0tracking-previous-armlt-arm-arch-fixes-llt-20120626.1tracking-previous-armlt-arm-arch-fixes-llt-20120626.0tracking-armlt-arm-arch-fixes-3.4-2012.05-1tracking-armlt-arm-arch-fixes-3.4-2012.05-0
Clearing bit 22 in the PL310 Auxiliary Control register (shared
attribute override enable) has the side effect of transforming Normal
Shared Non-cacheable reads into Cacheable no-allocate reads.
Coherent DMA buffers in Linux always have a Cacheable alias via the
kernel linear mapping and the processor can speculatively load cache
lines into the PL310 controller. With bit 22 cleared, Non-cacheable
reads would unexpectedly hit such cache lines leading to buffer
corruption.
This patch ensures that bit 22 is set in the l2x0_init() function if
PL310 and not rely on the platform code to specify it. It also modifies
the 'aux' variable only if the actual register is written so that the
final printk displays the real hardware value.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Kyungmin Park <kyungmin.park@samsung.com>
| -rw-r--r-- | arch/arm/mm/cache-l2x0.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 2a8e380501e..81f1dd6280c 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -319,9 +319,6 @@ 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); - aux &= aux_mask; - aux |= aux_val; - /* Determine the number of ways */ switch (cache_id & L2X0_CACHE_ID_PART_MASK) { case L2X0_CACHE_ID_PART_L310: @@ -335,6 +332,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) sync_reg_offset = L2X0_DUMMY_REG; #endif outer_cache.set_debug = pl310_set_debug; + + /* + * Set bit 22 in the auxiliary control register. If this bit + * is cleared, PL310 treats Normal Shared Non-cacheable + * accesses as Cacheable no-allocate. + */ + aux_val |= 1 << 22; break; case L2X0_CACHE_ID_PART_L210: ways = (aux >> 13) & 0xf; @@ -365,6 +369,9 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) /* Make sure that I&D is not locked down when starting */ l2x0_unlock(cache_id); + aux &= aux_mask; + aux |= aux_val; + /* l2x0 controller is disabled */ writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); |