Received-SPF: pass (google.com: domain of linux-kernel+bounces-161432-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <20240428125505.434962-1-skseofh@gmail.com>
In-Reply-To: <20240428125505.434962-1-skseofh@gmail.com>
From: DaeRo Lee <skseofh@gmail.com>
Date: Sun, 28 Apr 2024 22:10:17 +0900
Message-ID: <CAATEi5kd-XeZ359De36oLJeVvALsEM7oJ9zez_M=zivwrQw5yA@mail.gmail.com>
Subject: Re: [PATCH] of: of_reserved_mem: clean-up reserved memory with no-map
To: robh@kernel.org, saravanak@google.com, rppt@kernel.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, 
	Daero Lee <daero_le.lee@samsung.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

2024=EB=85=84 4=EC=9B=94 28=EC=9D=BC (=EC=9D=BC) =EC=98=A4=ED=9B=84 9:55, <=
skseofh@gmail.com>=EB=8B=98=EC=9D=B4 =EC=9E=91=EC=84=B1:
>
> From: Daero Lee <daero_le.lee@samsung.com>
>
> In early_init_dt_reserve_memory we only add memory w/o no-map flag to
> memblock.reserved. But we need to add memory w/ no-map flag to
> memblock.reserved, because NOMAP and memblock.reserved are semantically
> different.
>
> Signed-off-by: Daero Lee <daero_le.lee@samsung.com>
> ---
>  drivers/of/of_reserved_mem.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
> index 8236ecae2953..1c916da8adaf 100644
> --- a/drivers/of/of_reserved_mem.c
> +++ b/drivers/of/of_reserved_mem.c
> @@ -91,7 +91,8 @@ static int __init early_init_dt_reserve_memory(phys_add=
r_t base,
>                     memblock_is_region_reserved(base, size))
>                         return -EBUSY;
>
> -               return memblock_mark_nomap(base, size);
> +               if (memblock_mark_nomap(base, size))
> +                       return;
Sorry. The return value is wrong.

Here is what I want to do:

--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -81,6 +81,7 @@ static void __init
fdt_reserved_mem_save_node(unsigned long node, const char *un
 static int __init early_init_dt_reserve_memory(phys_addr_t base,
                                               phys_addr_t size, bool nomap=
)
 {
+       int err =3D 0;
        if (nomap) {
                /*
                 * If the memory is already reserved (by another region), w=
e
@@ -91,7 +92,10 @@ static int __init
early_init_dt_reserve_memory(phys_addr_t base,
                    memblock_is_region_reserved(base, size))
                        return -EBUSY;

-               return memblock_mark_nomap(base, size);
+
+               err =3D memblock_mark_nomap(base, size);
+               if (err)
+                       return err;
        }
        return memblock_reserve(base, size);
 }


Regards,
DaeRo Lee