Commit 297f7f82 authored by Stefano Stabellini's avatar Stefano Stabellini Committed by Juergen Gross
Browse files

swiotlb-xen: add struct device * parameter to xen_dma_sync_for_cpu 



No functional changes. The parameter is unused in this patch but will be
used by next patches.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: default avatarCorey Minyard <cminyard@mvista.com>
Tested-by: default avatarRoman Shaposhnik <roman@zededa.com>
Link: https://lore.kernel.org/r/20200710223427.6897-5-sstabellini@kernel.org


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent d900781a

arch/arm/xen/mm.c

+3 −2
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ static void dma_cache_maint(dma_addr_t handle, size_t size, u32 op) 
 * pfn_valid returns true the pages is local and we can use the native

 * dma-direct functions, otherwise we call the Xen specific version.

 */

void xen_dma_sync_for_cpu(dma_addr_t handle, phys_addr_t paddr, size_t size,

void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle,

			  phys_addr_t paddr, size_t size,

			  enum dma_data_direction dir)

{

	if (pfn_valid(PFN_DOWN(handle)))

drivers/xen/swiotlb-xen.c

+2 −2
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr, 
	BUG_ON(dir == DMA_NONE);



	if (!dev_is_dma_coherent(hwdev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))

		xen_dma_sync_for_cpu(dev_addr, paddr, size, dir);

		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))
@@ -442,7 +442,7 @@ xen_swiotlb_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, 
	phys_addr_t paddr = xen_bus_to_phys(dev, dma_addr);



	if (!dev_is_dma_coherent(dev))

		xen_dma_sync_for_cpu(dma_addr, paddr, size, dir);

		xen_dma_sync_for_cpu(dev, dma_addr, paddr, size, dir);



	if (is_xen_swiotlb_buffer(dma_addr))

		swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_CPU);

include/xen/swiotlb-xen.h

+3 −2
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 


#include <linux/swiotlb.h>



void xen_dma_sync_for_cpu(dma_addr_t handle, phys_addr_t paddr, size_t size,

void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle,

			  phys_addr_t paddr, size_t size,

			  enum dma_data_direction dir);

void xen_dma_sync_for_device(dma_addr_t handle, phys_addr_t paddr, size_t size,

		enum dma_data_direction dir);

CRA Git | Maintained and supported by SUSTech CRA and CCSE