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=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 9951AC433E0 for ; Wed, 1 Jul 2020 15:29:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7858A207D0 for ; Wed, 1 Jul 2020 15:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593617349; bh=6RpV1PcquvB5KGvhSCCiefj50EJSlVYNbwhMO1x1uCc=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=IWdtR0nsJ/xRudVWGtMl2FebcAss/7eSRnuQoLqzzefsCntMCRPd35EXpN/zP56fv uQN7Hmo7Ne4Ldqqaucb74yfhzX82ktZew06jm360nC4vH1mU/uiJ06cwH6CzbDJdT7 v/49CnnLkC1RDVWg61Kfk2Aq7AoX0rnrVTIfvwyQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731920AbgGAP3I (ORCPT ); Wed, 1 Jul 2020 11:29:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:57732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731763AbgGAP3G (ORCPT ); Wed, 1 Jul 2020 11:29:06 -0400 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AA2AF2080D; Wed, 1 Jul 2020 15:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593617345; bh=6RpV1PcquvB5KGvhSCCiefj50EJSlVYNbwhMO1x1uCc=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=ygHhpl2SmxB+e5wnrEz/3ytMzGGNVa6l1A1Pbt9+PJObGItQapT47KKhK0sNXpVXd 4JxktHJuJAxQ3EHVTZ2zm1HBVQxeTFYzBJj5bHagVuQV0jB4oBst4FCe4RIg+IKqoX klM8tt/oX7hd9Fx9OBSvXkgEOo6mrmjD7VL2TUwA= Received: by mail-ot1-f43.google.com with SMTP id w17so13855864otl.4; Wed, 01 Jul 2020 08:29:05 -0700 (PDT) X-Gm-Message-State: AOAM530tzjqRde6k7YLEKKlG69V9GqhfdrMgO0YUM4HcuoFgfpEdLvti qcMciQRcX2Gzpx0TPjDegmBZgjWbS/dia7Gl58Y= X-Google-Smtp-Source: ABdhPJwNNaDzx+H1Y3TYfLidx+Pqudx5QWzNub0n5wZ8PcUy4pg2RLhXJ5Uh5+gNutpFPFtgbNTuCdqGgaRri+NIb7Q= X-Received: by 2002:a9d:688:: with SMTP id 8mr22965465otx.108.1593617344228; Wed, 01 Jul 2020 08:29:04 -0700 (PDT) MIME-Version: 1.0 References: <20200701141731.377252388@hpe.com> <20200701141733.081104906@hpe.com> In-Reply-To: <20200701141733.081104906@hpe.com> From: Ard Biesheuvel Date: Wed, 1 Jul 2020 17:28:52 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [patch 13/13] Remove (now unused) EFI_UV1_MEMMAP from efi.h To: Steve Wahl Cc: Jonathan Corbet , Thomas Gleixner , Ingo Molnar , Borislav Petkov , X86 ML , "H. Peter Anvin" , Darren Hart , Andy Shevchenko , Mauro Carvalho Chehab , Andrew Morton , Greg Kroah-Hartman , "Paul E. McKenney" , Pawan Gupta , Juergen Gross , Mike Kravetz , Oliver Neukum , Mike Travis , Dimitri Sivanich , Benjamin Thiel , Andy Lutomirski , Arnd Bergmann , James Morris , David Howells , Kees Cook , Dave Young , Dan Williams , Logan Gunthorpe , Alexandre Chartre , "Peter Zijlstra (Intel)" , Austin Kim , Alexey Dobriyan , Linux Doc Mailing List , Linux Kernel Mailing List , linux-efi , Russ Anderson Content-Type: text/plain; charset="UTF-8" Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org On Wed, 1 Jul 2020 at 16:18, wrote: > > With UV1 support removed, EFI_UV1_MEMMAP is no longer used. > > Signed-off-by: Steve Wahl Reviewed-by: Ard Biesheuvel > --- > arch/x86/include/asm/efi.h | 20 ++------------------ > 1 file changed, 2 insertions(+), 18 deletions(-) > > --- linux.orig/arch/x86/include/asm/efi.h 2020-06-17 14:21:49.798542440 -0500 > +++ linux/arch/x86/include/asm/efi.h 2020-06-17 14:28:55.830071857 -0500 > @@ -22,17 +22,7 @@ extern unsigned long efi_fw_vendor, efi_ > * > * This is the main reason why we're doing stable VA mappings for RT > * services. > - * > - * SGI UV1 machines are known to be incompatible with this scheme, so we > - * provide an opt-out for these machines via a DMI quirk that sets the > - * attribute below. > */ > -#define EFI_UV1_MEMMAP EFI_ARCH_1 > - > -static inline bool efi_have_uv1_memmap(void) > -{ > - return IS_ENABLED(CONFIG_X86_UV) && efi_enabled(EFI_UV1_MEMMAP); > -} > > #define EFI32_LOADER_SIGNATURE "EL32" > #define EFI64_LOADER_SIGNATURE "EL64" > @@ -122,9 +112,7 @@ struct efi_scratch { > efi_sync_low_kernel_mappings(); \ > kernel_fpu_begin(); \ > firmware_restrict_branch_speculation_start(); \ > - \ > - if (!efi_have_uv1_memmap()) \ > - efi_switch_mm(&efi_mm); \ > + efi_switch_mm(&efi_mm); \ > }) > > #define arch_efi_call_virt(p, f, args...) \ > @@ -132,9 +120,7 @@ struct efi_scratch { > > #define arch_efi_call_virt_teardown() \ > ({ \ > - if (!efi_have_uv1_memmap()) \ > - efi_switch_mm(efi_scratch.prev_mm); \ > - \ > + efi_switch_mm(efi_scratch.prev_mm); \ > firmware_restrict_branch_speculation_end(); \ > kernel_fpu_end(); \ > }) > @@ -176,8 +162,6 @@ extern void efi_delete_dummy_variable(vo > extern void efi_switch_mm(struct mm_struct *mm); > extern void efi_recover_from_page_fault(unsigned long phys_addr); > extern void efi_free_boot_services(void); > -extern pgd_t * __init efi_uv1_memmap_phys_prolog(void); > -extern void __init efi_uv1_memmap_phys_epilog(pgd_t *save_pgd); > > /* kexec external ABI */ > struct efi_setup_data { >