From: Quentin Perret <qperret@google.com>
To: robh+dt@kernel.org, frowand.list@gmail.com
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
drinkcat@chromium.org, swboyd@chromium.org, f.fainelli@gmail.com,
karahmed@amazon.de, kernel-team@android.com
Subject: [PATCH 1/2] fdt: Properly handle "no-map" field in the memory region
Date: Fri, 15 Jan 2021 11:45:43 +0000 [thread overview]
Message-ID: <20210115114544.1830068-2-qperret@google.com> (raw)
In-Reply-To: <20210115114544.1830068-1-qperret@google.com>
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(-)
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);
}
--
2.30.0.284.gd98b1dd5eaa7-goog
next prev parent reply other threads:[~2021-01-15 11:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 11:45 [PATCH 0/2] fdt: A couple of no-map fixes Quentin Perret
2021-01-15 11:45 ` Quentin Perret [this message]
2021-01-15 17:29 ` [PATCH 1/2] fdt: Properly handle "no-map" field in the memory region Rob Herring
2021-01-15 11:45 ` [PATCH 2/2] of/fdt: Make sure no-map does not remove already reserved regions Quentin Perret
2021-01-15 17:30 ` Rob Herring
2021-01-16 0:30 ` Nicolas Boichat
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210115114544.1830068-2-qperret@google.com \
--to=qperret@google.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@chromium.org \
--cc=f.fainelli@gmail.com \
--cc=frowand.list@gmail.com \
--cc=karahmed@amazon.de \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=swboyd@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).