summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIllia Ragozin <illia.ragozin@grapecom.com>2013-04-10 19:43:34 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-04-17 16:53:27 +0100
commitcd272d1ea71583170e95dde02c76166c7f9017e6 (patch)
tree1b388e0d1a7e61584890e008e505a97f7be24c48
parentde40614e92bf1b0308d953387b0cb9d3a5710186 (diff)
downloadlinux-stable-cd272d1ea71583170e95dde02c76166c7f9017e6.tar.gz
linux-stable-cd272d1ea71583170e95dde02c76166c7f9017e6.tar.bz2
linux-stable-cd272d1ea71583170e95dde02c76166c7f9017e6.zip
ARM: 7696/1: Fix kexec by setting outer_cache.inv_all for Feroceon
On Feroceon the L2 cache becomes non-coherent with the CPU when the L1 caches are disabled. Thus the L2 needs to be invalidated after both L1 caches are disabled. On kexec before the starting the code for relocation the kernel, the L1 caches are disabled in cpu_froc_fin (cpu_v7_proc_fin for Feroceon), but after L2 cache is never invalidated, because inv_all is not set in cache-feroceon-l2.c. So kernel relocation and decompression may has (and usually has) errors. Setting the function enables L2 invalidation and fixes the issue. Cc: <stable@vger.kernel.org> Signed-off-by: Illia Ragozin <illia.ragozin@grapecom.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/cache-feroceon-l2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c
index dd3d59122cc3..48bc3c0a87ce 100644
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -343,6 +343,7 @@ void __init feroceon_l2_init(int __l2_wt_override)
outer_cache.inv_range = feroceon_l2_inv_range;
outer_cache.clean_range = feroceon_l2_clean_range;
outer_cache.flush_range = feroceon_l2_flush_range;
+ outer_cache.inv_all = l2_inv_all;
enable_l2();