Patch "arm64: mm: Move reserve_crashkernel() into mem_init()" has been added to the 5.10-stable tree

[gregkh at linuxfoundation.org]

This is a note to let you know that I've just added the patch titled

    arm64: mm: Move reserve_crashkernel() into mem_init()

to the 5.10-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:
     arm64-mm-move-reserve_crashkernel-into-mem_init.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.


>From foo at baz Sun Mar  7 04:22:37 PM CET 2021
From: Jing Xiangfeng <jingxiangfeng at huawei.com>
Date: Wed, 3 Mar 2021 15:33:13 +0800
Subject: arm64: mm: Move reserve_crashkernel() into mem_init()
To: <gregkh at linuxfoundation.org>, <catalin.marinas at arm.com>, <will at kernel.org>, <akpm at linux-foundation.org>, <nsaenzjulienne at suse.de>, <paul.walmsley at sifive.com>, <palmer at dabbelt.com>, <aou at eecs.berkeley.edu>, <rppt at kernel.org>, <lorenzo.pieralisi at arm.com>, <guohanjun at huawei.com>, <sudeep.holla at arm.com>, <rjw at rjwysocki.net>, <lenb at kernel.org>, <song.bao.hua at hisilicon.com>, <ardb at kernel.org>, <anshuman.khandual at arm.com>, <bhelgaas at google.com>, <guro at fb.com>, <robh+dt at kernel.org>
Cc: <stable at vger.kernel.org>, <linux-arm-kernel at lists.infradead.org>, <frowand.list at gmail.com>, <devicetree at vger.kernel.org>, <linux-kernel at vger.kernel.org>, <linux-mm at kvack.org>, <linux-riscv at lists.infradead.org>, <jingxiangfeng at huawei.com>, <wangkefeng.wang at huawei.com>, Jeremy Linton <jeremy.linton at arm.com>
Message-ID: <20210303073319.2215839-2-jingxiangfeng at huawei.com>

From: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>

commit 0a30c53573b07d5561457e41fb0ab046cd857da5 upstream

crashkernel might reserve memory located in ZONE_DMA. We plan to delay
ZONE_DMA's initialization after unflattening the devicetree and ACPI's
boot table initialization, so move it later in the boot process.
Specifically into bootmem_init() since request_standard_resources()
depends on it.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
Tested-by: Jeremy Linton <jeremy.linton at arm.com>
Link: https://lore.kernel.org/r/20201119175400.9995-2-nsaenzjulienne@suse.de
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
Cc: <stable at vger.kernel.org>
Signed-off-by: Jing Xiangfeng <jingxiangfeng at huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 arch/arm64/mm/init.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -386,8 +386,6 @@ void __init arm64_memblock_init(void)
 	else
 		arm64_dma32_phys_limit = PHYS_MASK + 1;
 
-	reserve_crashkernel();
-
 	reserve_elfcorehdr();
 
 	high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
@@ -427,6 +425,12 @@ void __init bootmem_init(void)
 	sparse_init();
 	zone_sizes_init(min, max);
 
+	/*
+	 * request_standard_resources() depends on crashkernel's memory being
+	 * reserved, so do it here.
+	 */
+	reserve_crashkernel();
+
 	memblock_dump_all();
 }
 


Patches currently in stable-queue which might be from jingxiangfeng at huawei.com are

queue-5.10/of-unittest-add-test-for-of_dma_get_max_cpu_address.patch
queue-5.10/mm-remove-examples-from-enum-zone_type-comment.patch
queue-5.10/arm64-mm-set-zone_dma-size-based-on-devicetree-s-dma-ranges.patch
queue-5.10/of-address-introduce-of_dma_get_max_cpu_address.patch
queue-5.10/arm64-mm-move-zone_dma_bits-initialization-into-zone_sizes_init.patch
queue-5.10/arm64-mm-set-zone_dma-size-based-on-early-iort-scan.patch
queue-5.10/arm64-mm-move-reserve_crashkernel-into-mem_init.patch