--- v15
+++ v19
@@ -1,173 +1,97 @@
-From: Rob Herring <robh@kernel.org>
+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.
-The code for setting up the /chosen node in the device tree
-and updating the memory reservation for the next kernel has been
-moved to of_kexec_setup_new_fdt() defined in "drivers/of/kexec.c".
+Use the ELF fields defined in 'struct kimage'.
-Use the common of_kexec_setup_new_fdt() to setup the device tree
-and update the memory reservation for kexec for arm64.
+Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
+Suggested-by: Rob Herring <robh@kernel.org>
+Fixes: 33488dc4d61f ("of: Add a common kexec FDT setup function")
+Reported-by: kernel test robot <lkp@intel.com>
+---
+ arch/powerpc/include/asm/kexec.h | 4 ----
+ arch/powerpc/kexec/file_load.c | 6 +++---
+ arch/powerpc/kexec/file_load_64.c | 14 +++++++-------
+ 3 files changed, 10 insertions(+), 14 deletions(-)
-Signed-off-by: Rob Herring <robh@kernel.org>
-Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
-Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
-Acked-by: Will Deacon <will@kernel.org>
----
- arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
- 1 file changed, 3 insertions(+), 120 deletions(-)
-
-diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
-index 5b0e67b93cdc..7de9c47dee7c 100644
---- a/arch/arm64/kernel/machine_kexec_file.c
-+++ b/arch/arm64/kernel/machine_kexec_file.c
-@@ -15,23 +15,12 @@
- #include <linux/kexec.h>
- #include <linux/libfdt.h>
- #include <linux/memblock.h>
-+#include <linux/of.h>
- #include <linux/of_fdt.h>
--#include <linux/random.h>
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/types.h>
- #include <linux/vmalloc.h>
--#include <asm/byteorder.h>
+diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
+index 55d6ede30c19..69c2a8aa142a 100644
+--- 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;
-
--/* relevant device tree properties */
--#define FDT_PROP_KEXEC_ELFHDR "linux,elfcorehdr"
--#define FDT_PROP_MEM_RANGE "linux,usable-memory-range"
--#define FDT_PROP_INITRD_START "linux,initrd-start"
--#define FDT_PROP_INITRD_END "linux,initrd-end"
--#define FDT_PROP_BOOTARGS "bootargs"
--#define FDT_PROP_KASLR_SEED "kaslr-seed"
--#define FDT_PROP_RNG_SEED "rng-seed"
--#define RNG_SEED_SIZE 128
+ #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 9a232bc36c8f..19d2c5f49daf 100644
+--- 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;
- const struct kexec_file_ops * const kexec_file_loaders[] = {
- &kexec_image_ops,
-@@ -50,112 +39,6 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
+ 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 c69bcf9b547a..4350f225bb67 100644
+--- a/arch/powerpc/kexec/file_load_64.c
++++ b/arch/powerpc/kexec/file_load_64.c
+@@ -815,9 +815,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;
+@@ -851,7 +851,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;
+ }
+@@ -1107,9 +1107,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);
}
-
--static int setup_dtb(struct kimage *image,
-- unsigned long initrd_load_addr, unsigned long initrd_len,
-- char *cmdline, void *dtb)
--{
-- int off, ret;
--
-- ret = fdt_path_offset(dtb, "/chosen");
-- if (ret < 0)
-- goto out;
--
-- off = ret;
--
-- ret = fdt_delprop(dtb, off, FDT_PROP_KEXEC_ELFHDR);
-- if (ret && ret != -FDT_ERR_NOTFOUND)
-- goto out;
-- ret = fdt_delprop(dtb, off, FDT_PROP_MEM_RANGE);
-- if (ret && ret != -FDT_ERR_NOTFOUND)
-- goto out;
--
-- if (image->type == KEXEC_TYPE_CRASH) {
-- /* add linux,elfcorehdr */
-- ret = fdt_appendprop_addrrange(dtb, 0, off,
-- FDT_PROP_KEXEC_ELFHDR,
-- image->arch.elf_headers_mem,
-- image->arch.elf_headers_sz);
-- if (ret)
-- return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL);
--
-- /* add linux,usable-memory-range */
-- ret = fdt_appendprop_addrrange(dtb, 0, off,
-- FDT_PROP_MEM_RANGE,
-- crashk_res.start,
-- crashk_res.end - crashk_res.start + 1);
-- if (ret)
-- return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL);
-- }
--
-- /* add bootargs */
-- if (cmdline) {
-- ret = fdt_setprop_string(dtb, off, FDT_PROP_BOOTARGS, cmdline);
-- if (ret)
-- goto out;
-- } else {
-- ret = fdt_delprop(dtb, off, FDT_PROP_BOOTARGS);
-- if (ret && (ret != -FDT_ERR_NOTFOUND))
-- goto out;
-- }
--
-- /* add initrd-* */
-- if (initrd_load_addr) {
-- ret = fdt_setprop_u64(dtb, off, FDT_PROP_INITRD_START,
-- initrd_load_addr);
-- if (ret)
-- goto out;
--
-- ret = fdt_setprop_u64(dtb, off, FDT_PROP_INITRD_END,
-- initrd_load_addr + initrd_len);
-- if (ret)
-- goto out;
-- } else {
-- ret = fdt_delprop(dtb, off, FDT_PROP_INITRD_START);
-- if (ret && (ret != -FDT_ERR_NOTFOUND))
-- goto out;
--
-- ret = fdt_delprop(dtb, off, FDT_PROP_INITRD_END);
-- if (ret && (ret != -FDT_ERR_NOTFOUND))
-- goto out;
-- }
--
-- /* add kaslr-seed */
-- ret = fdt_delprop(dtb, off, FDT_PROP_KASLR_SEED);
-- if (ret == -FDT_ERR_NOTFOUND)
-- ret = 0;
-- else if (ret)
-- goto out;
--
-- if (rng_is_initialized()) {
-- u64 seed = get_random_u64();
-- ret = fdt_setprop_u64(dtb, off, FDT_PROP_KASLR_SEED, seed);
-- if (ret)
-- goto out;
-- } else {
-- pr_notice("RNG is not initialised: omitting \"%s\" property\n",
-- FDT_PROP_KASLR_SEED);
-- }
--
-- /* add rng-seed */
-- if (rng_is_initialized()) {
-- void *rng_seed;
-- ret = fdt_setprop_placeholder(dtb, off, FDT_PROP_RNG_SEED,
-- RNG_SEED_SIZE, &rng_seed);
-- if (ret)
-- goto out;
-- get_random_bytes(rng_seed, RNG_SEED_SIZE);
-- } else {
-- pr_notice("RNG is not initialised: omitting \"%s\" property\n",
-- FDT_PROP_RNG_SEED);
-- }
--
--out:
-- if (ret)
-- return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL;
--
-- return 0;
--}
--
- /*
- * More space needed so that we can add initrd, bootargs, kaslr-seed,
- * rng-seed, userable-memory-range and elfcorehdr.
-@@ -185,8 +68,8 @@ static int create_dtb(struct kimage *image,
- if (ret)
- return -EINVAL;
-
-- ret = setup_dtb(image, initrd_load_addr, initrd_len,
-- cmdline, buf);
-+ ret = of_kexec_setup_new_fdt(image, buf, initrd_load_addr,
-+ initrd_len, cmdline);
- if (ret) {
- vfree(buf);
- if (ret == -ENOMEM) {
--
2.30.0