Browse files

sparc32,leon: SRMMU MMU Table probe fix

The LEON MMU Model (SRMMU) does not implement MMu Table probing
in hardware, instead it is implemented in software. However the
software implementation does not return the PTE as it should which
always results in INVALID entires and the PROM mappings are not
inherited as they should during startup. The following patch
removes the masking of the PTE.

Signed-off-by: Daniel Hellstrom <>
Signed-off-by: David S. Miller <>
  • Loading branch information...
1 parent 47ea91b commit 47392638e619cc075b8ee3e3ea38844055e8adb9 @daniel-hellstrom daniel-hellstrom committed with Sep 8, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 arch/sparc/include/asm/pgtsrmmu.h
  2. +1 −1 arch/sparc/mm/leon_mm.c
@@ -280,7 +280,7 @@ static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
return retval;
-#define srmmu_hwprobe(addr) (srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK)
+#define srmmu_hwprobe(addr) srmmu_swprobe(addr, 0)
static inline int
@@ -162,7 +162,7 @@ unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr)
printk(KERN_INFO "swprobe: padde %x\n", paddr_calc);
if (paddr)
*paddr = paddr_calc;
- return paddrbase;
+ return pte;
void leon_flush_icache_all(void)

0 comments on commit 4739263

Please sign in to comment.