[3.13.y-ckt stable] Patch "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single" has been added to staging queue

[Stefano Stabellini]

On Wed, 28 Jan 2015, Kamal Mostafa wrote:
> This is a note to let you know that I have just added a patch titled
> 
>     swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single
> 
> to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
> which can be found at:
> 
>  http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue
> 
> This patch is scheduled to be released in version 3.13.11-ckt15.
> 
> If you, or anyone else, feels it should not be added to this tree, please 
> reply to this email.
> 
> For more information about the 3.13.y-ckt tree, see
> https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Hello Kamal,
this patch was reverted by dbdd74763f1faf799fbb9ed30423182e92919378.

So you should either remove this patch from the queue or backport
dbdd74763f1faf799fbb9ed30423182e92919378 too.

Thanks,

Stefano



> Thanks.
> -Kamal
> 
> ------
> 
> >From d2c8274f9cb1fe0c467800b88de3557983f83a35 Mon Sep 17 00:00:00 2001
> From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
> Date: Fri, 21 Nov 2014 16:56:12 +0000
> Subject: swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single
> 
> commit 2c3fc8d26dd09b9d7069687eead849ee81c78e46 upstream.
> 
> Need to pass the pointer within the swiotlb internal buffer to the
> swiotlb library, that in the case of xen_unmap_single is dev_addr, not
> paddr.
> 
> Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
> Acked-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
> Signed-off-by: Kamal Mostafa <kamal at canonical.com>
> ---
>  drivers/xen/swiotlb-xen.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
> index d277278..2b28a2d 100644
> --- a/drivers/xen/swiotlb-xen.c
> +++ b/drivers/xen/swiotlb-xen.c
> @@ -433,7 +433,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
> 
>  	/* NOTE: We use dev_addr here, not paddr! */
>  	if (is_xen_swiotlb_buffer(dev_addr)) {
> -		swiotlb_tbl_unmap_single(hwdev, paddr, size, dir);
> +		swiotlb_tbl_unmap_single(hwdev, dev_addr, size, dir);
>  		return;
>  	}
> 
> --
> 1.9.1
>