diff options
| author | Alessandro Rubini <rubini@gnudd.com> | 2012-04-04 19:40:10 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-04-12 11:10:18 -0700 |
| commit | f7219a5300ba753b0c762d631763bd878b8bb00c (patch) | |
| tree | 3876bd0df1e5a8f9c7b4e606a3c1c4c15976e05c /arch/x86 | |
| parent | 4692d77fc3c8978a36406a3cf9e8b899f86f68f1 (diff) | |
| download | kernel_goldelico_gta04-f7219a5300ba753b0c762d631763bd878b8bb00c.zip kernel_goldelico_gta04-f7219a5300ba753b0c762d631763bd878b8bb00c.tar.gz kernel_goldelico_gta04-f7219a5300ba753b0c762d631763bd878b8bb00c.tar.bz2 | |
x86: Introduce CONFIG_X86_DMA_REMAP
The default functions phys_to_dma, dma_to_phys implement identity
mapping as fast inline functions. Some systems, however, may need a
custom function to implement its own mapping between CPU addresses and
device addresses. This new configuration option allows the functions
to be external when needed (such as for the ConneXt device)
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Link: http://lkml.kernel.org/r/6e4329b772df675f1c442f68e59e844e4dd8c965.1333560789.git.rubini@gnudd.com
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 3 | ||||
| -rw-r--r-- | arch/x86/include/asm/dma-mapping.h | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 07b412a..95ca560 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2220,6 +2220,9 @@ config X86_DEV_DMA_OPS bool depends on X86_64 +config X86_DMA_REMAP + bool + source "net/Kconfig" source "drivers/Kconfig" diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 09aa473..61c0bd2 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -62,6 +62,12 @@ extern void *dma_generic_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, gfp_t flag, struct dma_attrs *attrs); +#ifdef CONFIG_X86_DMA_REMAP /* Platform code defines bridge-specific code */ +extern bool dma_capable(struct device *dev, dma_addr_t addr, size_t size); +extern dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); +extern phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); +#else + static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) { if (!dev->dma_mask) @@ -79,6 +85,7 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr) { return daddr; } +#endif /* CONFIG_X86_DMA_REMAP */ static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size, |