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

Commit 02ca646e authored by FUJITA Tomonori's avatar FUJITA Tomonori
Browse files

swiotlb: remove unnecessary swiotlb_bus_to_virt 



swiotlb_bus_to_virt is unncessary; we can use swiotlb_bus_to_phys and
phys_to_virt instead.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarBecky Bruce <beckyb@kernel.crashing.org>
parent cf56e3f2

arch/powerpc/kernel/dma-swiotlb.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -24,16 +24,6 @@ 
int swiotlb __read_mostly;

int swiotlb __read_mostly;

unsigned int ppc_swiotlb_enable;

unsigned int ppc_swiotlb_enable;





void *swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t addr)

{

	unsigned long pfn = PFN_DOWN(swiotlb_bus_to_phys(hwdev, addr));

	void *pageaddr = page_address(pfn_to_page(pfn));



	if (pageaddr != NULL)

		return pageaddr + (addr % PAGE_SIZE);

	return NULL;

}



dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)

dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)

{

{

	return paddr + get_dma_direct_offset(hwdev);

	return paddr + get_dma_direct_offset(hwdev);

lib/swiotlb.c

+23 −18
Original line number Original line Diff line number Diff line
@@ -124,17 +124,13 @@ phys_addr_t __weak swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr) 
	return baddr;

	return baddr;

}

}





/* Note that this doesn't work with highmem page */

static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,

static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,

				      volatile void *address)

				      volatile void *address)

{

{

	return swiotlb_phys_to_bus(hwdev, virt_to_phys(address));

	return swiotlb_phys_to_bus(hwdev, virt_to_phys(address));

}

}





void * __weak swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t address)

{

	return phys_to_virt(swiotlb_bus_to_phys(hwdev, address));

}



int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev,

int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev,

					       dma_addr_t addr, size_t size)

					       dma_addr_t addr, size_t size)

{

{
@@ -307,9 +303,10 @@ address_needs_mapping(struct device *hwdev, dma_addr_t addr, size_t size) 
	return swiotlb_arch_address_needs_mapping(hwdev, addr, size);

	return swiotlb_arch_address_needs_mapping(hwdev, addr, size);

}

}





static int is_swiotlb_buffer(char *addr)

static int is_swiotlb_buffer(phys_addr_t paddr)

{

{

	return addr >= io_tlb_start && addr < io_tlb_end;

	return paddr >= virt_to_phys(io_tlb_start) &&

		paddr < virt_to_phys(io_tlb_end);

}

}





/*

/*
@@ -582,10 +579,12 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent); 




void

void

swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,

swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,

		      dma_addr_t dma_handle)

		      dma_addr_t dev_addr)

{

{

	phys_addr_t paddr = swiotlb_bus_to_phys(hwdev, dev_addr);



	WARN_ON(irqs_disabled());

	WARN_ON(irqs_disabled());

	if (!is_swiotlb_buffer(vaddr))

	if (!is_swiotlb_buffer(paddr))

		free_pages((unsigned long)vaddr, get_order(size));

		free_pages((unsigned long)vaddr, get_order(size));

	else

	else

		/* DMA_TO_DEVICE to avoid memcpy in unmap_single */

		/* DMA_TO_DEVICE to avoid memcpy in unmap_single */
@@ -671,19 +670,25 @@ EXPORT_SYMBOL_GPL(swiotlb_map_page); 
static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,

static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,

			 size_t size, int dir)

			 size_t size, int dir)

{

{

	char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);

	phys_addr_t paddr = swiotlb_bus_to_phys(hwdev, dev_addr);





	BUG_ON(dir == DMA_NONE);

	BUG_ON(dir == DMA_NONE);





	if (is_swiotlb_buffer(dma_addr)) {

	if (is_swiotlb_buffer(paddr)) {

		do_unmap_single(hwdev, dma_addr, size, dir);

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

		return;

		return;

	}

	}





	if (dir != DMA_FROM_DEVICE)

	if (dir != DMA_FROM_DEVICE)

		return;

		return;





	dma_mark_clean(dma_addr, size);

	/*

	 * phys_to_virt doesn't work with hihgmem page but we could

	 * call dma_mark_clean() with hihgmem page here. However, we

	 * are fine since dma_mark_clean() is null on POWERPC. We can

	 * make dma_mark_clean() take a physical address if necessary.

	 */

	dma_mark_clean(phys_to_virt(paddr), size);

}

}





void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,

void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
@@ -708,19 +713,19 @@ static void 
swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,

swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,

		    size_t size, int dir, int target)

		    size_t size, int dir, int target)

{

{

	char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);

	phys_addr_t paddr = swiotlb_bus_to_phys(hwdev, dev_addr);





	BUG_ON(dir == DMA_NONE);

	BUG_ON(dir == DMA_NONE);





	if (is_swiotlb_buffer(dma_addr)) {

	if (is_swiotlb_buffer(paddr)) {

		sync_single(hwdev, dma_addr, size, dir, target);

		sync_single(hwdev, phys_to_virt(paddr), size, dir, target);

		return;

		return;

	}

	}





	if (dir != DMA_FROM_DEVICE)

	if (dir != DMA_FROM_DEVICE)

		return;

		return;





	dma_mark_clean(dma_addr, size);

	dma_mark_clean(phys_to_virt(paddr), size);

}

}





void

void