The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 870b4333a62e45b0b2000d14b301b7b8b8cad9da Gitweb: https://git.kernel.org/tip/870b4333a62e45b0b2000d14b301b7b8b8cad9da Author: Borislav Petkov bp@suse.de AuthorDate: Wed, 18 Mar 2020 19:27:48 +01:00 Committer: Borislav Petkov bp@suse.de CommitterDate: Thu, 19 Mar 2020 10:55:56 +01:00
x86/ioremap: Fix CONFIG_EFI=n build
In order to use efi_mem_type(), one needs CONFIG_EFI enabled. Otherwise that function is undefined. Use IS_ENABLED() to check and avoid the ifdeffery as the compiler optimizes away the following unreachable code then.
Fixes: 985e537a4082 ("x86/ioremap: Map EFI runtime services data as encrypted for SEV") Reported-by: Randy Dunlap rdunlap@infradead.org Signed-off-by: Borislav Petkov bp@suse.de Tested-by: Randy Dunlap rdunlap@infradead.org Cc: Tom Lendacky thomas.lendacky@amd.com Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/7561e981-0d9b-d62c-0ef2-ce6007aff1ab@infradead.org --- arch/x86/mm/ioremap.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 935a91e..18c637c 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -115,6 +115,9 @@ static void __ioremap_check_other(resource_size_t addr, struct ioremap_desc *des if (!sev_active()) return;
+ if (!IS_ENABLED(CONFIG_EFI)) + return; + if (efi_mem_type(addr) == EFI_RUNTIME_SERVICES_DATA) desc->flags |= IORES_MAP_ENCRYPTED; }