lkml.org 
[lkml]   [2015]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 011/150] swiotlb-xen: pass dev_addr to xen_dma_unmap_page and xen_dma_sync_single_for_cpu
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

    commit d6883e6f32e07ef2cc974753ba00927de099e6d7 upstream.

    xen_dma_unmap_page and xen_dma_sync_single_for_cpu take a dma_addr_t
    handle as argument, not a physical address.

    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
    Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/xen/swiotlb-xen.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/xen/swiotlb-xen.c
    +++ b/drivers/xen/swiotlb-xen.c
    @@ -447,7 +447,7 @@ static void xen_unmap_single(struct devi

    BUG_ON(dir == DMA_NONE);

    - xen_dma_unmap_page(hwdev, paddr, size, dir, attrs);
    + xen_dma_unmap_page(hwdev, dev_addr, size, dir, attrs);

    /* NOTE: We use dev_addr here, not paddr! */
    if (is_xen_swiotlb_buffer(dev_addr)) {
    @@ -495,14 +495,14 @@ xen_swiotlb_sync_single(struct device *h
    BUG_ON(dir == DMA_NONE);

    if (target == SYNC_FOR_CPU)
    - xen_dma_sync_single_for_cpu(hwdev, paddr, size, dir);
    + xen_dma_sync_single_for_cpu(hwdev, dev_addr, size, dir);

    /* NOTE: We use dev_addr here, not paddr! */
    if (is_xen_swiotlb_buffer(dev_addr))
    swiotlb_tbl_sync_single(hwdev, paddr, size, dir, target);

    if (target == SYNC_FOR_DEVICE)
    - xen_dma_sync_single_for_cpu(hwdev, paddr, size, dir);
    + xen_dma_sync_single_for_cpu(hwdev, dev_addr, size, dir);

    if (dir != DMA_FROM_DEVICE)
    return;



    \
     
     \ /
      Last update: 2015-01-14 10:01    [W:7.230 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site