summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBecky Bruce <beckyb@kernel.crashing.org>2009-04-08 09:09:18 -0500
committerIngo Molnar <mingo@elte.hu>2009-04-08 16:18:36 +0200
commitef5722f698bde01cfec2b98fff733a48663ebf55 (patch)
tree80eba1195866f2643d1343b318d9caa2b81aa347
parentdd6b02fe427f30520d0adc94aa52352367227873 (diff)
downloadblackbird-op-linux-ef5722f698bde01cfec2b98fff733a48663ebf55.tar.gz
blackbird-op-linux-ef5722f698bde01cfec2b98fff733a48663ebf55.zip
swiotlb: allow arch override of address_needs_mapping
Some architectures require additional checking to determine if a device can dma to an address and need to provide their own address_needs_mapping.. 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-5-git-send-email-galak@kernel.crashing.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--lib/swiotlb.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index e8a47c8cf77e..d81afab85167 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -145,6 +145,12 @@ static void *swiotlb_bus_to_virt(dma_addr_t address)
return phys_to_virt(swiotlb_bus_to_phys(address));
}
+int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev,
+ dma_addr_t addr, size_t size)
+{
+ 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;
@@ -309,10 +315,10 @@ cleanup1:
return -ENOMEM;
}
-static int
+static inline int
address_needs_mapping(struct device *hwdev, dma_addr_t addr, size_t size)
{
- return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size);
+ return swiotlb_arch_address_needs_mapping(hwdev, addr, size);
}
static inline int range_needs_mapping(phys_addr_t paddr, size_t size)
OpenPOWER on IntegriCloud