This is a note to let you know that I've just added the patch titled Revert "of/fdt: Make sure no-map does not remove already reserved regions" to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Wed May 12 04:07:32 PM CEST 2021 From: Quentin Perret <qperret@xxxxxxxxxx> Date: Wed, 12 May 2021 12:30:37 +0000 Subject: Revert "of/fdt: Make sure no-map does not remove already reserved regions" To: stable@xxxxxxxxxxxxxxx Cc: alexandre.torgue@xxxxxxxxxxx, robh+dt@xxxxxxxxxx, f.fainelli@xxxxxxxxx, ardb@xxxxxxxxxx, gregkh@xxxxxxxxxxxxxxxxxxx, sashal@xxxxxxxxxx Message-ID: <20210512123038.3287684-1-qperret@xxxxxxxxxx> From: Quentin Perret <qperret@xxxxxxxxxx> This reverts commit 666ae7c255f9eb7a8fd8e55641542f3624a78b43. It is not really a fix, and the backport misses dependencies, which breaks existing platforms. Reported-by: Alexandre TORGUE <alexandre.torgue@xxxxxxxxxxx> Signed-off-by: Quentin Perret <qperret@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/of/fdt.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1158,16 +1158,8 @@ void __init __weak early_init_dt_add_mem 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); } Patches currently in stable-queue which might be from qperret@xxxxxxxxxx are queue-4.9/revert-fdt-properly-handle-no-map-field-in-the-memory-region.patch queue-4.9/revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch