diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-30 11:07:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-30 11:07:34 -0700 |
| commit | d464b0314c79996a0a4ae9ed3b13f914052d747d (patch) | |
| tree | 9f70930212ed3fa1ed3f660fac12eb532635925e /arch | |
| parent | acb1872577b346bd15ab3a3f8dff780d6cca4b70 (diff) | |
| parent | 9b788f32bee6b0b293a4bdfca4ad4bb0206407fb (diff) | |
| download | linux-d464b0314c79996a0a4ae9ed3b13f914052d747d.tar.bz2 | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/platform/efi/efi_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 77873ce700ae..5f2eb3231607 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -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; |