lkml.org 
[lkml]   [2018]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 29/34] powerpc/dma: use phys_to_dma instead of get_dma_offset
    Date
    Use the standard portable helper instead of the powerpc specific one,
    which is about to go away.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    ---
    arch/powerpc/kernel/dma.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
    index cf0ae0b3fb24..5c83a34f288f 100644
    --- a/arch/powerpc/kernel/dma.c
    +++ b/arch/powerpc/kernel/dma.c
    @@ -6,7 +6,7 @@
    */

    #include <linux/device.h>
    -#include <linux/dma-mapping.h>
    +#include <linux/dma-direct.h>
    #include <linux/dma-debug.h>
    #include <linux/gfp.h>
    #include <linux/memblock.h>
    @@ -42,7 +42,7 @@ static u64 __maybe_unused get_pfn_limit(struct device *dev)
    int dma_nommu_dma_supported(struct device *dev, u64 mask)
    {
    #ifdef CONFIG_PPC64
    - u64 limit = get_dma_offset(dev) + (memblock_end_of_DRAM() - 1);
    + u64 limit = phys_to_dma(dev, (memblock_end_of_DRAM() - 1));

    /* Limit fits in the mask, we are good */
    if (mask >= limit)
    @@ -100,7 +100,7 @@ void *__dma_nommu_alloc_coherent(struct device *dev, size_t size,
    return NULL;
    ret = page_address(page);
    memset(ret, 0, size);
    - *dma_handle = __pa(ret) + get_dma_offset(dev);
    + *dma_handle = phys_to_dma(dev,__pa(ret));

    return ret;
    }
    @@ -139,7 +139,7 @@ int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl,
    int i;

    for_each_sg(sgl, sg, nents, i) {
    - sg->dma_address = sg_phys(sg) + get_dma_offset(dev);
    + sg->dma_address = phys_to_dma(dev, sg_phys(sg));
    sg->dma_length = sg->length;

    if (attrs & DMA_ATTR_SKIP_CPU_SYNC)
    @@ -170,7 +170,7 @@ dma_addr_t dma_nommu_map_page(struct device *dev, struct page *page,
    if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
    __dma_sync_page(page, offset, size, dir);

    - return page_to_phys(page) + offset + get_dma_offset(dev);
    + return phys_to_dma(dev, page_to_phys(page)) + offset;
    }

    #ifdef CONFIG_NOT_COHERENT_CACHE
    --
    2.19.1
    \
     
     \ /
      Last update: 2018-11-14 09:25    [W:13.347 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site