2 files changed, 13 insertions, 6 deletions

diff --git a/arch/arc/include/asm/cacheflush.h b/arch/arc/include/asm/cacheflush.h
index a093adbdb017..fc662f49c55a 100644
--- a/arch/arc/include/asm/cacheflush.h
+++ b/arch/arc/include/asm/cacheflush.h
@@ -85,6 +85,10 @@ void flush_anon_page(struct vm_area_struct *vma,
  */
 #define PG_dc_clean     PG_arch_1
 
+#define CACHE_COLORS_NUM        4
+#define CACHE_COLORS_MSK        (CACHE_COLORS_NUM - 1)
+#define CACHE_COLOR(addr)       (((unsigned long)(addr) >> (PAGE_SHIFT)) & CACHE_COLORS_MSK)
+
 /*
  * Simple wrapper over config option
  * Bootup code ensures that hardware matches kernel configuration
@@ -94,8 +98,6 @@ static inline int cache_is_vipt_aliasing(void)
         return IS_ENABLED(CONFIG_ARC_CACHE_VIPT_ALIASING);
 }
 
-#define CACHE_COLOR(addr)       (((unsigned long)(addr) >> (PAGE_SHIFT)) & 1)
-
 /*
  * checks if two addresses (after page aligning) index into same cache set
  */
diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c
index a0ce8ff1e59c..ec86ac0e3321 100644
--- a/arch/arc/mm/cache.c
+++ b/arch/arc/mm/cache.c
@@ -972,11 +972,16 @@ void arc_cache_init(void)
                 /* check for D-Cache aliasing on ARCompact: ARCv2 has PIPT */
                 if (is_isa_arcompact()) {
                         int handled = IS_ENABLED(CONFIG_ARC_CACHE_VIPT_ALIASING);
-
-                        if (dc->alias && !handled)
-                                panic("Enable CONFIG_ARC_CACHE_VIPT_ALIASING\n");
-                        else if (!dc->alias && handled)
+                        int num_colors = dc->sz_k/dc->assoc/TO_KB(PAGE_SIZE);
+
+                        if (dc->alias) {
+                                if (!handled)
+                                        panic("Enable CONFIG_ARC_CACHE_VIPT_ALIASING\n");
+                                if (CACHE_COLORS_NUM != num_colors)
+                                        panic("CACHE_COLORS_NUM not optimized for config\n");
+                        } else if (!dc->alias && handled) {
                                 panic("Disable CONFIG_ARC_CACHE_VIPT_ALIASING\n");
+                        }
                 }
         }