nios2: change virt_to_phys to use physaddr_mask in global data

As virt_to_phys() is used a lot in DMA transfer, change it
to use physaddr_mask in global data. This will save an "if"
statement and get a little faster.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Marek Vasut <marex@denx.de>

diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index 88c4e18..f6d5cd3 100644 (file)
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -119,6 +119,7 @@ static int altera_nios2_probe(struct udevice *dev)
                "altr,has-mmu", 0);
        gd->arch.io_region_base = gd->arch.has_mmu ? 0xe0000000 : 0x80000000;
        gd->arch.mem_region_base = gd->arch.has_mmu ? 0xc0000000 : 0x00000000;
+       gd->arch.physaddr_mask = gd->arch.has_mmu ? 0x1fffffff : 0x7fffffff;
 
        return 0;
 }

diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h
index 9f3bd00..9863fd9 100644 (file)
--- a/arch/nios2/include/asm/global_data.h
+++ b/arch/nios2/include/asm/global_data.h
@@ -19,6 +19,7 @@ struct arch_global_data {
        int has_mmu;
        u32 io_region_base;
        u32 mem_region_base;
+       u32 physaddr_mask;
 };
 
 #include <asm-generic/global_data.h>

diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index e04050f..03a3418 100644 (file)
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -44,10 +44,7 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)
 static inline phys_addr_t virt_to_phys(void * vaddr)
 {
        DECLARE_GLOBAL_DATA_PTR;
-       if (gd->arch.has_mmu)
-               return (phys_addr_t)vaddr & 0x1fffffff;
-       else
-               return (phys_addr_t)vaddr & 0x7fffffff;
+       return (phys_addr_t)vaddr & gd->arch.physaddr_mask;
 }
 
 static inline void *ioremap(unsigned long physaddr, unsigned long size)