lkml.org 
[lkml]   [2021]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v15 08/12] swiotlb: Refactor swiotlb_tbl_unmap_single
    Date
    Add a new function, swiotlb_release_slots, to make the code reusable for
    supporting different bounce buffer pools.

    Signed-off-by: Claire Chang <tientzu@chromium.org>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Tested-by: Stefano Stabellini <sstabellini@kernel.org>
    Tested-by: Will Deacon <will@kernel.org>
    ---
    kernel/dma/swiotlb.c | 35 ++++++++++++++++++++---------------
    1 file changed, 20 insertions(+), 15 deletions(-)

    diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
    index b41d16e92cf6..93752e752e76 100644
    --- a/kernel/dma/swiotlb.c
    +++ b/kernel/dma/swiotlb.c
    @@ -557,27 +557,15 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr,
    return tlb_addr;
    }

    -/*
    - * tlb_addr is the physical address of the bounce buffer to unmap.
    - */
    -void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
    - size_t mapping_size, enum dma_data_direction dir,
    - unsigned long attrs)
    +static void swiotlb_release_slots(struct device *dev, phys_addr_t tlb_addr)
    {
    - struct io_tlb_mem *mem = hwdev->dma_io_tlb_mem;
    + struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
    unsigned long flags;
    - unsigned int offset = swiotlb_align_offset(hwdev, tlb_addr);
    + unsigned int offset = swiotlb_align_offset(dev, tlb_addr);
    int index = (tlb_addr - offset - mem->start) >> IO_TLB_SHIFT;
    int nslots = nr_slots(mem->slots[index].alloc_size + offset);
    int count, i;

    - /*
    - * First, sync the memory before unmapping the entry
    - */
    - if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
    - (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL))
    - swiotlb_bounce(hwdev, tlb_addr, mapping_size, DMA_FROM_DEVICE);
    -
    /*
    * Return the buffer to the free list by setting the corresponding
    * entries to indicate the number of contiguous entries available.
    @@ -612,6 +600,23 @@ void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
    spin_unlock_irqrestore(&mem->lock, flags);
    }

    +/*
    + * tlb_addr is the physical address of the bounce buffer to unmap.
    + */
    +void swiotlb_tbl_unmap_single(struct device *dev, phys_addr_t tlb_addr,
    + size_t mapping_size, enum dma_data_direction dir,
    + unsigned long attrs)
    +{
    + /*
    + * First, sync the memory before unmapping the entry
    + */
    + if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
    + (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL))
    + swiotlb_bounce(dev, tlb_addr, mapping_size, DMA_FROM_DEVICE);
    +
    + swiotlb_release_slots(dev, tlb_addr);
    +}
    +
    void swiotlb_sync_single_for_device(struct device *dev, phys_addr_t tlb_addr,
    size_t size, enum dma_data_direction dir)
    {
    --
    2.32.0.288.g62a8d224e6-goog
    \
     
     \ /
      Last update: 2021-06-24 17:58    [W:8.578 / U:0.528 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site