From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Chou Date: Wed, 21 Oct 2015 21:10:44 +0800 Subject: [U-Boot] [PATCH] nios2: fix virt_to_phys for nios2 with MMU Message-ID: <1445433044-22465-1-git-send-email-thomas@wytron.com.tw> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- arch/nios2/include/asm/io.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h index d0adf08..fdfc14e 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) -- 2.1.4