arm64: kexec: call kexec_image_info only once

Currently, kexec_image_info() is called during load time, and
right before kernel is being kexec'ed. There is no need to do both.
So, call it only once when segments are loaded and the physical
location of page with copy of arm64_relocate_new_kernel is known.

Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Acked-by: James Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20210125191923.1060122-11-pasha.tatashin@soleen.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index a8aaa656242950cdada1607e522a0dbd3bbd5998..90a335c744425d0849844b2d89d5081f7145a361 100644 (file)
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -66,6 +66,7 @@ int machine_kexec_post_load(struct kimage *kimage)
        memcpy(reloc_code, arm64_relocate_new_kernel,
               arm64_relocate_new_kernel_size);
        kimage->arch.kern_reloc = __pa(reloc_code);
+       kexec_image_info(kimage);
 
        /* Flush the reloc_code in preparation for its execution. */
        __flush_dcache_area(reloc_code, arm64_relocate_new_kernel_size);
@@ -84,8 +85,6 @@ int machine_kexec_post_load(struct kimage *kimage)
  */
 int machine_kexec_prepare(struct kimage *kimage)
 {
-       kexec_image_info(kimage);
-
        if (kimage->type != KEXEC_TYPE_CRASH && cpus_are_stuck_in_kernel()) {
                pr_err("Can't kexec: CPUs are stuck in the kernel.\n");
                return -EBUSY;
@@ -170,8 +169,6 @@ void machine_kexec(struct kimage *kimage)
        WARN(in_kexec_crash && (stuck_cpus || smp_crash_stop_failed()),
                "Some CPUs may be stale, kdump will be unreliable.\n");
 
-       kexec_image_info(kimage);
-
        /* Flush the kimage list and its buffers. */
        kexec_list_flush(kimage);