[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20210311165322.GA860702@robh.at.kernel.org>
Date: Thu, 11 Mar 2021 09:53:22 -0700
From: Rob Herring <robh@...nel.org>
To: Thiago Jung Bauermann <bauerman@...ux.ibm.com>
Cc: kexec@...ts.infradead.org, Mimi Zohar <zohar@...ux.ibm.com>,
linux-kernel@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
Hari Bathini <hbathini@...ux.ibm.com>,
Lakshmi Ramasubramanian <nramas@...ux.microsoft.com>
Subject: Re: [PATCH v2] powerpc/kexec_file: Restore FDT size estimation for
kdump kernel
On Fri, 19 Feb 2021 21:52:04 -0300, Thiago Jung Bauermann wrote:
> Commit 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump
> kernel") fixed how elf64_load() estimates the FDT size needed by the
> crashdump kernel.
>
> At the same time, commit 130b2d59cec0 ("powerpc: Use common
> of_kexec_alloc_and_setup_fdt()") changed the same code to use the generic
> function of_kexec_alloc_and_setup_fdt() to calculate the FDT size. That
> change made the code overestimate it a bit by counting twice the space
> required for the kernel command line and /chosen properties.
>
> Therefore change kexec_fdt_totalsize_ppc64() to calculate just the extra
> space needed by the kdump kernel, and change the function name so that it
> better reflects what the function is now doing.
>
> Signed-off-by: Thiago Jung Bauermann <bauerman@...ux.ibm.com>
> Reviewed-by: Lakshmi Ramasubramanian <nramas@...ux.microsoft.com>
> ---
> arch/powerpc/include/asm/kexec.h | 2 +-
> arch/powerpc/kexec/elf_64.c | 2 +-
> arch/powerpc/kexec/file_load_64.c | 26 ++++++++------------------
> 3 files changed, 10 insertions(+), 20 deletions(-)
>
> Applies on top of next-20210219.
>
> Changes since v1:
>
> - Adjusted comment describing kexec_extra_fdt_size_ppc64() as suggested
> by Lakshmi.
>
Applied, thanks!
Powered by blists - more mailing lists