aboutsummaryrefslogtreecommitdiffstats
path: root/lib/swiotlb.c
diff options
context:
space:
mode:
authorBecky Bruce <beckyb@kernel.crashing.org>2009-04-08 10:09:21 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-08 10:18:38 -0400
commit42d7c5e353cef9062129b0de3ec9ddf10567b9ca (patch)
tree4467abd8266c4ca8830e128dca6e838d912bb6d8 /lib/swiotlb.c
parent380d687833aee098c4a2c3b35beaefe1c1f48d01 (diff)
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: Becky Bruce <beckyb@kernel.crashing.org> Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Kumar 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: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/swiotlb.c')
-rw-r--r--lib/swiotlb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index d912f068145c..bffe6d7ef9d9 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -129,7 +129,7 @@ dma_addr_t __weak swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)
129 return paddr; 129 return paddr;
130} 130}
131 131
132phys_addr_t __weak swiotlb_bus_to_phys(dma_addr_t baddr) 132phys_addr_t __weak swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)
133{ 133{
134 return baddr; 134 return baddr;
135} 135}
@@ -140,9 +140,9 @@ static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
140 return swiotlb_phys_to_bus(hwdev, virt_to_phys(address)); 140 return swiotlb_phys_to_bus(hwdev, virt_to_phys(address));
141} 141}
142 142
143static void *swiotlb_bus_to_virt(dma_addr_t address) 143void * __weak swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t address)
144{ 144{
145 return phys_to_virt(swiotlb_bus_to_phys(address)); 145 return phys_to_virt(swiotlb_bus_to_phys(hwdev, address));
146} 146}
147 147
148int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev, 148int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev,
@@ -691,7 +691,7 @@ EXPORT_SYMBOL_GPL(swiotlb_map_page);
691static void unmap_single(struct device *hwdev, dma_addr_t dev_addr, 691static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,
692 size_t size, int dir) 692 size_t size, int dir)
693{ 693{
694 char *dma_addr = swiotlb_bus_to_virt(dev_addr); 694 char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);
695 695
696 BUG_ON(dir == DMA_NONE); 696 BUG_ON(dir == DMA_NONE);
697 697
@@ -728,7 +728,7 @@ static void
728swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr, 728swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
729 size_t size, int dir, int target) 729 size_t size, int dir, int target)
730{ 730{
731 char *dma_addr = swiotlb_bus_to_virt(dev_addr); 731 char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);
732 732
733 BUG_ON(dir == DMA_NONE); 733 BUG_ON(dir == DMA_NONE);
734 734