[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-ef5722f698bde01cfec2b98fff733a48663ebf55@git.kernel.org>
Date: Wed, 8 Apr 2009 15:25:06 GMT
From: Becky Bruce <beckyb@...nel.crashing.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
galak@...nel.crashing.org, fujita.tomonori@....ntt.co.jp,
tglx@...utronix.de, beckyb@...nel.crashing.org, mingo@...e.hu
Subject: [tip:core/iommu] swiotlb: allow arch override of address_needs_mapping
Commit-ID: ef5722f698bde01cfec2b98fff733a48663ebf55
Gitweb: http://git.kernel.org/tip/ef5722f698bde01cfec2b98fff733a48663ebf55
Author: Becky Bruce <beckyb@...nel.crashing.org>
AuthorDate: Wed, 8 Apr 2009 09:09:18 -0500
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 8 Apr 2009 16:18:36 +0200
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@...nel.crashing.org>
Acked-by: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
Signed-off-by: Kumar Gala <galak@...nel.crashing.org>
Cc: jeremy@...p.org
Cc: ian.campbell@...rix.com
LKML-Reference: <1239199761-22886-5-git-send-email-galak@...nel.crashing.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
lib/swiotlb.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index e8a47c8..d81afab 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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists