lkml.org 
[lkml]   [2012]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] Hexagon: adapt for dma_map_ops changes
    Adapt core Hexagon architecture code for dma_map_ops changes: replace
    alloc/free_coherent with generic alloc/free methods.

    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    ---

    Hello,

    This patch adds Hexagon architecture to the DMA-mapping framework
    redesign preparation patches. For more information please refer to the
    following thread:
    https://lkml.org/lkml/2011/12/23/97

    Best regards
    Marek Szyprowski
    Samsung Poland R&D Center
    ---
    arch/hexagon/include/asm/dma-mapping.h | 18 ++++++++++++------
    arch/hexagon/kernel/dma.c | 9 +++++----
    2 files changed, 17 insertions(+), 10 deletions(-)

    diff --git a/arch/hexagon/include/asm/dma-mapping.h b/arch/hexagon/include/asm/dma-mapping.h
    index 448b224..233ed3d 100644
    --- a/arch/hexagon/include/asm/dma-mapping.h
    +++ b/arch/hexagon/include/asm/dma-mapping.h
    @@ -71,29 +71,35 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
    return (dma_addr == bad_dma_address);
    }

    -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)
    {
    void *ret;
    struct dma_map_ops *ops = get_dma_ops(dev);

    BUG_ON(!dma_ops);

    - ret = ops->alloc_coherent(dev, size, dma_handle, flag);
    + ret = ops->alloc(dev, size, dma_handle, flag, attrs);

    debug_dma_alloc_coherent(dev, size, *dma_handle, ret);

    return ret;
    }

    -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);

    BUG_ON(!dma_ops);

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

    debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
    }
    diff --git a/arch/hexagon/kernel/dma.c b/arch/hexagon/kernel/dma.c
    index e711ace..3730221 100644
    --- a/arch/hexagon/kernel/dma.c
    +++ b/arch/hexagon/kernel/dma.c
    @@ -54,7 +54,8 @@ static struct gen_pool *coherent_pool;
    /* Allocates from a pool of uncached memory that was reserved at boot time */

    void *hexagon_dma_alloc_coherent(struct device *dev, size_t size,
    - dma_addr_t *dma_addr, gfp_t flag)
    + dma_addr_t *dma_addr, gfp_t flag,
    + struct dma_attrs *attrs)
    {
    void *ret;

    @@ -81,7 +82,7 @@ void *hexagon_dma_alloc_coherent(struct device *dev, size_t size,
    }

    static void hexagon_free_coherent(struct device *dev, size_t size, void *vaddr,
    - dma_addr_t dma_addr)
    + dma_addr_t dma_addr, struct dma_attrs *attrs)
    {
    gen_pool_free(coherent_pool, (unsigned long) vaddr, size);
    }
    @@ -202,8 +203,8 @@ static void hexagon_sync_single_for_device(struct device *dev,
    }

    struct dma_map_ops hexagon_dma_ops = {
    - .alloc_coherent = hexagon_dma_alloc_coherent,
    - .free_coherent = hexagon_free_coherent,
    + .alloc = hexagon_dma_alloc_coherent,
    + .free = hexagon_free_coherent,
    .map_sg = hexagon_map_sg,
    .map_page = hexagon_map_page,
    .sync_single_for_cpu = hexagon_sync_single_for_cpu,
    --
    1.7.1.569.g6f426


    \
     
     \ /
      Last update: 2012-02-13 11:43    [W:0.024 / U:154.252 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site