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 D7C91C4361B for ; Sat, 12 Dec 2020 00:57:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA7B02336F for ; Sat, 12 Dec 2020 00:57:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437899AbgLLAy7 (ORCPT ); Fri, 11 Dec 2020 19:54:59 -0500 Received: from linux.microsoft.com ([13.77.154.182]:33700 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437926AbgLLAy4 (ORCPT ); Fri, 11 Dec 2020 19:54:56 -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 D7B8120B717A; Fri, 11 Dec 2020 16:54:14 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D7B8120B717A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1607734455; bh=ZTM/idn6P5IEpBxe4MiiCDIuG4Mf+65/Gf6iGB0ePnY=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=OT4GD6X6FzrliU2c+Z2miKvd634vRVb61q6tWwzQkew6S/0uDgSxQ7oO8gY7XKyiV qhFcZIT0vSMInz54g2JcrCGsBCozLc3oFBwAIIBB6w3RKtCsXfMQ0NIue2GhdyTfSa OvMSn5Q9fCDGKvtjpWWk2KkIXJW9z59Lbxtta5r0= Subject: Re: [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem To: Rob Herring , takahiro.akashi@linaro.org, will@kernel.org, catalin.marinas@arm.com, mpe@ellerman.id.au Cc: Thiago Jung Bauermann , zohar@linux.ibm.com, james.morse@arm.com, sashal@kernel.org, benh@kernel.crashing.org, paulus@samba.org, frowand.list@gmail.com, vincenzo.frascino@arm.com, mark.rutland@arm.com, dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com, pasha.tatashin@soleen.com, allison@lohutok.net, masahiroy@kernel.org, bhsharma@redhat.com, mbrugger@suse.com, hsinyi@chromium.org, tao.li@vivo.com, christophe.leroy@c-s.fr, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, prsriva@linux.microsoft.com, balajib@linux.microsoft.com References: <20201211221006.1052453-1-robh@kernel.org> <20201211221006.1052453-2-robh@kernel.org> From: Lakshmi Ramasubramanian Message-ID: <39d0e68e-12f2-ddd0-4010-bb0ec216ac5d@linux.microsoft.com> Date: Fri, 11 Dec 2020 16:54:14 -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: <20201211221006.1052453-2-robh@kernel.org> 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 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 thanks, -lakshmi > > Signed-off-by: Rob Herring > --- > 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= 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; > } > 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=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 3E9CAC4361B for ; Sat, 12 Dec 2020 00:55:47 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7BA523358 for ; Sat, 12 Dec 2020 00:55:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7BA523358 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=G23D/U1sF18ZSbUS9ThrTSKVtxmbmF5sMtLQvtOTLqA=; b=eVKXnqZ3xfJT1oLWo5gW7/b1f 5zAy5ugC3awzfle2rgDjBObChXcwknTsYF+orEEglF4RXUekY4QVWb1hEth+b31DQqQManf2fjtxb XO750w6f4FsZNoj/kbCL2EKrDBQrH3UjMTNaatR1jpxfkvilECphujZzgZzpXp+Tv/QgYwUoybIWx vPlK3MPks5OvsTIBvFGNzqcuDkPsphX4FbjxAoTYbUXu4NljB7TBATHs+Y/WUFCz9JN74LS8dV2tL I0LauR8rtwpVzGE8fq8L94ElCT9UJvmz5cf4A01egdu6KtR3vjqI9f3yVe2eB5dwhmQESuNFphw8a 4Q2xDYHKw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kntAy-00028j-Q1; Sat, 12 Dec 2020 00:54:20 +0000 Received: from linux.microsoft.com ([13.77.154.182]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kntAv-00028J-Ln for linux-arm-kernel@lists.infradead.org; Sat, 12 Dec 2020 00:54:18 +0000 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 D7B8120B717A; Fri, 11 Dec 2020 16:54:14 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D7B8120B717A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1607734455; bh=ZTM/idn6P5IEpBxe4MiiCDIuG4Mf+65/Gf6iGB0ePnY=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=OT4GD6X6FzrliU2c+Z2miKvd634vRVb61q6tWwzQkew6S/0uDgSxQ7oO8gY7XKyiV qhFcZIT0vSMInz54g2JcrCGsBCozLc3oFBwAIIBB6w3RKtCsXfMQ0NIue2GhdyTfSa OvMSn5Q9fCDGKvtjpWWk2KkIXJW9z59Lbxtta5r0= Subject: Re: [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem To: Rob Herring , takahiro.akashi@linaro.org, will@kernel.org, catalin.marinas@arm.com, mpe@ellerman.id.au References: <20201211221006.1052453-1-robh@kernel.org> <20201211221006.1052453-2-robh@kernel.org> From: Lakshmi Ramasubramanian Message-ID: <39d0e68e-12f2-ddd0-4010-bb0ec216ac5d@linux.microsoft.com> Date: Fri, 11 Dec 2020 16:54:14 -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: <20201211221006.1052453-2-robh@kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201211_195417_852056_DDE71A3C X-CRM114-Status: GOOD ( 21.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, benh@kernel.crashing.org, bhsharma@redhat.com, tao.li@vivo.com, zohar@linux.ibm.com, paulus@samba.org, vincenzo.frascino@arm.com, frowand.list@gmail.com, sashal@kernel.org, masahiroy@kernel.org, jmorris@namei.org, linux-arm-kernel@lists.infradead.org, serge@hallyn.com, devicetree@vger.kernel.org, pasha.tatashin@soleen.com, prsriva@linux.microsoft.com, hsinyi@chromium.org, allison@lohutok.net, christophe.leroy@c-s.fr, mbrugger@suse.com, balajib@linux.microsoft.com, dmitry.kasatkin@gmail.com, linux-kernel@vger.kernel.org, james.morse@arm.com, linux-integrity@vger.kernel.org, Thiago Jung Bauermann Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 thanks, -lakshmi > > Signed-off-by: Rob Herring > --- > 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= 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; > } > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel