Commit 7d482813 authored by Jaewon's avatar Jaewon Committed by Rob Herring

drivers: of: of_reserved_mem: fixup the CMA alignment not to affect dma-coherent

There was an alignment mismatch issue for CMA and it was fixed by
commit 1cc8e345 ("drivers: of: of_reserved_mem: fixup the alignment with CMA setup").
However the way of the commit considers not only dma-contiguous(CMA) but also
dma-coherent which has no that requirement.

This patch checks more to distinguish dma-contiguous(CMA) from dma-coherent.
Signed-off-by: default avatarJaewon Kim <jaewon31.kim@samsung.com>
Acked-by: default avatarJason Liu <r64343@freescale.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
[robh: remove erroneous opening bracket]
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 39935466
...@@ -127,7 +127,10 @@ static int __init __reserved_mem_alloc_size(unsigned long node, ...@@ -127,7 +127,10 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
} }
/* Need adjust the alignment to satisfy the CMA requirement */ /* Need adjust the alignment to satisfy the CMA requirement */
if (IS_ENABLED(CONFIG_CMA) && of_flat_dt_is_compatible(node, "shared-dma-pool")) if (IS_ENABLED(CONFIG_CMA)
&& of_flat_dt_is_compatible(node, "shared-dma-pool")
&& of_get_flat_dt_prop(node, "reusable", NULL)
&& !of_get_flat_dt_prop(node, "no-map", NULL))
align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order)); align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order));
prop = of_get_flat_dt_prop(node, "alloc-ranges", &len); prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment