x86/efi: Delete SGI UV1 detection. (cadde237) · Commits · 戴 / test

arch/x86/platform/efi/quirks.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -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(unsigned long phys_addr)

		/*
		* 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;