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, URIBL_BLOCKED,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 CAB9DC433DB for ; Fri, 19 Feb 2021 00:58:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9BFE764ECF for ; Fri, 19 Feb 2021 00:58:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229683AbhBSA6D (ORCPT ); Thu, 18 Feb 2021 19:58:03 -0500 Received: from linux.microsoft.com ([13.77.154.182]:33010 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229700AbhBSA6C (ORCPT ); Thu, 18 Feb 2021 19:58:02 -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 9004020B6C40; Thu, 18 Feb 2021 16:57:19 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9004020B6C40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1613696239; bh=92SrUjkup5p1F5h8A/AvMURhXO2QfPEeasqchX9Zh1s=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=PIbQlWxzz/ubspxUXdcK0rAjNqWNBN4rhKPiLitk5tHGTMwG8Vfv0ydP9kkkJ/Gqe /H+M01P6kj0Ba8RCZAD3ACzzmmQrM3ZQmzM6bksRRFhpHrDQe3usQklSnEiUKehUoh JYhd6eVF4/rwqCtqhohSQOitBY+hw1w1DhjVhuQc= Subject: Re: [PATCH] of: error: 'const struct kimage' has no member named 'arch' To: Mimi Zohar , bauerman@linux.ibm.com, robh@kernel.org, takahiro.akashi@linaro.org, gregkh@linuxfoundation.org, will@kernel.org, joe@perches.com, catalin.marinas@arm.com, mpe@ellerman.id.au, sfr@canb.auug.org.au Cc: james.morse@arm.com, sashal@kernel.org, benh@kernel.crashing.org, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org References: <20210218223305.2044-1-nramas@linux.microsoft.com> From: Lakshmi Ramasubramanian Message-ID: <8b8c0b70-c7ab-33f3-b66c-9ea03388497b@linux.microsoft.com> Date: Thu, 18 Feb 2021 16:57:19 -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=iso-8859-15; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 2/18/21 4:07 PM, Mimi Zohar wrote: Hi Mimi, > On Thu, 2021-02-18 at 14:33 -0800, Lakshmi Ramasubramanian wrote: >> of_kexec_alloc_and_setup_fdt() defined in drivers/of/kexec.c builds >> a new device tree object that includes architecture specific data >> for kexec system call. This should be defined only if the architecture >> being built defines kexec architecture structure "struct kimage_arch". >> >> Define a new boolean config OF_KEXEC that is enabled if >> CONFIG_KEXEC_FILE and CONFIG_OF_FLATTREE are enabled, and >> the architecture is arm64 or powerpc64. Build drivers/of/kexec.c >> if CONFIG_OF_KEXEC is enabled. >> >> Signed-off-by: Lakshmi Ramasubramanian >> Fixes: 33488dc4d61f ("of: Add a common kexec FDT setup function") >> Reported-by: kernel test robot >> --- >> drivers/of/Kconfig | 6 ++++++ >> drivers/of/Makefile | 7 +------ >> 2 files changed, 7 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig >> index 18450437d5d5..f2e8fa54862a 100644 >> --- a/drivers/of/Kconfig >> +++ b/drivers/of/Kconfig >> @@ -100,4 +100,10 @@ config OF_DMA_DEFAULT_COHERENT >> # arches should select this if DMA is coherent by default for OF devices >> bool >> >> +config OF_KEXEC >> + bool >> + depends on KEXEC_FILE >> + depends on OF_FLATTREE >> + default y if ARM64 || PPC64 >> + >> endif # OF >> diff --git a/drivers/of/Makefile b/drivers/of/Makefile >> index c13b982084a3..287579dd1695 100644 >> --- a/drivers/of/Makefile >> +++ b/drivers/of/Makefile >> @@ -13,11 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o >> obj-$(CONFIG_OF_RESOLVE) += resolver.o >> obj-$(CONFIG_OF_OVERLAY) += overlay.o >> obj-$(CONFIG_OF_NUMA) += of_numa.o >> - >> -ifdef CONFIG_KEXEC_FILE >> -ifdef CONFIG_OF_FLATTREE >> -obj-y += kexec.o >> -endif >> -endif >> +obj-$(CONFIG_OF_KEXEC) += kexec.o >> >> obj-$(CONFIG_OF_UNITTEST) += unittest-data/ > > Is it possible to reuse CONFIG_HAVE_IMA_KEXEC here? > For ppc64 CONFIG_HAVE_IMA_KEXEC is selected when CONFIG_KEXEC_FILE is enabled. So I don't see a problem in reusing CONFIG_HAVE_IMA_KEXEC for ppc. But for arm64, CONFIG_HAVE_IMA_KEXEC is enabled in the final patch in the patch set (the one for carrying forward IMA log across kexec for arm64). arm64 calls of_kexec_alloc_and_setup_fdt() prior to enabling CONFIG_HAVE_IMA_KEXEC and hence breaks the build for arm64. thanks, -lakshmi