diff options
author | Milton Miller <miltonm@bga.com> | 2011-06-24 05:05:23 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-19 19:18:38 -0400 |
commit | 3a8f7558e475b68254d8bc3a2211f3f89bf67a71 (patch) | |
tree | 798872b1cef90988846350f4d420954238107427 /include/linux/dma-mapping.h | |
parent | 6a5c7be5e484bda5b2639fedf7dbe3f25c15c962 (diff) |
dma-mapping: Add get_required_mask if arch overrides default
If an architecture sets ARCH_HAS_DMA_GET_REQUIRED_MASK and has settable
dma_map_ops, the required mask may change by the ops implementation.
For example, a system that always has an mmu inline may only require 32
bits while a swiotlb would desire bits to cover all of memory.
Therefore add the field if the architecture does not use the generic
definition of dma_get_required_mask. The first use will by by powerpc.
Note that this does add some dependency on the order in which files are
visible here.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'include/linux/dma-mapping.h')
-rw-r--r-- | include/linux/dma-mapping.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 347fdc32177a..aa32fecd1d34 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
@@ -41,6 +41,9 @@ struct dma_map_ops { | |||
41 | int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); | 41 | int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); |
42 | int (*dma_supported)(struct device *dev, u64 mask); | 42 | int (*dma_supported)(struct device *dev, u64 mask); |
43 | int (*set_dma_mask)(struct device *dev, u64 mask); | 43 | int (*set_dma_mask)(struct device *dev, u64 mask); |
44 | #ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK | ||
45 | u64 (*get_required_mask)(struct device *dev); | ||
46 | #endif | ||
44 | int is_phys; | 47 | int is_phys; |
45 | }; | 48 | }; |
46 | 49 | ||