[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20141119210703.GE20440@laptop.dumpdata.com>
Date: Wed, 19 Nov 2014 16:07:03 -0500
From: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To: Stefano Stabellini <stefano.stabellini@...citrix.com>
Cc: xen-devel@...ts.xensource.com, Ian.Campbell@...rix.com,
david.vrabel@...rix.com, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, catalin.marinas@....com
Subject: Re: [PATCH v9 12/13] swiotlb-xen: pass dev_addr to
xen_dma_unmap_page and xen_dma_sync_single_for_cpu
On Wed, Nov 12, 2014 at 11:40:53AM +0000, Stefano Stabellini wrote:
> xen_dma_unmap_page and xen_dma_sync_single_for_cpu take a dma_addr_t
> handle as argument, not a physical address.
Ouch. Should this also go on stable tree?
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@...citrix.com>
> Reviewed-by: Catalin Marinas <catalin.marinas@....com>
> ---
> drivers/xen/swiotlb-xen.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
> index 3725ee4..498b654 100644
> --- a/drivers/xen/swiotlb-xen.c
> +++ b/drivers/xen/swiotlb-xen.c
> @@ -449,7 +449,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
>
> 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)) {
> @@ -497,14 +497,14 @@ xen_swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
> 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;
> --
> 1.7.10.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists