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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAL_JsqJPDJi7n9_Wuam5-pd+9adOFGQo9cjQxuEngJDm486G7A@mail.gmail.com>
Date:	Fri, 3 Jun 2016 07:23:33 -0500
From:	Rob Herring <robh+dt@...nel.org>
To:	Jaewon Kim <jaewon31.kim@...sung.com>
Cc:	r64343@...escale.com, Marek Szyprowski <m.szyprowski@...sung.com>,
	Grant Likely <grant.likely@...aro.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-mm@...ck.org" <linux-mm@...ck.org>,
	Jaewon Kim <jaewon31.kim@...il.com>
Subject: Re: [RESEND][PATCH] drivers: of: of_reserved_mem: fixup the CMA
 alignment not to affect dma-coherent

On Tue, May 24, 2016 at 11:29 PM, Jaewon Kim <jaewon31.kim@...sung.com> wrote:
> From: Jaewon <jaewon31.kim@...sung.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@...sung.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.

>                 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
>