]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
swiotlb-xen: add struct device * parameter to is_xen_swiotlb_buffer
authorStefano Stabellini <stefano.stabellini@xilinx.com>
Fri, 10 Jul 2020 22:34:23 +0000 (15:34 -0700)
committerJuergen Gross <jgross@suse.com>
Tue, 4 Aug 2020 05:49:18 +0000 (07:49 +0200)
No functional changes. The parameter is unused in this patch but will be
used by next patches.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: Corey Minyard <cminyard@mvista.com>
Tested-by: Roman Shaposhnik <roman@zededa.com>
Link: https://lore.kernel.org/r/20200710223427.6897-7-sstabellini@kernel.org
Signed-off-by: Juergen Gross <jgross@suse.com>
drivers/xen/swiotlb-xen.c

index 8a3a7bcc5ec04596376ed4e6f8b115bffb4425dd..e2c35f45f91e7cc81114215f3100104516f3d067 100644 (file)
@@ -97,7 +97,7 @@ static inline int range_straddles_page_boundary(phys_addr_t p, size_t size)
        return 0;
 }
 
-static int is_xen_swiotlb_buffer(dma_addr_t dma_addr)
+static int is_xen_swiotlb_buffer(struct device *dev, dma_addr_t dma_addr)
 {
        unsigned long bfn = XEN_PFN_DOWN(dma_addr);
        unsigned long xen_pfn = bfn_to_local_pfn(bfn);
@@ -431,7 +431,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
                xen_dma_sync_for_cpu(hwdev, dev_addr, paddr, size, dir);
 
        /* NOTE: We use dev_addr here, not paddr! */
-       if (is_xen_swiotlb_buffer(dev_addr))
+       if (is_xen_swiotlb_buffer(hwdev, dev_addr))
                swiotlb_tbl_unmap_single(hwdev, paddr, size, size, dir, attrs);
 }
 
@@ -444,7 +444,7 @@ xen_swiotlb_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr,
        if (!dev_is_dma_coherent(dev))
                xen_dma_sync_for_cpu(dev, dma_addr, paddr, size, dir);
 
-       if (is_xen_swiotlb_buffer(dma_addr))
+       if (is_xen_swiotlb_buffer(dev, dma_addr))
                swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_CPU);
 }
 
@@ -454,7 +454,7 @@ xen_swiotlb_sync_single_for_device(struct device *dev, dma_addr_t dma_addr,
 {
        phys_addr_t paddr = xen_bus_to_phys(dev, dma_addr);
 
-       if (is_xen_swiotlb_buffer(dma_addr))
+       if (is_xen_swiotlb_buffer(dev, dma_addr))
                swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE);
 
        if (!dev_is_dma_coherent(dev))