| Message ID | 20201211221006.1052453-2-robh@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | Kexec FDT setup consolidation | expand |
On 12/11/20 2:10 PM, Rob Herring wrote: Hi Rob, > Align with arm64 name so common code can use it. As you'd stated in the cover letter, a better patch description would be good to have here. Code changes look good to me. Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> thanks, -lakshmi > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > arch/powerpc/include/asm/kexec.h | 2 +- > arch/powerpc/kexec/file_load.c | 4 ++-- > arch/powerpc/kexec/file_load_64.c | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h > index 55d6ede30c19..dbf09d2f36d0 100644 > --- a/arch/powerpc/include/asm/kexec.h > +++ b/arch/powerpc/include/asm/kexec.h > @@ -108,7 +108,7 @@ struct kimage_arch { > unsigned long backup_start; > void *backup_buf; > > - unsigned long elfcorehdr_addr; > + unsigned long elf_headers_mem; > unsigned long elf_headers_sz; > void *elf_headers; > > diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c > index 9a232bc36c8f..e452b11df631 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; > > elfcorehdr_strlen = sprintf(cmdline_ptr, "elfcorehdr=0x%lx ", > - image->arch.elfcorehdr_addr); > + image->arch.elf_headers_mem); > > if (elfcorehdr_strlen + cmdline_len > COMMAND_LINE_SIZE) { > pr_err("Appending elfcorehdr=<addr> exceeds cmdline size\n"); > @@ -263,7 +263,7 @@ 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, > + ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem, > image->arch.elf_headers_sz); > if (ret) { > pr_err("Error reserving elfcorehdr memory: %s\n", > diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c > index c69bcf9b547a..a05c19b3cc60 100644 > --- a/arch/powerpc/kexec/file_load_64.c > +++ b/arch/powerpc/kexec/file_load_64.c > @@ -815,7 +815,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf) > goto out; > } > > - image->arch.elfcorehdr_addr = kbuf->mem; > + image->arch.elf_headers_mem = kbuf->mem; > image->arch.elf_headers_sz = headers_sz; > image->arch.elf_headers = headers; > out: > @@ -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->arch.elf_headers_mem, kbuf->bufsz, kbuf->memsz); > > return 0; > } >
Hello Rob, Thank you for making this series. Rob Herring <robh@kernel.org> writes: > Align with arm64 name so common code can use it. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > arch/powerpc/include/asm/kexec.h | 2 +- > arch/powerpc/kexec/file_load.c | 4 ++-- > arch/powerpc/kexec/file_load_64.c | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com> -- Thiago Jung Bauermann IBM Linux Technology Center
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index 55d6ede30c19..dbf09d2f36d0 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -108,7 +108,7 @@ struct kimage_arch { unsigned long backup_start; void *backup_buf; - unsigned long elfcorehdr_addr; + unsigned long elf_headers_mem; unsigned long elf_headers_sz; void *elf_headers; diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c index 9a232bc36c8f..e452b11df631 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; elfcorehdr_strlen = sprintf(cmdline_ptr, "elfcorehdr=0x%lx ", - image->arch.elfcorehdr_addr); + image->arch.elf_headers_mem); if (elfcorehdr_strlen + cmdline_len > COMMAND_LINE_SIZE) { pr_err("Appending elfcorehdr=<addr> exceeds cmdline size\n"); @@ -263,7 +263,7 @@ 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, + ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem, image->arch.elf_headers_sz); if (ret) { pr_err("Error reserving elfcorehdr memory: %s\n", diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c index c69bcf9b547a..a05c19b3cc60 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -815,7 +815,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf) goto out; } - image->arch.elfcorehdr_addr = kbuf->mem; + image->arch.elf_headers_mem = kbuf->mem; image->arch.elf_headers_sz = headers_sz; image->arch.elf_headers = headers; out: @@ -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->arch.elf_headers_mem, kbuf->bufsz, kbuf->memsz); return 0; }
Align with arm64 name so common code can use it. Signed-off-by: Rob Herring <robh@kernel.org> --- arch/powerpc/include/asm/kexec.h | 2 +- arch/powerpc/kexec/file_load.c | 4 ++-- arch/powerpc/kexec/file_load_64.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.25.1