arm64: Limit the CMA buffer to 32-bit if ZONE_DMA
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 13 Jun 2014 12:41:20 +0000 (13:41 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 22 Jan 2015 21:27:23 +0000 (21:27 +0000)
commit432d182423d53bc7f03d3a399cd57482c5ca47b0
tree22dfbd1a6730e757c15704a90f28a527ee454e8d
parent83f1bff42dfdbf3f4bc70a07f4304db54f89d27d
arm64: Limit the CMA buffer to 32-bit if ZONE_DMA

When the CMA buffer is allocated, it is too early to know whether
devices will require ZONE_DMA memory. This patch limits the CMA buffer
to (DMA_BIT_MASK(32) + 1) if CONFIG_ZONE_DMA is enabled.

In addition, it computes the dma_to_phys(DMA_BIT_MASK(32)) before the
increment (no current functional change).

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 2d5a5612bceda8edd25b29f363c4e2c6cda28bab)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
arch/arm64/mm/init.c
arch/arm64/mm/init.c