lkml.org 
[lkml]   [2021]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 10/14] dma-direct: Add a new wrapper __dma_direct_free_pages()
    Date
    Add a new wrapper __dma_direct_free_pages() that will be useful later
    for dev_swiotlb_free().

    Signed-off-by: Claire Chang <tientzu@chromium.org>
    ---
    kernel/dma/direct.c | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
    index 30ccbc08e229..a76a1a2f24da 100644
    --- a/kernel/dma/direct.c
    +++ b/kernel/dma/direct.c
    @@ -75,6 +75,11 @@ static bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size)
    min_not_zero(dev->coherent_dma_mask, dev->bus_dma_limit);
    }

    +static void __dma_direct_free_pages(struct device *dev, struct page *page, size_t size)
    +{
    + dma_free_contiguous(dev, page, size);
    +}
    +
    static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,
    gfp_t gfp)
    {
    @@ -237,7 +242,7 @@ void *dma_direct_alloc(struct device *dev, size_t size,
    return NULL;
    }
    out_free_pages:
    - dma_free_contiguous(dev, page, size);
    + __dma_direct_free_pages(dev, page, size);
    return NULL;
    }

    @@ -273,7 +278,7 @@ void dma_direct_free(struct device *dev, size_t size,
    else if (IS_ENABLED(CONFIG_ARCH_HAS_DMA_CLEAR_UNCACHED))
    arch_dma_clear_uncached(cpu_addr, size);

    - dma_free_contiguous(dev, dma_direct_to_page(dev, dma_addr), size);
    + __dma_direct_free_pages(dev, dma_direct_to_page(dev, dma_addr), size);
    }

    struct page *dma_direct_alloc_pages(struct device *dev, size_t size,
    @@ -310,7 +315,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size,
    *dma_handle = phys_to_dma_direct(dev, page_to_phys(page));
    return page;
    out_free_pages:
    - dma_free_contiguous(dev, page, size);
    + __dma_direct_free_pages(dev, page, size);
    return NULL;
    }

    @@ -329,7 +334,7 @@ void dma_direct_free_pages(struct device *dev, size_t size,
    if (force_dma_unencrypted(dev))
    set_memory_encrypted((unsigned long)vaddr, 1 << page_order);

    - dma_free_contiguous(dev, page, size);
    + __dma_direct_free_pages(dev, page, size);
    }

    #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \
    --
    2.30.0.478.g8a0d178c01-goog
    \
     
     \ /
      Last update: 2021-02-09 07:30    [W:5.389 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site