lkml.org 
[lkml]   [2012]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 04/22] ARM: LPAE: use phys_addr_t on virt <--> phys conversion
    Date
    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>
    ---
    arch/arm/include/asm/memory.h | 26 ++++++++++++++++++--------
    1 file changed, 18 insertions(+), 8 deletions(-)

    diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
    index 3d93779..81e1714 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

    @@ -207,14 +217,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)

    /*
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-08-11 04:03    [W:0.024 / U:58.732 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site