Coloring on the ARM.

4 files changed, 23 insertions, 15 deletions

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 44c086710d2b..83a9c076931b 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -23,6 +23,8 @@
 #include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
 
+#include <litmus/color.h>
+
 #define CACHE_LINE_SIZE         32
 
 static void __iomem *l2x0_base;
@@ -347,6 +349,11 @@ void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask)
         outer_cache.disable = l2x0_disable;
         outer_cache.set_debug = l2x0_set_debug;
 
+        color_cache_info.size = l2x0_size;
+        color_cache_info.line_size = CACHE_LINE_SIZE;
+        color_cache_info.ways = l2x0_ways;
+        color_cache_info.sets = l2x0_sets;
+
         printk(KERN_INFO "%s cache controller enabled\n", type);
         printk(KERN_INFO "l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d B\n",
                         ways, cache_id, aux, l2x0_size);
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 95d5636720a6..76c5cc821632 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -20,6 +20,8 @@
 #include <asm/amd_nb.h>
 #include <asm/smp.h>
 
+#include <litmus/color.h>
+
 #define LVL_1_INST      1
 #define LVL_1_DATA      2
 #define LVL_2           3
@@ -1215,8 +1217,6 @@ static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = {
         .notifier_call = cacheinfo_cpu_callback,
 };
 
-#include <litmus/color.h>
-
 static void set_color_vars(void)
 {
         struct _cpuid4_info *leaf = CPUID4_INFO_IDX(
diff --git a/litmus/color.c b/litmus/color.c
index a68c30c0edb0..19767f41ee87 100644
--- a/litmus/color.c
+++ b/litmus/color.c
@@ -117,7 +117,7 @@ static int do_add_pages(void)
 #if defined(CONFIG_X86)
                 page = alloc_page(GFP_HIGHUSER | __GFP_ZERO |
                                 __GFP_MOVABLE);
-#elif defined(CONFIG_SPARC) /* X86 */
+#elif defined(CONFIG_SPARC) || defined(CONFIG_ARM)
                 page = alloc_page(GFP_HIGHUSER | __GFP_MOVABLE);
 #else
 #error What architecture are you using?
@@ -253,7 +253,7 @@ out:
  * Initialization
 ***********************************************************/
 
-#if defined(CONFIG_X86)
+#if defined(CONFIG_X86) || defined(CONFIG_ARM)
 /* slowest possible way to find a log, but we only do this once on boot */
 static unsigned int __init slow_log(unsigned int v)
 {
@@ -268,10 +268,11 @@ static int __init init_mask(void)
         unsigned int line_size_log = slow_log(color_cache_info.line_size);
         int err = 0;
 
-        BUG_ON(color_cache_info.size <= 1048576 ||
+        WARN(color_cache_info.size < 1048576 ||
                         color_cache_info.ways < 15 ||
-                        color_cache_info.line_size != 64);
-
+                        (color_cache_info.line_size != 64 &&
+                         color_cache_info.line_size != 32),
+                        "Potentially bad cache size, ways, or line size.\n");
         printk("Cache size: %lu  line-size: %lu  ways: %lu  sets: %lu\n",
                         color_cache_info.size, color_cache_info.line_size,
                         color_cache_info.ways, color_cache_info.sets);
@@ -282,16 +283,19 @@ static int __init init_mask(void)
         }
 
 
-        BUG_ON(color_cache_info.size / color_cache_info.line_size /
-                        color_cache_info.ways != color_cache_info.sets);
-        BUG_ON(PAGE_SIZE >= (color_cache_info.sets  << line_size_log));
+        WARN(color_cache_info.size / color_cache_info.line_size /
+                        color_cache_info.ways != color_cache_info.sets,
+                        "Cache size and set information do not agree.\n");
+        WARN(PAGE_SIZE >= (color_cache_info.sets  << line_size_log),
+                        "Cache set bits contained entirely within page bits.\n");
         color_mask = ((color_cache_info.sets << line_size_log) - 1) ^
                 (PAGE_SIZE - 1);
         color_cache_info.nr_colors = (color_mask >> PAGE_SHIFT) + 1;
+
 out:
         return err;
 }
-#elif defined(CONFIG_SPARC) /* X86 */
+#elif defined(CONFIG_SPARC)
 static int __init init_mask(void)
 {
         /*
@@ -307,8 +311,7 @@ static int __init init_mask(void)
         color_cache_info.nr_colors = (1 << hweight_long(color_mask));
         return 0;
 }
-#endif /* SPARC/X86 */
-
+#endif
 
 
 static int __init init_color_groups(void)
diff --git a/litmus/color_dev.c b/litmus/color_dev.c
index 677905a2a6b1..32ff0cb190f9 100644
--- a/litmus/color_dev.c
+++ b/litmus/color_dev.c
@@ -176,9 +176,7 @@ static int do_map_colored_page_set(struct vm_area_struct *vma,
                         goto out;
                 }
 
-#ifdef CONFIG_SPARC
                 clear_user_highpage(page, addr);
-#endif
 
                 TRACE_CUR("insert page (pa:0x%10llx, pfn:%8lu, color:%3lu) "
                                 "at 0x%lx vma:(flags:%16lx prot:%16lx)\n",