>> From: Jaewon <[email protected]> >> >> 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 <[email protected]> >> --- >> drivers/of/of_reserved_mem.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c >> index ed01c01..45b873e 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)) { > >This won't actually compile as you add a bracket here, but no closing >bracket... > >I've fixed up and applied. Thank you very much for your correction. I might add debug code with the bracket. Please let me know if any issue in submitting this patch > >> align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - >> 1, pageblock_order)); >> >> prop = of_get_flat_dt_prop(node, "alloc-ranges", &len); >> -- >> 1.9.1 >>
