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

Commit 2b432150 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/for-linus-4.10' of... 

Merge branch 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb fix from Konrad Rzeszutek Wilk:
 "An ARM fix in the Xen SWIOTLB - mainly the translation of physical to
  bus addresses was done just a tad too late"

* 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb-xen: update dev_addr after swapping pages
parents 3aebae06 f1225ee4

drivers/xen/swiotlb-xen.c

+3 −2
Original line number Diff line number Diff line
@@ -414,9 +414,9 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, 
	if (map == SWIOTLB_MAP_ERROR)

		return DMA_ERROR_CODE;



	dev_addr = xen_phys_to_bus(map);

	xen_dma_map_page(dev, pfn_to_page(map >> PAGE_SHIFT),

					dev_addr, map & ~PAGE_MASK, size, dir, attrs);

	dev_addr = xen_phys_to_bus(map);



	/*

	 * Ensure that the address returned is DMA'ble
@@ -575,13 +575,14 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, 
				sg_dma_len(sgl) = 0;

				return 0;

			}

			dev_addr = xen_phys_to_bus(map);

			xen_dma_map_page(hwdev, pfn_to_page(map >> PAGE_SHIFT),

						dev_addr,

						map & ~PAGE_MASK,

						sg->length,

						dir,

						attrs);

			sg->dma_address = xen_phys_to_bus(map);

			sg->dma_address = dev_addr;

		} else {

			/* we are not interested in the dma_addr returned by

			 * xen_dma_map_page, only in the potential cache flushes executed