Skip to content

Commit cadde23

Browse files
swahlhpeKAGA-KOKO
authored andcommitted
x86/efi: Delete SGI UV1 detection.
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 3dad716 commit cadde23

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

arch/x86/platform/efi/quirks.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -558,16 +558,6 @@ int __init efi_reuse_config(u64 tables, int nr_tables)
558558
return ret;
559559
}
560560

561-
static const struct dmi_system_id sgi_uv1_dmi[] __initconst = {
562-
{ NULL, "SGI UV1",
563-
{ DMI_MATCH(DMI_PRODUCT_NAME, "Stoutland Platform"),
564-
DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),
565-
DMI_MATCH(DMI_BIOS_VENDOR, "SGI.COM"),
566-
}
567-
},
568-
{ } /* NULL entry stops DMI scanning */
569-
};
570-
571561
void __init efi_apply_memmap_quirks(void)
572562
{
573563
/*
@@ -579,17 +569,6 @@ void __init efi_apply_memmap_quirks(void)
579569
pr_info("Setup done, disabling due to 32/64-bit mismatch\n");
580570
efi_memmap_unmap();
581571
}
582-
583-
/* UV2+ BIOS has a fix for this issue. UV1 still needs the quirk. */
584-
if (dmi_check_system(sgi_uv1_dmi)) {
585-
if (IS_ENABLED(CONFIG_X86_UV)) {
586-
set_bit(EFI_UV1_MEMMAP, &efi.flags);
587-
} else {
588-
pr_warn("EFI runtime disabled, needs CONFIG_X86_UV=y on UV1\n");
589-
clear_bit(EFI_RUNTIME_SERVICES, &efi.flags);
590-
efi_memmap_unmap();
591-
}
592-
}
593572
}
594573

595574
/*
@@ -723,8 +702,6 @@ void efi_recover_from_page_fault(unsigned long phys_addr)
723702

724703
/*
725704
* Make sure that an efi runtime service caused the page fault.
726-
* "efi_mm" cannot be used to check if the page fault had occurred
727-
* in the firmware context because the UV1 memmap doesn't use efi_pgd.
728705
*/
729706
if (efi_rts_work.efi_rts_id == EFI_NONE)
730707
return;

0 commit comments

Comments
 (0)