From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80769C48BE5 for ; Fri, 11 Jun 2021 17:10:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 29CFB61412 for ; Fri, 11 Jun 2021 17:10:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29CFB61412 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A72226B0036; Fri, 11 Jun 2021 13:10:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A22026B006C; Fri, 11 Jun 2021 13:10:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89C4D6B006E; Fri, 11 Jun 2021 13:10:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0245.hostedemail.com [216.40.44.245]) by kanga.kvack.org (Postfix) with ESMTP id 576F66B0036 for ; Fri, 11 Jun 2021 13:10:52 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id E2ACF180ACF16 for ; Fri, 11 Jun 2021 17:10:51 +0000 (UTC) X-FDA: 78242082702.13.96908F9 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf28.hostedemail.com (Postfix) with ESMTP id B9BF92001060 for ; Fri, 11 Jun 2021 17:10:45 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 88C6C613E9 for ; Fri, 11 Jun 2021 17:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623431450; bh=FfrPBTLS3IBVIVyyeuJrgFZ+eOxNJLAjI5MfDp/aJgE=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=VU5wP/l85pMtYrSDweQgAaUPIHsusCfDjF07cdtFKfQtoIIaokVemKetVswvZYash FkioIRy8dQFOiIQP+5w2TjVopahgobGeAH2i1Qj61jCDGFxqVCrxh+yB9IgQ83Isq3 xVmhXwKsxZW0kZa7sg/7QmO6gjeV08NXO/IgNZlTiZPzirDqz+Yp5b0YbmXWbkXZBR v+g97Eq/G0EhB0EMF7Cf3OnCRSQX1+cqQUGahsTqeN8mlHl+p7INZ+1vcgVljQhmQo F0vZ/rKfzxyKNvpYQpvJKP+tZMbZRDXejJYQkwhOesVQ5vkJLY9jmem/0yjWxj9Nyq FWXezBTE043+Q== Received: by mail-ed1-f45.google.com with SMTP id t3so37953856edc.7 for ; Fri, 11 Jun 2021 10:10:50 -0700 (PDT) X-Gm-Message-State: AOAM533l8A8CN8W6lS218HPcEc0sC7ZRLA12HX10nzl+JcqXHbjRLm0H v/b86/IGrtEb+UZABfw1J6RZlrYZS7qamSTdCA== X-Google-Smtp-Source: ABdhPJzXen0iXLyQ/Wre3Q5uONhrHhT7pVpH9LXRTjzCQKgCTvYCot0lFJEJNZAnubFnbkobUzQlhicDi0/c0za+Bp0= X-Received: by 2002:aa7:cac9:: with SMTP id l9mr4773587edt.373.1623431449052; Fri, 11 Jun 2021 10:10:49 -0700 (PDT) MIME-Version: 1.0 References: <20210611131153.3731147-1-aisheng.dong@nxp.com> <20210611131153.3731147-2-aisheng.dong@nxp.com> In-Reply-To: <20210611131153.3731147-2-aisheng.dong@nxp.com> From: Rob Herring Date: Fri, 11 Jun 2021 11:10:36 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 2/2] of: of_reserved_mem: mark nomap memory instead of removing To: Dong Aisheng , Quentin Perret , Stephen Boyd , Nicolas Boichat , KarimAllah Ahmed Cc: linux-mm , "linux-kernel@vger.kernel.org" , Dong Aisheng , linux-arm-kernel , devicetree@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="VU5wP/l8"; spf=pass (imf28.hostedemail.com: domain of robh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=robh@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B9BF92001060 X-Stat-Signature: e781g1t5aiux847319jkbq7f9ixb8q9b X-HE-Tag: 1623431445-607648 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Jun 11, 2021 at 7:13 AM Dong Aisheng wrote: > > Since commit 86588296acbf ("fdt: Properly handle "no-map" field in the memory region"), > nomap memory is changed to call memblock_mark_nomap() instead of > memblock_remove(). But it only changed the reserved memory with fixed > addr and size case in early_init_dt_reserve_memory_arch(), not > including the dynamical allocation by size case in > early_init_dt_alloc_reserved_memory_arch(). > > Cc: Rob Herring > Cc: devicetree@vger.kernel.org Good practice is to Cc the people involved in referenced commits. Adding them now. This code is a minefield so I'd like other eyes on it. > Signed-off-by: Dong Aisheng > --- > drivers/of/of_reserved_mem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c > index 367f298a83b2..ebba88395bf8 100644 > --- a/drivers/of/of_reserved_mem.c > +++ b/drivers/of/of_reserved_mem.c > @@ -42,7 +42,7 @@ static int __init early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, > > *res_base = base; > if (nomap) > - return memblock_remove(base, size); > + return memblock_mark_nomap(base, size); > > return memblock_reserve(base, size); > } > @@ -276,7 +276,7 @@ void __init fdt_init_reserved_mem(void) > pr_info("node %s compatible matching fail\n", > rmem->name); > if (nomap) > - memblock_add(rmem->base, rmem->size); > + memblock_clear_nomap(rmem->base, rmem->size); > else > memblock_free(rmem->base, rmem->size); > } > -- > 2.25.1 >