Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 291be10f authored by Julien Grall's avatar Julien Grall Committed by David Vrabel
Browse files

xen/swiotlb: Pass addresses rather than frame numbers to xen_arch_need_swiotlb 



With 64KB page granularity support, the frame number will be different.

It will be easier to modify the behavior in a single place rather than
in each caller.

Signed-off-by: default avatarJulien Grall <julien.grall@citrix.com>
Reviewed-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 250c9af3

arch/arm/include/asm/xen/page.h

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
#define xen_unmap(cookie) iounmap((cookie))



bool xen_arch_need_swiotlb(struct device *dev,

			   unsigned long pfn,

			   unsigned long bfn);

			   phys_addr_t phys,

			   dma_addr_t dev_addr);

unsigned long xen_get_swiotlb_free_pages(unsigned int order);



#endif /* _ASM_ARM_XEN_PAGE_H */

arch/arm/xen/mm.c

+5 −2
Original line number Diff line number Diff line
@@ -138,9 +138,12 @@ void __xen_dma_sync_single_for_device(struct device *hwdev, 
}



bool xen_arch_need_swiotlb(struct device *dev,

			   unsigned long pfn,

			   unsigned long bfn)

			   phys_addr_t phys,

			   dma_addr_t dev_addr)

{

	unsigned long pfn = PFN_DOWN(phys);

	unsigned long bfn = PFN_DOWN(dev_addr);



	return (!hypercall_cflush && (pfn != bfn) && !is_device_dma_coherent(dev));

}

arch/x86/include/asm/xen/page.h

+2 −2
Original line number Diff line number Diff line
@@ -298,8 +298,8 @@ void make_lowmem_page_readwrite(void *vaddr); 
#define xen_unmap(cookie) iounmap((cookie))



static inline bool xen_arch_need_swiotlb(struct device *dev,

					 unsigned long pfn,

					 unsigned long bfn)

					 phys_addr_t phys,

					 dma_addr_t dev_addr)

{

	return false;

}

drivers/xen/swiotlb-xen.c

+2 −2
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, 
	 */

	if (dma_capable(dev, dev_addr, size) &&

	    !range_straddles_page_boundary(phys, size) &&

		!xen_arch_need_swiotlb(dev, PFN_DOWN(phys), PFN_DOWN(dev_addr)) &&

		!xen_arch_need_swiotlb(dev, phys, dev_addr) &&

		!swiotlb_force) {

		/* we are not interested in the dma_addr returned by

		 * xen_dma_map_page, only in the potential cache flushes executed
@@ -551,7 +551,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, 
		dma_addr_t dev_addr = xen_phys_to_bus(paddr);



		if (swiotlb_force ||

		    xen_arch_need_swiotlb(hwdev, PFN_DOWN(paddr), PFN_DOWN(dev_addr)) ||

		    xen_arch_need_swiotlb(hwdev, paddr, dev_addr) ||

		    !dma_capable(hwdev, dev_addr, sg->length) ||

		    range_straddles_page_boundary(paddr, sg->length)) {

			phys_addr_t map = swiotlb_tbl_map_single(hwdev,