Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 11:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/powerpc: addrmap_phys_to_virt() should return a pointer

Browse source 
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>
This commit is contained in:
Timur Tabi 2012-05-04 12:21:30 +00:00 • committed by Andy Fleming
parent 84e34b6572
commit 7b6e80538b
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/include/asm/io.h
View file

@ -295,7 +295,7 @@ static inline void *
map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
{ {
#ifdef CONFIG_ADDR_MAP #ifdef CONFIG_ADDR_MAP
return (void *)(addrmap_phys_to_virt(paddr)); return addrmap_phys_to_virt(paddr);
#else #else
return (void *)((unsigned long)paddr); return (void *)((unsigned long)paddr);
#endif #endif

2
include/addr_map.h
View file

@ -22,7 +22,7 @@
#include <asm/types.h> #include <asm/types.h>
extern phys_addr_t addrmap_virt_to_phys(void *vaddr); extern phys_addr_t addrmap_virt_to_phys(void *vaddr);
extern unsigned long addrmap_phys_to_virt(phys_addr_t paddr); extern void *addrmap_phys_to_virt(phys_addr_t paddr);
extern void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr, extern void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
phys_size_t size, int idx); phys_size_t size, int idx);

19
lib/addr_map.c
View file

@ -47,26 +47,29 @@ phys_addr_t addrmap_virt_to_phys(void * vaddr)
return (phys_addr_t)(~0); 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; int i;
for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; 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) if (address_map[i].size == 0)
continue; continue;
addr = (u64)paddr; base = address_map[i].paddr;
base = (u64)(address_map[i].paddr); upper = address_map[i].size + base - 1;
upper = (u64)(address_map[i].size) + base - 1;
if (addr >= base && addr <= upper) { if (paddr >= base && paddr <= upper) {
return paddr - address_map[i].paddr + address_map[i].vaddr; 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, void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,