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

Commit b5cab0da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull swiotlb updates from Konrad Rzeszutek Wilk:

 - minor fixes (rate limiting), remove certain functions

 - support for DMA_ATTR_SKIP_CPU_SYNC which is an optimization
   in the DMA API

* 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support
  swiotlb: Add support for DMA_ATTR_SKIP_CPU_SYNC
  swiotlb-xen: Enforce return of DMA_ERROR_CODE in mapping function
  swiotlb: Drop unused functions swiotlb_map_sg and swiotlb_unmap_sg
  swiotlb: Rate-limit printing when running out of SW-IOMMU space
parents 93173b5b d29fa0cb

arch/arm/xen/mm.c

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ struct dma_map_ops *xen_dma_ops; 
EXPORT_SYMBOL(xen_dma_ops);



static struct dma_map_ops xen_swiotlb_dma_ops = {

	.mapping_error = xen_swiotlb_dma_mapping_error,

	.alloc = xen_swiotlb_alloc_coherent,

	.free = xen_swiotlb_free_coherent,

	.sync_single_for_cpu = xen_swiotlb_sync_single_for_cpu,

arch/x86/xen/pci-swiotlb-xen.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
int xen_swiotlb __read_mostly;



static struct dma_map_ops xen_swiotlb_dma_ops = {

	.mapping_error = xen_swiotlb_dma_mapping_error,

	.alloc = xen_swiotlb_alloc_coherent,

	.free = xen_swiotlb_free_coherent,

	.sync_single_for_cpu = xen_swiotlb_sync_single_for_cpu,

drivers/xen/swiotlb-xen.c

+12 −15
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, 
	 */

	trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force);



	map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir);

	map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir,

				     attrs);

	if (map == SWIOTLB_MAP_ERROR)

		return DMA_ERROR_CODE;
@@ -416,11 +417,13 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, 
	/*

	 * Ensure that the address returned is DMA'ble

	 */

	if (!dma_capable(dev, dev_addr, size)) {

		swiotlb_tbl_unmap_single(dev, map, size, dir);

		dev_addr = 0;

	}

	if (dma_capable(dev, dev_addr, size))

		return dev_addr;



	attrs |= DMA_ATTR_SKIP_CPU_SYNC;

	swiotlb_tbl_unmap_single(dev, map, size, dir, attrs);



	return DMA_ERROR_CODE;

}

EXPORT_SYMBOL_GPL(xen_swiotlb_map_page);
@@ -444,7 +447,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, paddr, size, dir, attrs);

		return;

	}
@@ -557,11 +560,12 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, 
								 start_dma_addr,

								 sg_phys(sg),

								 sg->length,

								 dir);

								 dir, attrs);

			if (map == SWIOTLB_MAP_ERROR) {

				dev_warn(hwdev, "swiotlb buffer is full\n");

				/* Don't panic here, we expect map_sg users

				   to do proper error handling. */

				attrs |= DMA_ATTR_SKIP_CPU_SYNC;

				xen_swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,

							   attrs);

				sg_dma_len(sgl) = 0;
@@ -648,13 +652,6 @@ xen_swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg, 
}

EXPORT_SYMBOL_GPL(xen_swiotlb_sync_sg_for_device);



int

xen_swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr)

{

	return !dma_addr;

}

EXPORT_SYMBOL_GPL(xen_swiotlb_dma_mapping_error);



/*

 * Return whether the given device DMA address mask can be supported

 * properly.  For example, if your device can only drive the low 24-bits

include/linux/swiotlb.h

+4 −10
Original line number Diff line number Diff line
@@ -44,11 +44,13 @@ enum dma_sync_target { 
extern phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,

					  dma_addr_t tbl_dma_addr,

					  phys_addr_t phys, size_t size,

					  enum dma_data_direction dir);

					  enum dma_data_direction dir,

					  unsigned long attrs);



extern void swiotlb_tbl_unmap_single(struct device *hwdev,

				     phys_addr_t tlb_addr,

				     size_t size, enum dma_data_direction dir);

				     size_t size, enum dma_data_direction dir,

				     unsigned long attrs);



extern void swiotlb_tbl_sync_single(struct device *hwdev,

				    phys_addr_t tlb_addr,
@@ -72,14 +74,6 @@ extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr, 
			       size_t size, enum dma_data_direction dir,

			       unsigned long attrs);



extern int

swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nents,

	       enum dma_data_direction dir);



extern void

swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,

		 enum dma_data_direction dir);



extern int

swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,

		     enum dma_data_direction dir,

include/xen/swiotlb-xen.h

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ extern void 
xen_swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,

			       int nelems, enum dma_data_direction dir);



extern int

xen_swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);



extern int

xen_swiotlb_dma_supported(struct device *hwdev, u64 mask);