From: Quentin Perret <qperret@google.com>
Date: Wed, 12 May 2021 12:28:52 +0000 (+0000)
Subject: Revert "of/fdt: Make sure no-map does not remove already reserved regions"
X-Git-Tag: v5.4.119~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=66b8853dfa3cfbbe6c3ab643b6989377ad16662a;p=users%2Fdwmw2%2Flinux.git

Revert "of/fdt: Make sure no-map does not remove already reserved regions"

This reverts commit 3cbd3038c9155038020560729cde50588311105d.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index fc24102e25ce7..036af904e0cfa 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1153,16 +1153,8 @@ int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size)
 int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
 					phys_addr_t size, bool nomap)
 {
-	if (nomap) {
-		/*
-		 * If the memory is already reserved (by another region), we
-		 * should not allow it to be marked nomap.
-		 */
-		if (memblock_is_region_reserved(base, size))
-			return -EBUSY;
-
+	if (nomap)
 		return memblock_mark_nomap(base, size);
-	}
 	return memblock_reserve(base, size);
 }