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 05/14] IA64: adapt for dma_map_ops changes
    From: Andrzej Pietrasiewicz <andrzej.p@samsung.com>

    Adapt core IA64 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/ia64/hp/common/sba_iommu.c | 11 ++++++-----
    arch/ia64/include/asm/dma-mapping.h | 18 ++++++++++++------
    arch/ia64/kernel/pci-swiotlb.c | 9 +++++----
    arch/ia64/sn/pci/pci_dma.c | 9 +++++----
    4 files changed, 28 insertions(+), 19 deletions(-)

    diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
    index f5f4ef1..e5eb9c4 100644
    --- a/arch/ia64/hp/common/sba_iommu.c
    +++ b/arch/ia64/hp/common/sba_iommu.c
    @@ -1130,7 +1130,8 @@ void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size,
    * See Documentation/DMA-API-HOWTO.txt
    */
    static void *
    -sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags)
    +sba_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
    + gfp_t flags, struct dma_attrs *attrs)
    {
    struct ioc *ioc;
    void *addr;
    @@ -1192,8 +1193,8 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp
    *
    * See Documentation/DMA-API-HOWTO.txt
    */
    -static void sba_free_coherent (struct device *dev, size_t size, void *vaddr,
    - dma_addr_t dma_handle)
    +static void sba_free_coherent(struct device *dev, size_t size, void *vaddr,
    + dma_addr_t dma_handle, struct dma_attrs *attrs)
    {
    sba_unmap_single_attrs(dev, dma_handle, size, 0, NULL);
    free_pages((unsigned long) vaddr, get_order(size));
    @@ -2213,8 +2214,8 @@ sba_page_override(char *str)
    __setup("sbapagesize=",sba_page_override);

    struct dma_map_ops sba_dma_ops = {
    - .alloc_coherent = sba_alloc_coherent,
    - .free_coherent = sba_free_coherent,
    + .alloc = sba_alloc_coherent,
    + .free = sba_free_coherent,
    .map_page = sba_map_page,
    .unmap_page = sba_unmap_page,
    .map_sg = sba_map_sg_attrs,
    diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
    index 4336d08..4f5e814 100644
    --- a/arch/ia64/include/asm/dma-mapping.h
    +++ b/arch/ia64/include/asm/dma-mapping.h
    @@ -23,23 +23,29 @@ extern void machvec_dma_sync_single(struct device *, dma_addr_t, size_t,
    extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int,
    enum dma_data_direction);

    -static inline void *dma_alloc_coherent(struct device *dev, size_t size,
    - dma_addr_t *daddr, gfp_t gfp)
    +#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 *daddr, gfp_t gfp,
    + struct dma_attrs *attrs)
    {
    struct dma_map_ops *ops = platform_dma_get_ops(dev);
    void *caddr;

    - caddr = ops->alloc_coherent(dev, size, daddr, gfp);
    + caddr = ops->alloc(dev, size, daddr, gfp, attrs);
    debug_dma_alloc_coherent(dev, size, *daddr, caddr);
    return caddr;
    }

    -static inline void dma_free_coherent(struct device *dev, size_t size,
    - void *caddr, dma_addr_t daddr)
    +#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 *caddr, dma_addr_t daddr,
    + struct dma_attrs *attrs)
    {
    struct dma_map_ops *ops = platform_dma_get_ops(dev);
    debug_dma_free_coherent(dev, size, caddr, daddr);
    - ops->free_coherent(dev, size, caddr, daddr);
    + ops->free(dev, size, caddr, daddr, attrs);
    }

    #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
    diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
    index d9485d9..cc034c2 100644
    --- a/arch/ia64/kernel/pci-swiotlb.c
    +++ b/arch/ia64/kernel/pci-swiotlb.c
    @@ -15,16 +15,17 @@ int swiotlb __read_mostly;
    EXPORT_SYMBOL(swiotlb);

    static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size,
    - dma_addr_t *dma_handle, gfp_t gfp)
    + dma_addr_t *dma_handle, gfp_t gfp,
    + struct dma_attrs *attrs)
    {
    if (dev->coherent_dma_mask != DMA_BIT_MASK(64))
    gfp |= GFP_DMA;
    - return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
    + return swiotlb_alloc_coherent(dev, size, dma_handle, gfp, attrs);
    }

    struct dma_map_ops swiotlb_dma_ops = {
    - .alloc_coherent = ia64_swiotlb_alloc_coherent,
    - .free_coherent = swiotlb_free_coherent,
    + .alloc = ia64_swiotlb_alloc_coherent,
    + .free = swiotlb_free_coherent,
    .map_page = swiotlb_map_page,
    .unmap_page = swiotlb_unmap_page,
    .map_sg = swiotlb_map_sg_attrs,
    diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
    index a9d310d..3290d6e 100644
    --- a/arch/ia64/sn/pci/pci_dma.c
    +++ b/arch/ia64/sn/pci/pci_dma.c
    @@ -76,7 +76,8 @@ EXPORT_SYMBOL(sn_dma_set_mask);
    * more information.
    */
    static void *sn_dma_alloc_coherent(struct device *dev, size_t size,
    - dma_addr_t * dma_handle, gfp_t flags)
    + dma_addr_t * dma_handle, gfp_t flags,
    + struct dma_attrs *attrs)
    {
    void *cpuaddr;
    unsigned long phys_addr;
    @@ -137,7 +138,7 @@ static void *sn_dma_alloc_coherent(struct device *dev, size_t size,
    * any associated IOMMU mappings.
    */
    static void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
    - dma_addr_t dma_handle)
    + dma_addr_t dma_handle, struct dma_attrs *attrs)
    {
    struct pci_dev *pdev = to_pci_dev(dev);
    struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
    @@ -466,8 +467,8 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size)
    }

    static struct dma_map_ops sn_dma_ops = {
    - .alloc_coherent = sn_dma_alloc_coherent,
    - .free_coherent = sn_dma_free_coherent,
    + .alloc = sn_dma_alloc_coherent,
    + .free = sn_dma_free_coherent,
    .map_page = sn_dma_map_page,
    .unmap_page = sn_dma_unmap_page,
    .map_sg = sn_dma_map_sg,
    --
    1.7.1.569.g6f426


    \
     
     \ /
      Last update: 2011-12-23 13:31    [W:3.131 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site