[PATCH] of: of_reserved_mem: clean-up reserved memory with no-map

From: skseofh
Date: Sun Apr 28 2024 - 08:55:26 EST


From: Daero Lee <daero_le.lee@xxxxxxxxxxx>

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@xxxxxxxxxxx>
---
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_addr_t base,
memblock_is_region_reserved(base, size))
return -EBUSY;

- return memblock_mark_nomap(base, size);
+ if (memblock_mark_nomap(base, size))
+ return;
}
return memblock_reserve(base, size);
}
--
2.25.1