diff options
| author | James Hogan <james.hogan@imgtec.com> | 2013-06-24 11:05:19 +0100 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2013-06-27 13:49:48 +0100 |
| commit | 30dd5f7a573f10383d1fef237c69e6f69a1589e8 (patch) | |
| tree | f7218f25b98eb0a496effac9ae0728d0e75c3972 /arch/metag | |
| parent | d3087c03f0de99bb0fa5fb7de970ace8aabfd31d (diff) | |
| download | linux-stable-30dd5f7a573f10383d1fef237c69e6f69a1589e8.tar.gz linux-stable-30dd5f7a573f10383d1fef237c69e6f69a1589e8.tar.bz2 linux-stable-30dd5f7a573f10383d1fef237c69e6f69a1589e8.zip | |
metag: panic if cache aliasing possible
If the cache and page size configuration allows for cache aliasing to
occur we warn on boot, but the log messages are easy to miss and will
result is random crashes occuring in userland. Let's panic too in this
case so that the user immediately knows they need to fix the cache
configuration or configured page size.
Also fix the warning messages which display the cache and page sizes to
include newlines, and add the word "Potential" since an actual cache
alias hasn't been detected.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Diffstat (limited to 'arch/metag')
| -rw-r--r-- | arch/metag/kernel/cachepart.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/metag/kernel/cachepart.c b/arch/metag/kernel/cachepart.c index 954548b1bea8..0a2385fa2a1d 100644 --- a/arch/metag/kernel/cachepart.c +++ b/arch/metag/kernel/cachepart.c @@ -100,22 +100,23 @@ void check_for_cache_aliasing(int thread_id) thread_cache_size = get_thread_cache_size(cache_type, thread_id); if (thread_cache_size < 0) - pr_emerg("Can't read %s cache size", \ + pr_emerg("Can't read %s cache size\n", cache_type ? "DCACHE" : "ICACHE"); else if (thread_cache_size == 0) /* Cache is off. No need to check for aliasing */ continue; if (thread_cache_size / CACHE_ASSOCIATIVITY > PAGE_SIZE) { - pr_emerg("Cache aliasing detected in %s on Thread %d", + pr_emerg("Potential cache aliasing detected in %s on Thread %d\n", cache_type ? "DCACHE" : "ICACHE", thread_id); - pr_warn("Total %s size: %u bytes", - cache_type ? "DCACHE" : "ICACHE ", + pr_warn("Total %s size: %u bytes\n", + cache_type ? "DCACHE" : "ICACHE", cache_type ? get_dcache_size() : get_icache_size()); - pr_warn("Thread %s size: %d bytes", + pr_warn("Thread %s size: %d bytes\n", cache_type ? "CACHE" : "ICACHE", thread_cache_size); - pr_warn("Page Size: %lu bytes", PAGE_SIZE); + pr_warn("Page Size: %lu bytes\n", PAGE_SIZE); + panic("Potential cache aliasing detected"); } } } |