summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorKarimAllah Ahmed <karahmed@amazon.de>2021-01-15 12:45:43 +0100
committerRob Herring <robh@kernel.org>2021-01-15 18:29:46 +0100
commit86588296acbfb1591e92ba60221e95677ecadb43 (patch)
treefd6ccffb241c99b6a93001e4071d6da9465354be /drivers/of
parentof: base: improve error msg in of_phandle_iterator_next() (diff)
downloadlinux-86588296acbfb1591e92ba60221e95677ecadb43.tar.xz
linux-86588296acbfb1591e92ba60221e95677ecadb43.zip
fdt: Properly handle "no-map" field in the memory region
Mark the memory region with NOMAP flag instead of completely removing it from the memory blocks. That makes the FDT handling consistent with the EFI memory map handling. Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de> Signed-off-by: Quentin Perret <qperret@google.com> Link: https://lore.kernel.org/r/20210115114544.1830068-2-qperret@google.com Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/fdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index feb0f2d67fc5..427b534d60d2 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1147,7 +1147,7 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
phys_addr_t size, bool nomap)
{
if (nomap)
- return memblock_remove(base, size);
+ return memblock_mark_nomap(base, size);
return memblock_reserve(base, size);
}