diff options
| author | Timur Tabi <timur@freescale.com> | 2012-05-04 12:21:30 +0000 |
|---|---|---|
| committer | Andy Fleming <afleming@freescale.com> | 2012-07-06 17:30:32 -0500 |
| commit | 7b6e80538b919c814c94ce8887cec7b892f98a71 (patch) | |
| tree | 410490ffcaea818381585e1ec6136dca1e917186 /lib/addr_map.c | |
| parent | 84e34b6572d4368784e1e1e732f30595fa1f918e (diff) | |
| download | u-boot-imx-7b6e80538b919c814c94ce8887cec7b892f98a71.zip u-boot-imx-7b6e80538b919c814c94ce8887cec7b892f98a71.tar.gz u-boot-imx-7b6e80538b919c814c94ce8887cec7b892f98a71.tar.bz2 | |
lib/powerpc: addrmap_phys_to_virt() should return a pointer
addrmap_phys_to_virt() converts a physical address (phys_addr_t) to a
virtual address, so it should return a pointer instead of an unsigned long.
Its counterpart, addrmap_virt_to_phys(), takes a pointer, so now they're
orthogonal.
The only caller of addrmap_phys_to_virt() converts the return value to
a pointer anyway.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'lib/addr_map.c')
| -rw-r--r-- | lib/addr_map.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/addr_map.c b/lib/addr_map.c index ff8532c..31384d1 100644 --- a/lib/addr_map.c +++ b/lib/addr_map.c @@ -47,26 +47,29 @@ phys_addr_t addrmap_virt_to_phys(void * vaddr) return (phys_addr_t)(~0); } -unsigned long addrmap_phys_to_virt(phys_addr_t paddr) +void *addrmap_phys_to_virt(phys_addr_t paddr) { int i; for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; i++) { - u64 base, upper, addr; + phys_addr_t base, upper; if (address_map[i].size == 0) continue; - addr = (u64)paddr; - base = (u64)(address_map[i].paddr); - upper = (u64)(address_map[i].size) + base - 1; + base = address_map[i].paddr; + upper = address_map[i].size + base - 1; - if (addr >= base && addr <= upper) { - return paddr - address_map[i].paddr + address_map[i].vaddr; + if (paddr >= base && paddr <= upper) { + phys_addr_t offset; + + offset = address_map[i].paddr - address_map[i].vaddr; + + return (void *)(unsigned long)(paddr - offset); } } - return (unsigned long)(~0); + return (void *)(~0); } void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr, |