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

Commit 61ca08c3 authored by Alexander Duyck's avatar Alexander Duyck Committed by Konrad Rzeszutek Wilk
Browse files

swiotlb: Use physical addresses for swiotlb_tbl_unmap_single 



This change makes it so that the unmap functionality also uses physical
addresses.  This helps to further reduce the use of virt_to_phys and
phys_to_virt functions.

In order to clarify things since we now have 2 physical addresses in use
inside of swiotlb_tbl_unmap_single I am renaming phys to orig_addr, and
dma_addr to tlb_addr.  This way is should be clear that orig_addr is
contained within io_orig_addr and tlb_addr is an address within the
io_tlb_addr buffer.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent e05ed4d1

drivers/xen/swiotlb-xen.c

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ 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, phys_to_virt(map), size, dir);

		swiotlb_tbl_unmap_single(dev, map, size, dir);

		dev_addr = 0;

	}

	return dev_addr;
@@ -388,7 +388,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, phys_to_virt(paddr), size, dir);

		swiotlb_tbl_unmap_single(hwdev, paddr, size, dir);

		return;

	}

include/linux/swiotlb.h

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ extern phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, 
					  phys_addr_t phys, size_t size,

					  enum dma_data_direction dir);



extern void swiotlb_tbl_unmap_single(struct device *hwdev, char *dma_addr,

extern void swiotlb_tbl_unmap_single(struct device *hwdev,

				     phys_addr_t tlb_addr,

				     size_t size, enum dma_data_direction dir);



extern void swiotlb_tbl_sync_single(struct device *hwdev, char *dma_addr,

lib/swiotlb.c

+19 −18
Original line number Diff line number Diff line
@@ -515,20 +515,20 @@ phys_addr_t map_single(struct device *hwdev, phys_addr_t phys, size_t size, 
/*

 * dma_addr is the kernel virtual address of the bounce buffer to unmap.

 */

void

swiotlb_tbl_unmap_single(struct device *hwdev, char *dma_addr, size_t size,

			enum dma_data_direction dir)

void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,

			      size_t size, enum dma_data_direction dir)

{

	unsigned long flags;

	int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;

	int index = (dma_addr - (char *)phys_to_virt(io_tlb_start)) >> IO_TLB_SHIFT;

	phys_addr_t phys = io_tlb_orig_addr[index];

	int index = (tlb_addr - io_tlb_start) >> IO_TLB_SHIFT;

	phys_addr_t orig_addr = io_tlb_orig_addr[index];



	/*

	 * First, sync the memory before unmapping the entry

	 */

	if (phys && ((dir == DMA_FROM_DEVICE) || (dir == DMA_BIDIRECTIONAL)))

		swiotlb_bounce(phys, dma_addr, size, DMA_FROM_DEVICE);

		swiotlb_bounce(orig_addr, phys_to_virt(tlb_addr),

			       size, DMA_FROM_DEVICE);



	/*

	 * Return the buffer to the free list by setting the corresponding
@@ -621,7 +621,6 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, 


		ret = phys_to_virt(paddr);

		dev_addr = phys_to_dma(hwdev, paddr);

	}



		/* Confirm address can be DMA'd by device */

		if (dev_addr + size - 1 > dma_mask) {
@@ -630,9 +629,11 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, 
			       (unsigned long long)dev_addr);



			/* DMA_TO_DEVICE to avoid memcpy in unmap_single */

		swiotlb_tbl_unmap_single(hwdev, ret, size, DMA_TO_DEVICE);

			swiotlb_tbl_unmap_single(hwdev, paddr,

						 size, DMA_TO_DEVICE);

			return NULL;

		}

	}



	*dma_handle = dev_addr;

	memset(ret, 0, size);
@@ -652,7 +653,7 @@ swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr, 
		free_pages((unsigned long)vaddr, get_order(size));

	else

		/* DMA_TO_DEVICE to avoid memcpy in swiotlb_tbl_unmap_single */

		swiotlb_tbl_unmap_single(hwdev, vaddr, size, DMA_TO_DEVICE);

		swiotlb_tbl_unmap_single(hwdev, paddr, size, DMA_TO_DEVICE);

}

EXPORT_SYMBOL(swiotlb_free_coherent);
@@ -716,7 +717,7 @@ dma_addr_t 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, phys_to_virt(map), size, dir);

		swiotlb_tbl_unmap_single(dev, map, size, dir);

		return phys_to_dma(dev, io_tlb_overflow_buffer);

	}
@@ -740,7 +741,7 @@ static void unmap_single(struct device *hwdev, dma_addr_t dev_addr, 
	BUG_ON(dir == DMA_NONE);



	if (is_swiotlb_buffer(paddr)) {

		swiotlb_tbl_unmap_single(hwdev, phys_to_virt(paddr), size, dir);

		swiotlb_tbl_unmap_single(hwdev, paddr, size, dir);

		return;

	}