From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-24.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5D80C433E0 for ; Wed, 10 Mar 2021 02:32:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 86FC864F84 for ; Wed, 10 Mar 2021 02:32:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232052AbhCJCbf (ORCPT ); Tue, 9 Mar 2021 21:31:35 -0500 Received: from linux.microsoft.com ([13.77.154.182]:44204 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231835AbhCJCbF (ORCPT ); Tue, 9 Mar 2021 21:31:05 -0500 Received: from [192.168.0.104] (c-73-42-176-67.hsd1.wa.comcast.net [73.42.176.67]) by linux.microsoft.com (Postfix) with ESMTPSA id 60413208CF3F; Tue, 9 Mar 2021 18:31:05 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 60413208CF3F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1615343465; bh=zyAxx9X7db3xy7R9k6SWK3OhsYY9Ys/qYCIMIrLY89E=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=JfvW/B6Ap41tfrrlv+LoSg0oGUs//FcsYMmOIlOHbyKRKcIRKhmr1aGlZtWTwMeng nwBXYR51wSX2e9X3Woow1jwfWw8WzLLmLNKexwZiE5WKjMz3j8S6O0hw5/Wfq640km lUQdoGC6XBVovEBLOGZJdldX/8TQUB3+jD719qm8= Subject: Re: [PATCH v2] powerpc/kexec_file: Restore FDT size estimation for kdump kernel To: Rob Herring , Thiago Jung Bauermann Cc: linuxppc-dev , kexec@lists.infradead.org, Hari Bathini , Mimi Zohar , Michael Ellerman , "linux-kernel@vger.kernel.org" References: <20210220005204.1417200-1-bauerman@linux.ibm.com> From: Lakshmi Ramasubramanian Message-ID: <7d0c6062-ca73-f183-110d-f5b75ae91d10@linux.microsoft.com> Date: Tue, 9 Mar 2021 18:31:04 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/9/21 6:08 PM, Rob Herring wrote: Hi Rob, > On Fri, Feb 19, 2021 at 6:52 PM 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 >> Reviewed-by: Lakshmi Ramasubramanian >> --- >> 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