[U-Boot] [PATCH] nios2: fix virt_to_phys for nios2 with MMU

Ley Foon Tan lftan.linux at gmail.com
Thu Oct 22 03:49:14 CEST 2015


On Wed, Oct 21, 2015 at 9:10 PM, Thomas Chou <thomas at wytron.com.tw> wrote:
> 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 <thomas at wytron.com.tw>
> ---
>  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;
>  }

Reviewed-by: Ley Foon Tan <lftan at altera.com>

Regards
Ley Foon


More information about the U-Boot mailing list