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=-14.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=no 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 9788FC433DB for ; Fri, 12 Feb 2021 01:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 67E1464E3B for ; Fri, 12 Feb 2021 01:12:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229916AbhBLBMQ (ORCPT ); Thu, 11 Feb 2021 20:12:16 -0500 Received: from linux.microsoft.com ([13.77.154.182]:35134 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230263AbhBLBKP (ORCPT ); Thu, 11 Feb 2021 20:10:15 -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 65CEC20B6C40; Thu, 11 Feb 2021 17:09:34 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 65CEC20B6C40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1613092174; bh=3zzV73EkFkyAFdXlcurFqdYMOv5kFYuG+PJrfjUphp0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=MXmM2de7TfpqZuJwO4ub1wkhJKgb/jdcBxS+arQ0yNQnI1al+YvbGIBOeT9Bqg18I d1NUo3q8EJWF+w6XyVj9ZVhah5VxcshbiXjU6M3k8whqnh8YDPSrt5BLEeVRp/qMPc ePohmOBtDmUSJR+6vnpAOKAuZ8RF4v2KeBs98ewI= Subject: Re: Fwd: Re: [PATCH v17 02/10] of: Add a common kexec FDT setup function To: Thiago Jung Bauermann Cc: Rob Herring , Mimi Zohar , linux-arm-kernel , linux-integrity@vger.kernel.org, linuxppc-dev References: <202102120032.Bv0MoYv7-lkp@intel.com> <40fd1869-dcb4-36ae-e997-b8486dd4846c@linux.microsoft.com> <87mtwap35f.fsf@manicouagan.localdomain> From: Lakshmi Ramasubramanian Message-ID: Date: Thu, 11 Feb 2021 17:09:33 -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: <87mtwap35f.fsf@manicouagan.localdomain> 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-integrity@vger.kernel.org On 2/11/21 3:59 PM, Thiago Jung Bauermann wrote: > > Lakshmi Ramasubramanian writes: > >> On 2/11/21 9:42 AM, Lakshmi Ramasubramanian wrote: >>> Hi Rob, >>> [PATCH] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem >>> This change causes build problem for x86_64 architecture (please see the >>> mail from kernel test bot below) since arch/x86/include/asm/kexec.h uses >>> "elf_load_addr" for the ELF header buffer address and not >>> "elf_headers_mem". >>> struct kimage_arch { >>> ... >>> /* Core ELF header buffer */ >>> void *elf_headers; >>> unsigned long elf_headers_sz; >>> unsigned long elf_load_addr; >>> }; >>> I am thinking of limiting of_kexec_alloc_and_setup_fdt() to ARM64 and >>> PPC64 since they are the only ones using this function now. >>> #if defined(CONFIG_ARM64) && defined(CONFIG_PPC64) >> Sorry - I meant to say >> #if defined(CONFIG_ARM64) || defined(CONFIG_PPC64) >> > > Does it build correctly if you rename elf_headers_mem to elf_load_addr? > Or the other way around, renaming x86's elf_load_addr to > elf_headers_mem. I don't really have a preference. Yes - changing arm64 and ppc from "elf_headers_mem" to "elf_load_addr" builds fine. But I am concerned about a few other architectures that also define "struct kimage_arch" such as "parisc", "arm" which do not have any ELF related fields. They would not build if the config defines CONFIG_KEXEC_FILE and CONFIG_OF_FLATTREE. Do you think that could be an issue? thanks, -lakshmi > > That would be better than adding an #if condition. > >>> void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, >>> unsigned long initrd_load_addr, >>> unsigned long initrd_len, >>> const char *cmdline) >>> { >>> ... >>> } >>> #endif /* defined(CONFIG_ARM64) && defined(CONFIG_PPC64) */ >>> Please let me know if you have any concerns. >>> thanks, >>> -lakshmi >