summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/device.h
diff options
context:
space:
mode:
authorFUJITA Tomonori2009-08-04 21:08:22 +0200
committerBenjamin Herrenschmidt2009-08-28 06:24:09 +0200
commit762afb7317b1987fa0851135fe4f2947f68c3c2a (patch)
tree1cf83145c1bdd55b6a166d428af8ee195b09985b /arch/powerpc/include/asm/device.h
parentMerge commit 'tip/iommu-for-powerpc' into next (diff)
downloadkernel-qcow2-linux-762afb7317b1987fa0851135fe4f2947f68c3c2a.tar.gz
kernel-qcow2-linux-762afb7317b1987fa0851135fe4f2947f68c3c2a.tar.xz
kernel-qcow2-linux-762afb7317b1987fa0851135fe4f2947f68c3c2a.zip
powerpc: Remove addr_needs_map in struct dma_mapping_ops
This patch adds max_direct_dma_addr to struct dev_archdata to remove addr_needs_map in struct dma_mapping_ops. It also converts dma_capable() to use max_direct_dma_addr. max_direct_dma_addr is initialized in pci_dma_dev_setup_swiotlb(), called via ppc_md.pci_dma_dev_setup hook. For further information: http://marc.info/?t=124719060200001&r=1&w=2 Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Becky Bruce <beckyb@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/device.h')
-rw-r--r--arch/powerpc/include/asm/device.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
index 7d2277cef09a..0086f8d46f1c 100644
--- a/arch/powerpc/include/asm/device.h
+++ b/arch/powerpc/include/asm/device.h
@@ -16,6 +16,9 @@ struct dev_archdata {
/* DMA operations on that device */
struct dma_mapping_ops *dma_ops;
void *dma_data;
+#ifdef CONFIG_SWIOTLB
+ dma_addr_t max_direct_dma_addr;
+#endif
};
static inline void dev_archdata_set_node(struct dev_archdata *ad,