From: Quentin Perret <qperret@google.com>
To: stable@vger.kernel.org
Cc: alexandre.torgue@foss.st.com, robh+dt@kernel.org,
f.fainelli@gmail.com, ardb@kernel.org,
gregkh@linuxfoundation.org, sashal@kernel.org
Subject: [PATCH stable 4.19 2/2] Revert "fdt: Properly handle "no-map" field in the memory region"
Date: Wed, 12 May 2021 12:30:11 +0000 [thread overview]
Message-ID: <20210512123011.3285670-2-qperret@google.com> (raw)
In-Reply-To: <20210512123011.3285670-1-qperret@google.com>
This reverts commit 03972d6b1bbac1620455589e0367f6f69ff7b2df.
It is not really a fix, and the backport misses dependencies, which
breaks existing platforms.
Reported-by: Alexandre TORGUE <alexandre.torgue@foss.st.com>
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 aa15e5d183c1..800ad252cf9c 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1173,7 +1173,7 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
phys_addr_t size, bool nomap)
{
if (nomap)
- return memblock_mark_nomap(base, size);
+ return memblock_remove(base, size);
return memblock_reserve(base, size);
}
--
2.31.1.607.g51e8a6a459-goog
next prev parent reply other threads:[~2021-05-12 12:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 12:28 Revert memblock backports with missing dependencies Quentin Perret
2021-05-12 12:28 ` [PATCH stable 5.4 1/2] Revert "of/fdt: Make sure no-map does not remove already reserved regions" Quentin Perret
2021-05-12 12:28 ` [PATCH stable 5.4 2/2] Revert "fdt: Properly handle "no-map" field in the memory region" Quentin Perret
2021-05-12 12:30 ` [PATCH stable 4.19 1/2] Revert "of/fdt: Make sure no-map does not remove already reserved regions" Quentin Perret
2021-05-12 12:30 ` Quentin Perret [this message]
2021-05-12 12:30 ` [PATCH stable 4.14 " Quentin Perret
2021-05-12 12:30 ` [PATCH stable 4.14 2/2] Revert "fdt: Properly handle "no-map" field in the memory region" Quentin Perret
2021-05-12 12:30 ` [PATCH stable 4.9 1/2] Revert "of/fdt: Make sure no-map does not remove already reserved regions" Quentin Perret
2021-05-12 12:30 ` [PATCH stable 4.9 2/2] Revert "fdt: Properly handle "no-map" field in the memory region" Quentin Perret
2021-05-12 12:34 ` Revert memblock backports with missing dependencies Ard Biesheuvel
2021-05-12 14:07 ` Greg KH
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=20210512123011.3285670-2-qperret@google.com \
--to=qperret@google.com \
--cc=alexandre.torgue@foss.st.com \
--cc=ardb@kernel.org \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=robh+dt@kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.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).