Commit dd78af9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-fixes-for-v6.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi 

Pull EFI fix from Ard Biesheuvel:
 "A fix from Darren to widen the SMBIOS match for detecting Ampere Altra
  machines with problematic firmware. In the mean time, we are working
  on a more precise check, but this is still work in progress"

* tag 'efi-fixes-for-v6.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines
parents 49a0bdb0 19023316

drivers/firmware/efi/libstub/arm64.c

+6 −3
Original line number Diff line number Diff line
@@ -19,10 +19,13 @@ static bool system_needs_vamap(void) 
	const u8 *type1_family = efi_get_smbios_string(1, family);



	/*

	 * Ampere Altra machines crash in SetTime() if SetVirtualAddressMap()

	 * has not been called prior.

	 * Ampere eMAG, Altra, and Altra Max machines crash in SetTime() if

	 * SetVirtualAddressMap() has not been called prior.

	 */

	if (!type1_family || strcmp(type1_family, "Altra"))

	if (!type1_family || (

	    strcmp(type1_family, "eMAG") &&

	    strcmp(type1_family, "Altra") &&

	    strcmp(type1_family, "Altra Max")))

		return false;



	efi_warn("Working around broken SetVirtualAddressMap()\n");