diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-03-24 10:35:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-11 21:39:26 +0100 |
| commit | fec428515d877aba91e5dbe59883584dc0afffba (patch) | |
| tree | 4df3b5ec3f93ffe5028376679b11d86bc6aa753a /arch/arm64/mm | |
| parent | bd963e5ed978651e0086b898b613aebc181f6b77 (diff) | |
arm64: Remove pgprot_dmacoherent()
Since this macro is identical to pgprot_writecombine() and is only used
in a single place, remove it completely to avoid confusion. On ARMv7+
processors, the coherent DMA mapping must be Normal NonCacheable (a.k.a.
writecombine) to avoid mismatched hardware attribute aliases (with the
kernel linear mapping as Normal Cacheable).
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 196adf2f3015eacac0567278ba538e3ffdd16d0e)
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 9337524601ed..c851eb44dc50 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -36,10 +36,8 @@ EXPORT_SYMBOL(dma_ops); static pgprot_t __get_dma_pgprot(struct dma_attrs *attrs, pgprot_t prot, bool coherent) { - if (dma_get_attr(DMA_ATTR_WRITE_COMBINE, attrs)) + if (!coherent || dma_get_attr(DMA_ATTR_WRITE_COMBINE, attrs)) return pgprot_writecombine(prot); - else if (!coherent) - return pgprot_dmacoherent(prot); return prot; } |