Re: Re: [RESEND][PATCH] drivers: of: of_reserved_mem: fixup the CMA alignment not to affect dma-coherent

Re: Re: [RESEND][PATCH] drivers: of: of_reserved_mem: fixup the CMA alignment not to affect dma-coherent

[Jaewon Kim]

>> From: Jaewon <jaewon31.kim@samsung.com>
>>
>> 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>
>> ---
>>  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
>>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: Re: [RESEND][PATCH] drivers: of: of_reserved_mem: fixup the CMA alignment not to affect dma-coherent

[Jaewon Kim]

>Hello,
>
>
>On 2016-05-25 16:38, Rob Herring wrote:
>> On Tue, May 24, 2016 at 11:29 PM, Jaewon Kim <jaewon31.kim@samsung.com> wrote:
>>> From: Jaewon <jaewon31.kim@samsung.com>
>>>
>>> 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>
>> I suppose this needs to go to stable? If so, adding the stable tag and
>> kernel version would be nice so I don't have to.

Hello

In my opinion, this patch is not that critical.
Commit 1cc8e3458b51 might move unaligned(pageblock size) dma-coherent region.
And this patch will move the region back to different address which is aligned less than pageblock size.
But if you think it need to stable branch, please let me know how to add the stable tag.

>>
>>> ---
>>>   drivers/of/of_reserved_mem.c | 5 ++++-
>>>   1 file changed, 4 insertions(+), 1 deletion(-)
>> I'm looking for an ack from Marek on this.
>
>Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>

Thank you for your Ack
>
>Best regards
>--
>Marek Szyprowski, PhD
>Samsung R&D Institute Poland

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>