From: Ma Wupeng <mawupeng1@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4SK3S CVE: NA -------------------------------- Mirrored memory could be used on HiSilion's arm64 SoC. So efi_find_mirror() is added in efi_init() so that systems can get memblock about any mirrored ranges. Co-developed-by: Jing Xiangfeng <jingxiangfeng@huawei.com> Signed-off-by: Ma Wupeng <mawupeng1@huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- Documentation/admin-guide/kernel-parameters.txt | 2 +- arch/arm64/mm/init.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 58eb696ccf13e..886c900323f14 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1944,7 +1944,7 @@ keepinitrd [HW,ARM] - kernelcore= [KNL,X86,IA-64,PPC] + kernelcore= [KNL,X86,IA-64,PPC,ARM64] Format: nn[KMGTPE] | nn% | "mirror" This parameter specifies the amount of memory usable by the kernel for non-movable allocations. The requested diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 8eb44aec2c78e..a3b3bfccd8221 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -724,8 +724,10 @@ void __init arm64_memblock_init(void) else arm64_dma_phys_limit = PHYS_MASK + 1; - if (efi_enabled(EFI_MEMMAP)) + if (efi_enabled(EFI_MEMMAP)) { efi_fake_memmap(); + efi_find_mirror(); + } reserve_pin_memory_res(); -- 2.25.1