lkml.org 
[lkml]   [2009]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:core/iommu] swiotlb: use swiotlb_sync_single instead of duplicating code
    Commit-ID:  380d687833aee098c4a2c3b35beaefe1c1f48d01
    Gitweb: http://git.kernel.org/tip/380d687833aee098c4a2c3b35beaefe1c1f48d01
    Author: Becky Bruce <beckyb@kernel.crashing.org>
    AuthorDate: Wed, 8 Apr 2009 09:09:20 -0500
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 8 Apr 2009 16:18:37 +0200

    swiotlb: use swiotlb_sync_single instead of duplicating code

    Right now both swiotlb_sync_single_range and swiotlb_sync_sg
    were duplicating the code in swiotlb_sync_single. Just call it
    instead. Also rearrange the sync_single code for readability.

    Note that the swiotlb_sync_sg code was previously doing
    a complicated comparison to determine if an addresses needed
    to be unmapped where a simple is_swiotlb_buffer() call
    would have sufficed.

    Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
    Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Cc: jeremy@goop.org
    Cc: ian.campbell@citrix.com
    LKML-Reference: <1239199761-22886-7-git-send-email-galak@kernel.crashing.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>


    ---
    lib/swiotlb.c | 30 ++++++++++++------------------
    1 files changed, 12 insertions(+), 18 deletions(-)

    diff --git a/lib/swiotlb.c b/lib/swiotlb.c
    index 2bde54a..d912f06 100644
    --- a/lib/swiotlb.c
    +++ b/lib/swiotlb.c
    @@ -731,10 +731,16 @@ swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
    char *dma_addr = swiotlb_bus_to_virt(dev_addr);

    BUG_ON(dir == DMA_NONE);
    - if (is_swiotlb_buffer(dma_addr))
    +
    + if (is_swiotlb_buffer(dma_addr)) {
    sync_single(hwdev, dma_addr, size, dir, target);
    - else if (dir == DMA_FROM_DEVICE)
    - dma_mark_clean(dma_addr, size);
    + return;
    + }
    +
    + if (dir != DMA_FROM_DEVICE)
    + return;
    +
    + dma_mark_clean(dma_addr, size);
    }

    void
    @@ -761,13 +767,7 @@ swiotlb_sync_single_range(struct device *hwdev, dma_addr_t dev_addr,
    unsigned long offset, size_t size,
    int dir, int target)
    {
    - char *dma_addr = swiotlb_bus_to_virt(dev_addr) + offset;
    -
    - BUG_ON(dir == DMA_NONE);
    - if (is_swiotlb_buffer(dma_addr))
    - sync_single(hwdev, dma_addr, size, dir, target);
    - else if (dir == DMA_FROM_DEVICE)
    - dma_mark_clean(dma_addr, size);
    + swiotlb_sync_single(hwdev, dev_addr + offset, size, dir, target);
    }

    void
    @@ -890,15 +890,9 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl,
    struct scatterlist *sg;
    int i;

    - BUG_ON(dir == DMA_NONE);
    -
    - for_each_sg(sgl, sg, nelems, i) {
    - if (sg->dma_address != swiotlb_phys_to_bus(hwdev, sg_phys(sg)))
    - sync_single(hwdev, swiotlb_bus_to_virt(sg->dma_address),
    + for_each_sg(sgl, sg, nelems, i)
    + swiotlb_sync_single(hwdev, sg->dma_address,
    sg->dma_length, dir, target);
    - else if (dir == DMA_FROM_DEVICE)
    - dma_mark_clean(swiotlb_bus_to_virt(sg->dma_address), sg->dma_length);
    - }
    }

    void

    \
     
     \ /
      Last update: 2009-04-08 17:29    [W:0.045 / U:123.164 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site