powerpc: Use ELF fields defined in 'struct kimage'

ELF related fields elf_headers, elf_headers_sz, and elfcorehdr_addr
have been moved from 'struct kimage_arch' to 'struct kimage' as
elf_headers, elf_headers_sz, and elf_load_addr respectively.

Use the ELF fields defined in 'struct kimage'.

Suggested-by: Rob Herring <robh@kernel.org>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210221174930.27324-4-nramas@linux.microsoft.com

diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index 9ab344d..75eb35c 100644 (file)
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -108,10 +108,6 @@ struct kimage_arch {
        unsigned long backup_start;
        void *backup_buf;
 
-       unsigned long elfcorehdr_addr;
-       unsigned long elf_headers_sz;
-       void *elf_headers;
-
 #ifdef CONFIG_IMA_KEXEC
        phys_addr_t ima_buffer_addr;
        size_t ima_buffer_size;

diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
index 9a232bc..19d2c5f 100644 (file)
--- a/arch/powerpc/kexec/file_load.c
+++ b/arch/powerpc/kexec/file_load.c
@@ -45,7 +45,7 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline,
                return NULL;
 
        elfcorehdr_strlen = sprintf(cmdline_ptr, "elfcorehdr=0x%lx ",
-                                   image->arch.elfcorehdr_addr);
+                                   image->elf_load_addr);
 
        if (elfcorehdr_strlen + cmdline_len > COMMAND_LINE_SIZE) {
                pr_err("Appending elfcorehdr=<addr> exceeds cmdline size\n");
@@ -263,8 +263,8 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
                 * Avoid elfcorehdr from being stomped on in kdump kernel by
                 * setting up memory reserve map.
                 */
-               ret = fdt_add_mem_rsv(fdt, image->arch.elfcorehdr_addr,
-                                     image->arch.elf_headers_sz);
+               ret = fdt_add_mem_rsv(fdt, image->elf_load_addr,
+                                     image->elf_headers_sz);
                if (ret) {
                        pr_err("Error reserving elfcorehdr memory: %s\n",
                               fdt_strerror(ret));

diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
index 02b9e4d..8360991 100644 (file)
--- a/arch/powerpc/kexec/file_load_64.c
+++ b/arch/powerpc/kexec/file_load_64.c
@@ -816,9 +816,9 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)
                goto out;
        }
 
-       image->arch.elfcorehdr_addr = kbuf->mem;
-       image->arch.elf_headers_sz = headers_sz;
-       image->arch.elf_headers = headers;
+       image->elf_load_addr = kbuf->mem;
+       image->elf_headers_sz = headers_sz;
+       image->elf_headers = headers;
 out:
        kfree(cmem);
        return ret;
@@ -852,7 +852,7 @@ int load_crashdump_segments_ppc64(struct kimage *image,
                return ret;
        }
        pr_debug("Loaded elf core header at 0x%lx, bufsz=0x%lx memsz=0x%lx\n",
-                image->arch.elfcorehdr_addr, kbuf->bufsz, kbuf->memsz);
+                image->elf_load_addr, kbuf->bufsz, kbuf->memsz);
 
        return 0;
 }
@@ -1142,9 +1142,9 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
        vfree(image->arch.backup_buf);
        image->arch.backup_buf = NULL;
 
-       vfree(image->arch.elf_headers);
-       image->arch.elf_headers = NULL;
-       image->arch.elf_headers_sz = 0;
+       vfree(image->elf_headers);
+       image->elf_headers = NULL;
+       image->elf_headers_sz = 0;
 
        return kexec_image_post_load_cleanup_default(image);
 }