diff options
| author | Jaewon <jaewon31.kim@samsung.com> | 2016-05-25 13:29:50 +0900 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2016-06-03 07:24:10 -0500 |
| commit | 7d482813bb3518cbfeae1b987a5afd76a88c7eb3 (patch) | |
| tree | 85179fabe95d6cb5af46742b1d16b093b3d8130b | |
| parent | 3993546646baf1dab5f5c4f7d9bb58f2046fd1c1 (diff) | |
| download | linux-7d482813bb3518cbfeae1b987a5afd76a88c7eb3.tar.gz linux-7d482813bb3518cbfeae1b987a5afd76a88c7eb3.tar.bz2 linux-7d482813bb3518cbfeae1b987a5afd76a88c7eb3.zip | |
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 1cc8e3458b51 ("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: Jaewon Kim <jaewon31.kim@samsung.com>
Acked-by: Jason Liu <r64343@freescale.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
[robh: remove erroneous opening bracket]
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | drivers/of/of_reserved_mem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index ed01c0172e4a..ed7e681efcf0 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -127,7 +127,10 @@ static int __init __reserved_mem_alloc_size(unsigned long node, } /* 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)); prop = of_get_flat_dt_prop(node, "alloc-ranges", &len); |