Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI fix from Ingo Molnar:
 "An UEFI variables fix for SEV guests"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/efi: Access EFI MMIO data as unencrypted when SEV is active
parents acb18725 9b788f32

arch/x86/platform/efi/efi_64.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static void __init __map_region(efi_memory_desc_t *md, u64 va) 
	if (!(md->attribute & EFI_MEMORY_WB))

		flags |= _PAGE_PCD;



	if (sev_active())

	if (sev_active() && md->type != EFI_MEMORY_MAPPED_IO)

		flags |= _PAGE_ENC;



	pfn = md->phys_addr >> PAGE_SHIFT;