On Mon, 13 Jun 2022 at 10:00, Wupeng Ma <mawupeng1@xxxxxxxxxx> wrote:
>
> From: Ma Wupeng <mawupeng1@xxxxxxxxxx>
>
> Commit b05b9f5f9dcf ("x86, mirror: x86 enabling - find mirrored memory ranges")
> introduced mirrored memory support for x86 and this could be used on arm64.
>
> Since we only support this feature on arm64, efi_find_mirror() won't be placed
> into efi_init(), which is used by riscv/arm/arm64, it is added in setup_arch()
> to scan the memory map and mark mirrored memory in memblock.
>
> Signed-off-by: Ma Wupeng <mawupeng1@xxxxxxxxxx>
> Reviewed-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
> ---
> Documentation/admin-guide/kernel-parameters.txt | 2 +-
> arch/arm64/kernel/setup.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index 8090130b544b..e3537646b6f7 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -2301,7 +2301,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/kernel/setup.c b/arch/arm64/kernel/setup.c
> index cf3a759f10d4..6e9acd7ecf0f 100644
> --- a/arch/arm64/kernel/setup.c
> +++ b/arch/arm64/kernel/setup.c
> @@ -328,6 +328,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
>
> xen_early_init();
> efi_init();
> + efi_find_mirror();
>
> if (!efi_enabled(EFI_BOOT) && ((u64)_text % MIN_KIMG_ALIGN) != 0)
> pr_warn(FW_BUG "Kernel image misaligned at boot, please fix your bootloader!");
As suggested by Kefeng Wang, I think this call needs to be moved into
efi_init() [the generic version]
Please drop this hunk, and add this call to efi_init() in patch #1.
