lkml.org 
[lkml]   [2011]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 10/14] Unicore32: adapt for dma_map_ops changes
    From: Andrzej Pietrasiewicz <andrzej.p@samsung.com>

    Adapt core Unicore32 architecture code for dma_map_ops changes: replace
    alloc/free_coherent with generic alloc/free methods.

    Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    ---
    arch/unicore32/include/asm/dma-mapping.h | 18 ++++++++++++------
    arch/unicore32/mm/dma-swiotlb.c | 4 ++--
    2 files changed, 14 insertions(+), 8 deletions(-)

    diff --git a/arch/unicore32/include/asm/dma-mapping.h b/arch/unicore32/include/asm/dma-mapping.h
    index 9258e59..366460a 100644
    --- a/arch/unicore32/include/asm/dma-mapping.h
    +++ b/arch/unicore32/include/asm/dma-mapping.h
    @@ -82,20 +82,26 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
    return 0;
    }

    -static inline void *dma_alloc_coherent(struct device *dev, size_t size,
    - dma_addr_t *dma_handle, gfp_t flag)
    +#define dma_alloc_coherent(d,s,h,f) dma_alloc_attrs(d,s,h,f,NULL)
    +
    +static inline void *dma_alloc_attrs(struct device *dev, size_t size,
    + dma_addr_t *dma_handle, gfp_t flag,
    + struct dma_attrs *attrs)
    {
    struct dma_map_ops *dma_ops = get_dma_ops(dev);

    - return dma_ops->alloc_coherent(dev, size, dma_handle, flag);
    + return dma_ops->alloc(dev, size, dma_handle, flag, attrs);
    }

    -static inline void dma_free_coherent(struct device *dev, size_t size,
    - void *cpu_addr, dma_addr_t dma_handle)
    +#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
    +
    +static inline void dma_free_attrs(struct device *dev, size_t size,
    + void *cpu_addr, dma_addr_t dma_handle,
    + struct dma_attrs *attrs)
    {
    struct dma_map_ops *dma_ops = get_dma_ops(dev);

    - dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
    + dma_ops->free(dev, size, cpu_addr, dma_handle, attrs);
    }

    #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
    diff --git a/arch/unicore32/mm/dma-swiotlb.c b/arch/unicore32/mm/dma-swiotlb.c
    index bfa9fbb..ff70c2d 100644
    --- a/arch/unicore32/mm/dma-swiotlb.c
    +++ b/arch/unicore32/mm/dma-swiotlb.c
    @@ -18,8 +18,8 @@
    #include <asm/dma.h>

    struct dma_map_ops swiotlb_dma_map_ops = {
    - .alloc_coherent = swiotlb_alloc_coherent,
    - .free_coherent = swiotlb_free_coherent,
    + .alloc = swiotlb_alloc_coherent,
    + .free = swiotlb_free_coherent,
    .map_sg = swiotlb_map_sg_attrs,
    .unmap_sg = swiotlb_unmap_sg_attrs,
    .dma_supported = swiotlb_dma_supported,
    --
    1.7.1.569.g6f426


    \
     
     \ /
      Last update: 2011-12-23 13:31    [W:0.024 / U:59.332 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site