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=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 E351FC10F29 for ; Wed, 18 Mar 2020 19:30:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFB2B20724 for ; Wed, 18 Mar 2020 19:30:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="jiSHutjc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727036AbgCRTaN (ORCPT ); Wed, 18 Mar 2020 15:30:13 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:50568 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726619AbgCRTaN (ORCPT ); Wed, 18 Mar 2020 15:30:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=O+utZDp6h+Ag36FQR3M3qAozcmtEVlhbVB67kokewtI=; b=jiSHutjc4pVvGu4/AN8BKp8FNf WJRjznsV6lArDRZsrhxA1HNW1M8qsSTAwkAeTQVmLvUeeA4VpvJKmx5WBqcZFIplbwk0jojxNQsZP znNqe0vLIX3KwLgZy6FrB3WEM9LDiP8AEyfWdQULKwaRAweDoBVZC/SaPYY+9bDjZgbFQG7rcITG1 s3fzvhg6bSUA2C4DUFJXnwhFCOjqfSM6RyUnuwajEeAzkVnAfgA+7F2f/LqHBhOM3OzHBldlAkiCg WFRNkrq4P8TcI4SocYz3ey4d/CMp9KkIgz7s8WATNFiDgauFID4ZDDzJMDqtktHRbjlDzjLJsGUF3 R8nImWvg==; Received: from [2601:1c0:6280:3f0::19c2] by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEeOJ-0000km-PS; Wed, 18 Mar 2020 19:30:11 +0000 Subject: Re: [PATCH] x86/ioremap: Fix CONFIG_EFI=n build To: Borislav Petkov Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , X86 ML , Ard Biesheuvel , Tom Lendacky References: <20200316183039.0d1c45ce@canb.auug.org.au> <7561e981-0d9b-d62c-0ef2-ce6007aff1ab@infradead.org> <20200318151707.GB4377@zn.tnic> <20200318183451.GC4377@zn.tnic> From: Randy Dunlap Message-ID: Date: Wed, 18 Mar 2020 12:30:09 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200318183451.GC4377@zn.tnic> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/18/20 11:34 AM, Borislav Petkov wrote: > On Wed, Mar 18, 2020 at 04:17:07PM +0100, Borislav Petkov wrote: >>> ld: arch/x86/mm/ioremap.o: in function `__ioremap_caller': >>> ioremap.c:(.text+0x150): undefined reference to `efi_mem_type' >> >> Working on it. > > The below should fix it: > > --- > From: Borislav Petkov > Date: Wed, 18 Mar 2020 19:27:48 +0100 > > In order to use efi_mem_type(), one needs CONFIG_EFI enabled. Otherwise > that function is undefined. Use IS_ENABLED() to check and avoid the > ifdeffery as the compiler optimizes away the following unreachable code > then. > > Fixes: 985e537a4082 ("x86/ioremap: Map EFI runtime services data as encrypted for SEV") > Reported-by: Randy Dunlap > Signed-off-by: Borislav Petkov > Cc: Tom Lendacky > Link: https://lkml.kernel.org/r/7561e981-0d9b-d62c-0ef2-ce6007aff1ab@infradead.org Acked-by: Randy Dunlap # build-tested Thanks. > --- > arch/x86/mm/ioremap.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c > index 935a91e1fd77..18c637c0dc6f 100644 > --- a/arch/x86/mm/ioremap.c > +++ b/arch/x86/mm/ioremap.c > @@ -115,6 +115,9 @@ static void __ioremap_check_other(resource_size_t addr, struct ioremap_desc *des > if (!sev_active()) > return; > > + if (!IS_ENABLED(CONFIG_EFI)) > + return; > + > if (efi_mem_type(addr) == EFI_RUNTIME_SERVICES_DATA) > desc->flags |= IORES_MAP_ENCRYPTED; > } > -- ~Randy