Signed-off-by: Joerg Roedel <[EMAIL PROTECTED]>
---
arch/x86/kernel/pci-calgary_64.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index fe7695e..e2f2f60 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -525,6 +525,15 @@ static void calgary_free_coherent(struct device *dev,
size_t size,
free_pages((unsigned long)vaddr, get_order(size));
}
+static int calgary_device_supported(struct device *dev)
+{
+ struct iommu_table *tbl;
+
+ tbl = find_iommu_table(dev);
+
+ return translation_enabled(tbl);
+}
+
static struct dma_mapping_ops calgary_dma_ops = {
.alloc_coherent = calgary_alloc_coherent,
.free_coherent = calgary_free_coherent,
@@ -532,6 +541,7 @@ static struct dma_mapping_ops calgary_dma_ops = {
.unmap_single = calgary_unmap_single,
.map_sg = calgary_map_sg,
.unmap_sg = calgary_unmap_sg,
+ .device_supported = calgary_device_supported,
};
static inline void __iomem * busno_to_bbar(unsigned char num)
@@ -1223,16 +1233,6 @@ static int __init calgary_init(void)
goto error;
} while (1);
- dev = NULL;
- for_each_pci_dev(dev) {
- struct iommu_table *tbl;
-
- tbl = find_iommu_table(&dev->dev);
-
- if (translation_enabled(tbl))
- dev->dev.archdata.dma_ops = &calgary_dma_ops;
- }
-
return ret;
error:
@@ -1535,6 +1535,7 @@ int __init calgary_iommu_init(void)
force_iommu = 1;
bad_dma_address = 0x0;
+ x86_register_dma_ops(&calgary_dma_ops, DMA_OPS_TYPE_HW);
/* dma_ops is set to swiotlb or nommu */
if (!dma_ops)
dma_ops = &nommu_dma_ops;
--
1.5.6.4
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
