lkml.org 
[lkml]   [2016]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] 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 <jaewon31.kim@samsung.com>
    ---
    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)) {
    align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order));

    prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
    \
     
     \ /
      Last update: 2016-05-16 12:21    [W:4.233 / U:1.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site