sparc32: srmmu_probe now knows about leon too

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>

1 files changed, 21 insertions, 4 deletions

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 256db6b22c54..62e3f5773303 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -646,6 +646,23 @@ static void __init srmmu_allocate_ptable_skeleton(unsigned long start,
         }
 }
 
+/* These flush types are not available on all chips... */
+static inline unsigned long srmmu_probe(unsigned long vaddr)
+{
+        unsigned long retval;
+
+        if (sparc_cpu_model != sparc_leon) {
+
+                vaddr &= PAGE_MASK;
+                __asm__ __volatile__("lda [%1] %2, %0\n\t" :
+                                     "=r" (retval) :
+                                     "r" (vaddr | 0x400), "i" (ASI_M_FLUSH_PROBE));
+        } else {
+                retval = leon_swprobe(vaddr, 0);
+        }
+        return retval;
+}
+
 /*
  * This is much cleaner than poking around physical address space
  * looking at the prom's page table directly which is what most
@@ -665,7 +682,7 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start,
                         break; /* probably wrap around */
                 if(start == 0xfef00000)
                         start = KADB_DEBUGGER_BEGVM;
-                if(!(prompte = srmmu_hwprobe(start))) {
+                if(!(prompte = srmmu_probe(start))) {
                         start += PAGE_SIZE;
                         continue;
                 }
@@ -674,12 +691,12 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start,
                 what = 0;
     
                 if(!(start & ~(SRMMU_REAL_PMD_MASK))) {
-                        if(srmmu_hwprobe((start-PAGE_SIZE) + SRMMU_REAL_PMD_SIZE) == prompte)
+                        if(srmmu_probe((start-PAGE_SIZE) + SRMMU_REAL_PMD_SIZE) == prompte)
                                 what = 1;
                 }
     
                 if(!(start & ~(SRMMU_PGDIR_MASK))) {
-                        if(srmmu_hwprobe((start-PAGE_SIZE) + SRMMU_PGDIR_SIZE) ==
+                        if(srmmu_probe((start-PAGE_SIZE) + SRMMU_PGDIR_SIZE) ==
                            prompte)
                                 what = 2;
                 }
@@ -1156,7 +1173,7 @@ static void turbosparc_flush_page_to_ram(unsigned long page)
 #ifdef TURBOSPARC_WRITEBACK
         volatile unsigned long clear;
 
-        if (srmmu_hwprobe(page))
+        if (srmmu_probe(page))
                 turbosparc_flush_page_cache(page);
         clear = srmmu_get_fstatus();
 #endif