From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 8 Mar 2020 07:59:47 +0000 (+0100)
Subject: Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3be5f0d286dc944dee65fdcbddfc4d314f7d4482;p=linux.git

Merge tag 'efi-next' of git://git./linux/kernel/git/efi/efi into efi/core

More EFI updates for v5.7

 - Incorporate a stable branch with the EFI pieces of Hans's work on
   loading device firmware from EFI boot service memory regions

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

3be5f0d286dc944dee65fdcbddfc4d314f7d4482
diff --cc arch/x86/platform/efi/efi.c
index aca9bdd87bcaf,a4ea04603af3d..1aae5302501d0
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@@ -901,8 -944,17 +902,9 @@@ static void __init __efi_enter_virtual_
  		goto err;
  	}
  
+ 	efi_check_for_embedded_firmwares();
  	efi_free_boot_services();
  
 -	/*
 -	 * Now that EFI is in virtual mode, update the function
 -	 * pointers in the runtime service table to the new virtual addresses.
 -	 *
 -	 * Call EFI services through wrapper functions.
 -	 */
 -	efi.runtime_version = efi_systab.hdr.revision;
 -
  	if (!efi_is_mixed())
  		efi_native_runtime_setup();
  	else