From: Thomas Chou Date: Thu, 22 Oct 2015 07:38:24 +0000 (+0800) Subject: nios2: fix virt_to_phys for nios2 with MMU X-Git-Tag: v2016.01-rc1~190 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8a3ea979666799d09b57efd05d0b41bda1ac7d69;p=u-boot nios2: fix virt_to_phys for nios2 with MMU As the virtual address and physical address mapping of nios2 with MMU are different. Add a check of MMU, and fix the mapping. Signed-off-by: Thomas Chou Acked-by: Marek Vasut Reviewed-by: Ley Foon Tan --- diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h index d0adf08cd6..e7da35b0c9 100644 --- a/arch/nios2/include/asm/io.h +++ b/arch/nios2/include/asm/io.h @@ -39,7 +39,11 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags) static inline phys_addr_t virt_to_phys(void * vaddr) { - return (phys_addr_t)(vaddr); + DECLARE_GLOBAL_DATA_PTR; + if (gd->arch.has_mmu) + return (phys_addr_t)vaddr & 0x1fffffff; + else + return (phys_addr_t)vaddr & 0x7fffffff; } static inline void *ioremap(unsigned long physaddr, unsigned long size)