GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-02 04:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nios2: change virt_to_phys to use physaddr_mask in global data

Browse source 
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>
This commit is contained in:
Thomas Chou 2015-10-27 09:02:17 +08:00
parent 1cda48f333
commit 2de4823dc0
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/nios2/cpu/cpu.c
View file

@ -119,6 +119,7 @@ static int altera_nios2_probe(struct udevice *dev)
"altr,has-mmu", 0); "altr,has-mmu", 0);
gd->arch.io_region_base = gd->arch.has_mmu ? 0xe0000000 : 0x80000000; gd->arch.io_region_base = gd->arch.has_mmu ? 0xe0000000 : 0x80000000;
gd->arch.mem_region_base = gd->arch.has_mmu ? 0xc0000000 : 0x00000000; gd->arch.mem_region_base = gd->arch.has_mmu ? 0xc0000000 : 0x00000000;
gd->arch.physaddr_mask = gd->arch.has_mmu ? 0x1fffffff : 0x7fffffff;
return 0; return 0;
} }

1
arch/nios2/include/asm/global_data.h
View file

@ -19,6 +19,7 @@ struct arch_global_data {
int has_mmu; int has_mmu;
u32 io_region_base; u32 io_region_base;
u32 mem_region_base; u32 mem_region_base;
u32 physaddr_mask;
}; };
#include <asm-generic/global_data.h> #include <asm-generic/global_data.h>

5
arch/nios2/include/asm/io.h
View file

@ -44,10 +44,7 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)
static inline phys_addr_t virt_to_phys(void * vaddr) static inline phys_addr_t virt_to_phys(void * vaddr)
{ {
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
if (gd->arch.has_mmu) return (phys_addr_t)vaddr & gd->arch.physaddr_mask;
return (phys_addr_t)vaddr & 0x1fffffff;
else
return (phys_addr_t)vaddr & 0x7fffffff;
} }
static inline void *ioremap(unsigned long physaddr, unsigned long size) static inline void *ioremap(unsigned long physaddr, unsigned long size)