1 files changed, 64 insertions, 76 deletions

diff --git a/arch/microblaze/include/asm/cacheflush.h b/arch/microblaze/include/asm/cacheflush.h
index 1f04b911145..a6edd356cd0 100644
--- a/arch/microblaze/include/asm/cacheflush.h
+++ b/arch/microblaze/include/asm/cacheflush.h
@@ -18,6 +18,8 @@
 /* Somebody depends on this; sigh... */
 #include <linux/mm.h>
 
+/* Look at Documentation/cachetlb.txt */
+
 /*
  * Cache handling functions.
  * Microblaze has a write-through data cache, meaning that the data cache
@@ -27,95 +29,81 @@
  * instruction cache to make sure we don't fetch old, bad code.
  */
 
+/* struct cache, d=dcache, i=icache, fl = flush, iv = invalidate,
+ * suffix r = range */
+struct scache {
+        /* icache */
+        void (*ie)(void); /* enable */
+        void (*id)(void); /* disable */
+        void (*ifl)(void); /* flush */
+        void (*iflr)(unsigned long a, unsigned long b);
+        void (*iin)(void); /* invalidate */
+        void (*iinr)(unsigned long a, unsigned long b);
+        /* dcache */
+        void (*de)(void); /* enable */
+        void (*dd)(void); /* disable */
+        void (*dfl)(void); /* flush */
+        void (*dflr)(unsigned long a, unsigned long b);
+        void (*din)(void); /* invalidate */
+        void (*dinr)(unsigned long a, unsigned long b);
+};
+
+/* microblaze cache */
+extern struct scache *mbc;
+
+void microblaze_cache_init(void);
+
+#define enable_icache()                                 mbc->ie();
+#define disable_icache()                                mbc->id();
+#define flush_icache()                                  mbc->ifl();
+#define flush_icache_range(start, end)                  mbc->iflr(start, end);
+#define invalidate_icache()                             mbc->iin();
+#define invalidate_icache_range(start, end)             mbc->iinr(start, end);
+
+
+#define flush_icache_user_range(vma, pg, adr, len)      flush_icache();
+#define flush_icache_page(vma, pg)                      do { } while (0)
+
+#define enable_dcache()                                 mbc->de();
+#define disable_dcache()                                mbc->dd();
 /* FIXME for LL-temac driver */
-#define invalidate_dcache_range(start, end) \
-                        __invalidate_dcache_range(start, end)
-
-#define flush_cache_all()                       __invalidate_cache_all()
-#define flush_cache_mm(mm)                      do { } while (0)
-#define flush_cache_range(vma, start, end)      __invalidate_cache_all()
-#define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
+#define invalidate_dcache()                             mbc->din();
+#define invalidate_dcache_range(start, end)             mbc->dinr(start, end);
+#define flush_dcache()                                  mbc->dfl();
+#define flush_dcache_range(start, end)                  mbc->dflr(start, end);
 
-#define flush_dcache_range(start, end)  __invalidate_dcache_range(start, end)
 #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
+/* D-cache aliasing problem can't happen - cache is between MMU and ram */
 #define flush_dcache_page(page)                 do { } while (0)
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
 
-#define flush_icache_range(start, len)  __invalidate_icache_range(start, len)
-#define flush_icache_page(vma, pg)              do { } while (0)
-
-#ifndef CONFIG_MMU
-# define flush_icache_user_range(start, len)    do { } while (0)
-#else
-# define flush_icache_user_range(vma, pg, adr, len) __invalidate_icache_all()
-
-# define flush_page_to_ram(page)                do { } while (0)
 
-# define flush_icache()                 __invalidate_icache_all()
-# define flush_cache_sigtramp(vaddr) \
-                        __invalidate_icache_range(vaddr, vaddr + 8)
-
-# define flush_dcache_mmap_lock(mapping)        do { } while (0)
-# define flush_dcache_mmap_unlock(mapping)      do { } while (0)
+#define flush_cache_dup_mm(mm)                          do { } while (0)
+#define flush_cache_vmap(start, end)                    do { } while (0)
+#define flush_cache_vunmap(start, end)                  do { } while (0)
+#define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 
-# define flush_cache_dup_mm(mm)                 do { } while (0)
+/* MS: kgdb code use this macro, wrong len with FLASH */
+#if 0
+#define flush_cache_range(vma, start, len)      {       \
+        flush_icache_range((unsigned) (start), (unsigned) (start) + (len)); \
+        flush_dcache_range((unsigned) (start), (unsigned) (start) + (len)); \
+}
 #endif
 
-#define flush_cache_vmap(start, end)            do { } while (0)
-#define flush_cache_vunmap(start, end)          do { } while (0)
-
-
-void _enable_icache(void);
-void _disable_icache(void);
-void _invalidate_icache(unsigned int addr);
-
-#define __enable_icache()               _enable_icache()
-#define __disable_icache()              _disable_icache()
-#define __invalidate_icache(addr)       _invalidate_icache(addr)
-
-void _enable_dcache(void);
-void _disable_dcache(void);
-void _invalidate_dcache(unsigned int addr);
-
-#define __enable_dcache()               _enable_dcache()
-#define __disable_dcache()              _disable_dcache()
-#define __invalidate_dcache(addr)       _invalidate_dcache(addr)
-
-struct page;
-struct mm_struct;
-struct vm_area_struct;
-
-/* see arch/microblaze/kernel/cache.c */
-extern void __invalidate_icache_all(void);
-extern void __invalidate_icache_range(unsigned long start, unsigned long end);
-extern void __invalidate_icache_page(struct vm_area_struct *vma,
-                                struct page *page);
-extern void __invalidate_icache_user_range(struct vm_area_struct *vma,
-                                struct page *page,
-                                unsigned long adr, int len);
-extern void __invalidate_cache_sigtramp(unsigned long addr);
-
-extern void __invalidate_dcache_all(void);
-extern void __invalidate_dcache_range(unsigned long start, unsigned long end);
-extern void __invalidate_dcache_page(struct vm_area_struct *vma,
-                                struct page *page);
-extern void __invalidate_dcache_user_range(struct vm_area_struct *vma,
-                                struct page *page,
-                                unsigned long adr, int len);
-
-extern inline void __invalidate_cache_all(void)
-{
-        __invalidate_icache_all();
-        __invalidate_dcache_all();
-}
+#define flush_cache_range(vma, start, len) do { } while (0)
 
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-do { memcpy((dst), (src), (len)); \
-        flush_icache_range((unsigned) (dst), (unsigned) (dst) + (len)); \
+#define copy_to_user_page(vma, page, vaddr, dst, src, len)              \
+do {                                                                    \
+        memcpy((dst), (src), (len));                                    \
+        flush_icache_range((unsigned) (dst), (unsigned) (dst) + (len)); \
 } while (0)
 
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-        memcpy((dst), (src), (len))
+#define copy_from_user_page(vma, page, vaddr, dst, src, len)            \
+do {                                                                    \
+        memcpy((dst), (src), (len));                                    \
+} while (0)
 
 #endif /* _ASM_MICROBLAZE_CACHEFLUSH_H */