diff options
| author |   Jisheng Zhang <jszhang@marvell.com> | 2015-09-11 08:49:47 +0100 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2015-09-14 12:28:30 +0100 |
| commit | ba9cc453c400049f632d4eb2f2835e2f96654ddc (patch) | |
| tree | 1dd9048002201177e07389f0c335c116f3052929 /arch | |
| parent | Linux 4.3-rc1 (diff) | |
| download | linux-dev-ba9cc453c400049f632d4eb2f2835e2f96654ddc.tar.xz linux-dev-ba9cc453c400049f632d4eb2f2835e2f96654ddc.zip | |
arm64: dma-mapping: check whether cma area is initialized or not
If CMA is turned on and CMA size is set to zero, kernel should
behave as if CMA was not enabled at compile time.
Every dma allocation should check existence of cma area
before requesting memory.
Arm has done this by commit e464ef16c4f0 ("arm: dma-mapping: add
checking cma area initialized"), also do this for arm64.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 0bcc4bc94b4a..99224dcebdc5 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -100,7 +100,7 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, if (IS_ENABLED(CONFIG_ZONE_DMA) && dev->coherent_dma_mask <= DMA_BIT_MASK(32)) flags |= GFP_DMA; - if (IS_ENABLED(CONFIG_DMA_CMA) && (flags & __GFP_WAIT)) { + if (dev_get_cma_area(dev) && (flags & __GFP_WAIT)) { struct page *page; void *addr; |