Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200701141731.377252388@hpe.com> <20200701141732.706351085@hpe.com>
In-Reply-To: <20200701141732.706351085@hpe.com>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Wed, 1 Jul 2020 17:25:04 +0200
Message-ID: <CAMj1kXE63uh2QhN1mrdSjwNM6yQqM7EY1kRnLBEmdeLovXYmSQ@mail.gmail.com>
Subject: Re: [patch 10/13] Delete SGI UV1 detection.
To:     Steve Wahl <steve.wahl@hpe.com>
Cc:     Jonathan Corbet <corbet@lwn.net>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        X86 ML <x86@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
        Darren Hart <dvhart@infradead.org>,
        Andy Shevchenko <andy@infradead.org>,
        Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Paul E. McKenney" <paulmck@kernel.org>,
        Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
        Juergen Gross <jgross@suse.com>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        Oliver Neukum <oneukum@suse.com>,
        Mike Travis <mike.travis@hpe.com>,
        Dimitri Sivanich <dimitri.sivanich@hpe.com>,
        Benjamin Thiel <b.thiel@posteo.de>,
        Andy Lutomirski <luto@kernel.org>,
        Arnd Bergmann <arnd@arndb.de>,
        James Morris <jmorris@namei.org>,
        David Howells <dhowells@redhat.com>,
        Kees Cook <keescook@chromium.org>,
        Dave Young <dyoung@redhat.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Logan Gunthorpe <logang@deltatee.com>,
        Alexandre Chartre <alexandre.chartre@oracle.com>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        Austin Kim <austindh.kim@gmail.com>,
        Alexey Dobriyan <adobriyan@gmail.com>,
        Linux Doc Mailing List <linux-doc@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        linux-efi <linux-efi@vger.kernel.org>,
        Russ Anderson <rja@hpe.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, 1 Jul 2020 at 16:18, <steve.wahl@hpe.com> wrote:
>
> As a part of UV1 platform removal, don't try to recognize the platform
> through DMI to set the EFI_UV1_MEMMAP bit.
>
> Signed-off-by: Steve Wahl <steve.wahl@hpe.com>

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

> ---
>  arch/x86/platform/efi/quirks.c |   23 -----------------------
>  1 file changed, 23 deletions(-)
>
> --- linux.orig/arch/x86/platform/efi/quirks.c   2020-06-17 14:29:45.510015978 -0500
> +++ linux/arch/x86/platform/efi/quirks.c        2020-06-17 14:36:34.473414139 -0500
> @@ -558,16 +558,6 @@ out:
>         return ret;
>  }
>
> -static const struct dmi_system_id sgi_uv1_dmi[] __initconst = {
> -       { NULL, "SGI UV1",
> -               {       DMI_MATCH(DMI_PRODUCT_NAME,     "Stoutland Platform"),
> -                       DMI_MATCH(DMI_PRODUCT_VERSION,  "1.0"),
> -                       DMI_MATCH(DMI_BIOS_VENDOR,      "SGI.COM"),
> -               }
> -       },
> -       { } /* NULL entry stops DMI scanning */
> -};
> -
>  void __init efi_apply_memmap_quirks(void)
>  {
>         /*
> @@ -579,17 +569,6 @@ void __init efi_apply_memmap_quirks(void
>                 pr_info("Setup done, disabling due to 32/64-bit mismatch\n");
>                 efi_memmap_unmap();
>         }
> -
> -       /* UV2+ BIOS has a fix for this issue.  UV1 still needs the quirk. */
> -       if (dmi_check_system(sgi_uv1_dmi)) {
> -               if (IS_ENABLED(CONFIG_X86_UV)) {
> -                       set_bit(EFI_UV1_MEMMAP, &efi.flags);
> -               } else {
> -                       pr_warn("EFI runtime disabled, needs CONFIG_X86_UV=y on UV1\n");
> -                       clear_bit(EFI_RUNTIME_SERVICES, &efi.flags);
> -                       efi_memmap_unmap();
> -               }
> -       }
>  }
>
>  /*
> @@ -723,8 +702,6 @@ void efi_recover_from_page_fault(unsigne
>
>         /*
>          * Make sure that an efi runtime service caused the page fault.
> -        * "efi_mm" cannot be used to check if the page fault had occurred
> -        * in the firmware context because the UV1 memmap doesn't use efi_pgd.
>          */
>         if (efi_rts_work.efi_rts_id == EFI_NONE)
>                 return;
>