aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIllia Ragozin <illia.ragozin@grapecom.com>2013-04-10 19:43:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-25 21:23:48 -0700
commitcef72624c31364e7020450571393a4d5a0e44b34 (patch)
tree8cc7dfac451ea4e7e02508b569e05447906c7772
parentd715cdddb8cdf1c17bf1c5ff8fcc9852cd6ba79e (diff)
downloadkernel_samsung_aries-cef72624c31364e7020450571393a4d5a0e44b34.zip
kernel_samsung_aries-cef72624c31364e7020450571393a4d5a0e44b34.tar.gz
kernel_samsung_aries-cef72624c31364e7020450571393a4d5a0e44b34.tar.bz2
ARM: 7696/1: Fix kexec by setting outer_cache.inv_all for Feroceon
commit cd272d1ea71583170e95dde02c76166c7f9017e6 upstream. 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. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 e0b0e7a..09f8851 100644
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -342,6 +342,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();