lkml.org 
[lkml]   [2009]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/9] xen/swiotlb: add hook for swiotlb_arch_range_needs_mapping
Date
From: Ian Campbell <ian.campbell@citrix.com>

Impact: Xen support for DMA

Add hook so that Xen can determine whether a particular address range needs
pfn<->mfn mapping.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Reviewed-by: "H. Peter Anvin" <hpa@zytor.com>
---
arch/x86/kernel/pci-swiotlb_64.c | 3 +++
drivers/pci/xen-iommu.c | 5 +++++
include/xen/swiotlb.h | 8 ++++++++
3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c
index 7f87ce2..7aa8c18 100644
--- a/arch/x86/kernel/pci-swiotlb_64.c
+++ b/arch/x86/kernel/pci-swiotlb_64.c
@@ -54,6 +54,9 @@ phys_addr_t swiotlb_bus_to_phys(dma_addr_t baddr)

int __weak swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size)
{
+ if (xen_pv_domain())
+ return xen_range_needs_mapping(paddr, size);
+
return 0;
}

diff --git a/drivers/pci/xen-iommu.c b/drivers/pci/xen-iommu.c
index 47d87a7..fcef078 100644
--- a/drivers/pci/xen-iommu.c
+++ b/drivers/pci/xen-iommu.c
@@ -118,6 +118,11 @@ static int range_straddles_page_boundary(phys_addr_t p, size_t size)
return 1;
}

+int xen_range_needs_mapping(phys_addr_t paddr, size_t size)
+{
+ return range_straddles_page_boundary(paddr, size);
+}
+
static inline void xen_dma_unmap_page(struct page *page)
{
/* Xen TODO: 2.6.18 xen calls __gnttab_dma_unmap_page here
diff --git a/include/xen/swiotlb.h b/include/xen/swiotlb.h
index 3d96b07..e975aa0 100644
--- a/include/xen/swiotlb.h
+++ b/include/xen/swiotlb.h
@@ -5,6 +5,7 @@
extern void xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs);
extern phys_addr_t xen_bus_to_phys(dma_addr_t daddr);
extern dma_addr_t xen_phys_to_bus(phys_addr_t paddr);
+extern int xen_range_needs_mapping(phys_addr_t phys, size_t size);
#else
static inline void xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs)
{
@@ -19,6 +20,13 @@ static inline dma_addr_t xen_phys_to_bus(phys_addr_t paddr)
{
return paddr;
}
+
+static inline int xen_range_needs_mapping(phys_addr_t phys, size_t size)
+{
+ return 0;
+}
#endif

+
+
#endif /* _XEN_SWIOTLB_H */
--
1.6.0.6


\
 
 \ /
  Last update: 2009-04-01 00:57    [W:0.092 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site