diff options
author | Arthur Kepner <akepner@sgi.com> | 2008-04-29 04:00:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:11 -0400 |
commit | 74bc7ceebfa1c84ddd3a843ebfb56df013bf7ef5 (patch) | |
tree | 548155250fbc7410273125019c70a7c5c085e895 /include/linux/dma-mapping.h | |
parent | d2ba7e2ae206e9ab24e8937d99d0d5513bfd08e5 (diff) |
dma: add dma_*map*_attrs() interfaces
Introduce new interfaces, dma_*map*_attrs(), for passing architecture-specific
attributes when memory is mapped and unmapped for DMA. Give the interfaces
default implementations which ignore attributes. Also introduce the
dma_{set|get}_attr() interfaces for setting and retrieving individual
attributes. Define one attribute, DMA_ATTR_WRITE_BARRIER, in anticipation of
its use by ia64/sn. Select whether architectures implement arch-specific
versions of the dma_*map*_attrs() interfaces via HAVE_DMA_ATTRS in Kconfig.
[markn@au1.ibm.com: dma_{set,get}_attr() have to be static inline]
Signed-off-by: Arthur Kepner <akepner@sgi.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Jes Sorensen <jes@sgi.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Roland Dreier <rdreier@cisco.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: David Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Grant Grundler <grundler@parisc-linux.org>
Cc: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Mark Nelson <markn@au1.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/dma-mapping.h')
-rw-r--r-- | include/linux/dma-mapping.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 332030709623..952e0f857ac9 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
@@ -146,4 +146,21 @@ static inline void dmam_release_declared_memory(struct device *dev) | |||
146 | } | 146 | } |
147 | #endif /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */ | 147 | #endif /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */ |
148 | 148 | ||
149 | #ifndef CONFIG_HAVE_DMA_ATTRS | ||
150 | struct dma_attrs; | ||
151 | |||
152 | #define dma_map_single_attrs(dev, cpu_addr, size, dir, attrs) \ | ||
153 | dma_map_single(dev, cpu_addr, size, dir) | ||
154 | |||
155 | #define dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) \ | ||
156 | dma_unmap_single(dev, dma_addr, size, dir) | ||
157 | |||
158 | #define dma_map_sg_attrs(dev, sgl, nents, dir, attrs) \ | ||
159 | dma_map_sg(dev, sgl, nents, dir) | ||
160 | |||
161 | #define dma_unmap_sg_attrs(dev, sgl, nents, dir, attrs) \ | ||
162 | dma_unmap_sg(dev, sgl, nents, dir) | ||
163 | |||
164 | #endif /* CONFIG_HAVE_DMA_ATTRS */ | ||
165 | |||
149 | #endif | 166 | #endif |