diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-01-28 07:53:17 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 08:39:29 -0500 |
commit | dfb805e831cc5306b14eacd64e0b36d0d973ee0d (patch) | |
tree | 2190228a1541cb99cccd444e0e24280d24b70f7d /arch/ia64/kernel/pci-dma.c | |
parent | 97d9800de9df9c6e71b00c0a26239c7d7f6a46c4 (diff) |
IA64: fix VT-d dma_mapping_error
dma_mapping_error is used to see if dma_map_single and dma_map_page
succeed. IA64 VT-d dma_mapping_error always says that dma_map_single
is successful even though it could fail. Note that X86 VT-d works
properly in this regard.
This patch fixes IA64 VT-d dma_mapping_error by adding VT-d's own
dma_mapping_error() that works for both X86_64 and IA64. VT-d uses
zero as an error dma address so VT-d's dma_mapping_error returns 1 if
a passed dma address is zero (as x86's VT-d dma_mapping_error does
now).
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/kernel/pci-dma.c')
-rw-r--r-- | arch/ia64/kernel/pci-dma.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index a647f116a155..e4cb443bb988 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c | |||
@@ -99,11 +99,6 @@ int iommu_dma_supported(struct device *dev, u64 mask) | |||
99 | } | 99 | } |
100 | EXPORT_SYMBOL(iommu_dma_supported); | 100 | EXPORT_SYMBOL(iommu_dma_supported); |
101 | 101 | ||
102 | static int vtd_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | ||
103 | { | ||
104 | return 0; | ||
105 | } | ||
106 | |||
107 | void __init pci_iommu_alloc(void) | 102 | void __init pci_iommu_alloc(void) |
108 | { | 103 | { |
109 | dma_ops = &intel_dma_ops; | 104 | dma_ops = &intel_dma_ops; |
@@ -113,7 +108,6 @@ void __init pci_iommu_alloc(void) | |||
113 | dma_ops->sync_single_for_device = machvec_dma_sync_single; | 108 | dma_ops->sync_single_for_device = machvec_dma_sync_single; |
114 | dma_ops->sync_sg_for_device = machvec_dma_sync_sg; | 109 | dma_ops->sync_sg_for_device = machvec_dma_sync_sg; |
115 | dma_ops->dma_supported = iommu_dma_supported; | 110 | dma_ops->dma_supported = iommu_dma_supported; |
116 | dma_ops->mapping_error = vtd_dma_mapping_error; | ||
117 | 111 | ||
118 | /* | 112 | /* |
119 | * The order of these functions is important for | 113 | * The order of these functions is important for |