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

Commit 42d7c5e3 authored by Becky Bruce's avatar Becky Bruce Committed by Ingo Molnar
Browse files

swiotlb: change swiotlb_bus_to[phys,virt] prototypes 



Add a hwdev argument that is needed on some architectures
in order to access a per-device offset that is taken into
account when producing a physical address (also needed to
get from bus address to virtual address because the physical
address is an intermediate step).

Also make swiotlb_bus_to_virt weak so architectures can
override it.

Signed-off-by: default avatarBecky Bruce <beckyb@kernel.crashing.org>
Acked-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Cc: jeremy@goop.org
Cc: ian.campbell@citrix.com
LKML-Reference: <1239199761-22886-8-git-send-email-galak@kernel.crashing.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 380d6878

arch/x86/kernel/pci-swiotlb.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr) 
	return paddr;

}



phys_addr_t swiotlb_bus_to_phys(dma_addr_t baddr)

phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)

{

	return baddr;

}

include/linux/swiotlb.h

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ extern void *swiotlb_alloc(unsigned order, unsigned long nslabs); 


extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev,

				      phys_addr_t address);

extern phys_addr_t swiotlb_bus_to_phys(dma_addr_t address);

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);

lib/swiotlb.c

+5 −5
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ dma_addr_t __weak swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr) 
	return paddr;

}



phys_addr_t __weak swiotlb_bus_to_phys(dma_addr_t baddr)

phys_addr_t __weak swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)

{

	return baddr;

}
@@ -140,9 +140,9 @@ static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev, 
	return swiotlb_phys_to_bus(hwdev, virt_to_phys(address));

}



static void *swiotlb_bus_to_virt(dma_addr_t address)

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

{

	return phys_to_virt(swiotlb_bus_to_phys(address));

	return phys_to_virt(swiotlb_bus_to_phys(hwdev, address));

}



int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev,
@@ -691,7 +691,7 @@ EXPORT_SYMBOL_GPL(swiotlb_map_page); 
static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,

			 size_t size, int dir)

{

	char *dma_addr = swiotlb_bus_to_virt(dev_addr);

	char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);



	BUG_ON(dir == DMA_NONE);
@@ -728,7 +728,7 @@ static void 
swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,

		    size_t size, int dir, int target)

{

	char *dma_addr = swiotlb_bus_to_virt(dev_addr);

	char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);



	BUG_ON(dir == DMA_NONE);