openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

of: of_reserved_mem: mark nomap memory instead of removing 

Since commit 86588296ac ("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 <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Quentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20210611131153.3731147-2-aisheng.dong@nxp.com
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Dong Aisheng 2021-06-11 21:11:53 +08:00 committed by Rob Herring
parent 3c6867a12a
commit 7b25995f53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/of/of_reserved_mem.c
View File

@ -42,7 +42,7 @@ static int __init early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
*res_base = base; *res_base = base;
if (nomap) if (nomap)
return memblock_remove(base, size); return memblock_mark_nomap(base, size);
return memblock_reserve(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", pr_info("node %s compatible matching fail\n",
rmem->name); rmem->name);
if (nomap) if (nomap)
memblock_add(rmem->base, rmem->size); memblock_clear_nomap(rmem->base, rmem->size);
else else
memblock_free(rmem->base, rmem->size); memblock_free(rmem->base, rmem->size);
} }