On 3/9/21 6:08 PM, Rob Herring wrote: Hi Rob,
On Fri, Feb 19, 2021 at 6:52 PM Thiago Jung Bauermann <[email protected]> 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 <[email protected]> Reviewed-by: Lakshmi Ramasubramanian <[email protected]> --- 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(-)I ended up delaying the referenced series til 5.13, but have applied it now. Can I get an ack from the powerpc maintainers on this one? I'll fixup the commit log to make sense given the commit id's aren't valid.
I checked the change applied in linux-next branch and also Device Tree's for-next branch - it looks like v1 of Thiago's patch has been applied. Could you please pick up the v2 patch?
thanks, -lakshmi
