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

Commit cf56e3f2 authored by FUJITA Tomonori's avatar FUJITA Tomonori
Browse files

swiotlb: remove swiotlb_arch_range_needs_mapping 



Nobody uses swiotlb_arch_range_needs_mapping().

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

arch/x86/kernel/pci-swiotlb.c

+0 −5
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr) 
	return baddr;

}



int __weak swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size)

{

	return 0;

}



static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,

					dma_addr_t *dma_handle, gfp_t flags)

{

include/linux/swiotlb.h

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, 
extern phys_addr_t swiotlb_bus_to_phys(struct device *hwdev,

				       dma_addr_t address);



extern int swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size);



extern void

*swiotlb_alloc_coherent(struct device *hwdev, size_t size,

			dma_addr_t *dma_handle, gfp_t flags);

lib/swiotlb.c

+2 −13
Original line number Diff line number Diff line
@@ -141,11 +141,6 @@ int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev, 
	return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size);

}



int __weak swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size)

{

	return 0;

}



static void swiotlb_print_info(unsigned long bytes)

{

	phys_addr_t pstart, pend;
@@ -312,11 +307,6 @@ address_needs_mapping(struct device *hwdev, dma_addr_t addr, size_t size) 
	return swiotlb_arch_address_needs_mapping(hwdev, addr, size);

}



static inline int range_needs_mapping(phys_addr_t paddr, size_t size)

{

	return swiotlb_force || swiotlb_arch_range_needs_mapping(paddr, size);

}



static int is_swiotlb_buffer(char *addr)

{

	return addr >= io_tlb_start && addr < io_tlb_end;
@@ -646,8 +636,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, 
	 * we can safely return the device addr and not worry about bounce

	 * buffering it.

	 */

	if (!address_needs_mapping(dev, dev_addr, size) &&

	    !range_needs_mapping(phys, size))

	if (!address_needs_mapping(dev, dev_addr, size) && !swiotlb_force)

		return dev_addr;



	/*
@@ -810,7 +799,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, 
		phys_addr_t paddr = sg_phys(sg);

		dma_addr_t dev_addr = swiotlb_phys_to_bus(hwdev, paddr);



		if (range_needs_mapping(paddr, sg->length) ||

		if (swiotlb_force ||

		    address_needs_mapping(hwdev, dev_addr, sg->length)) {

			void *map = map_single(hwdev, sg_phys(sg),

					       sg->length, dir);