diff options
| author | Cyril Chemparathy <cyril@ti.com> | 2012-09-21 11:56:02 -0400 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2013-01-22 11:41:18 +0530 |
| commit | 215641ae33d8758827da37adcfed7d10fe7efc02 (patch) | |
| tree | a3e4890a48158fa3a5c3266b5f6407932d246b8d | |
| parent | 266c076b4c59db46d6addcd243ad8128dc1b08b4 (diff) | |
| download | linux-topics-215641ae33d8758827da37adcfed7d10fe7efc02.tar.gz | |
ARM: LPAE: use phys_addr_t on virt <--> phys conversion
This patch fixes up the types used when converting back and forth between
physical and virtual addresses.
Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Reviewed-by: Nicolas Pitre <nico@linaro.org>
| -rw-r--r-- | arch/arm/include/asm/memory.h | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 512d2348322..a4fc01e1648 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -157,22 +157,32 @@ extern unsigned long __pv_offset; extern unsigned long __pv_phys_offset; #define PHYS_OFFSET __virt_to_phys(PAGE_OFFSET) -static inline unsigned long __virt_to_phys(unsigned long x) +static inline phys_addr_t __virt_to_phys(unsigned long x) { unsigned long t; early_patch_imm8("add", t, x, __pv_offset, 0); return t; } -static inline unsigned long __phys_to_virt(unsigned long x) +static inline unsigned long __phys_to_virt(phys_addr_t x) { - unsigned long t; - early_patch_imm8("sub", t, x, __pv_offset, 0); + unsigned long t, xlo = x; + early_patch_imm8("sub", t, xlo, __pv_offset, 0); return t; } + #else -#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET) -#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET) + +static inline phys_addr_t __virt_to_phys(unsigned long x) +{ + return (phys_addr_t)x - PAGE_OFFSET + PHYS_OFFSET; +} + +static inline unsigned long __phys_to_virt(phys_addr_t x) +{ + return x - PHYS_OFFSET + PAGE_OFFSET; +} + #endif #endif #endif /* __ASSEMBLY__ */ @@ -210,14 +220,14 @@ static inline phys_addr_t virt_to_phys(const volatile void *x) static inline void *phys_to_virt(phys_addr_t x) { - return (void *)(__phys_to_virt((unsigned long)(x))); + return (void *)__phys_to_virt(x); } /* * Drivers should NOT use these either. */ #define __pa(x) __virt_to_phys((unsigned long)(x)) -#define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) +#define __va(x) ((void *)__phys_to_virt((phys_addr_t)(x))) #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) /* |