diff mbox series

[1/2] fdt: Properly handle "no-map" field in the memory region

Message ID 20210115114544.1830068-2-qperret@google.com
State Accepted, archived
Headers show
Series fdt: A couple of no-map fixes | expand

Checks

Context Check Description
robh/checkpatch success

Commit Message

Quentin Perret Jan. 15, 2021, 11:45 a.m. UTC 
From: KarimAllah Ahmed <karahmed@amazon.de>

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>
---
 drivers/of/fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rob Herring (Arm) Jan. 15, 2021, 5:29 p.m. UTC | #1 
On Fri, 15 Jan 2021 11:45:43 +0000, Quentin Perret wrote:
> From: KarimAllah Ahmed <karahmed@amazon.de>
> 
> 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>
> ---
>  drivers/of/fdt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Applied, thanks!
diff mbox series

Patch

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);
 }