Commit a5a750a9 authored by Dave Young's avatar Dave Young Committed by Matt Fleming

x86/efi: Clear EFI_RUNTIME_SERVICES if failing to enter virtual mode

If enter virtual mode failed due to some reason other than the efi call
the EFI_RUNTIME_SERVICES bit in efi.flags should be cleared thus users
of efi runtime services can check the bit and handle the case instead of
assume efi runtime is ok.

Per Matt, if efi call SetVirtualAddressMap fails we will be not sure
it's safe to make any assumptions about the state of the system. So
kernel panics instead of clears EFI_RUNTIME_SERVICES bit.
Signed-off-by: default avatarDave Young <dyoung@redhat.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 6632210f
...@@ -724,6 +724,7 @@ static void __init kexec_enter_virtual_mode(void) ...@@ -724,6 +724,7 @@ static void __init kexec_enter_virtual_mode(void)
*/ */
if (!efi_is_native()) { if (!efi_is_native()) {
efi_unmap_memmap(); efi_unmap_memmap();
clear_bit(EFI_RUNTIME_SERVICES, &efi.flags);
return; return;
} }
...@@ -797,6 +798,7 @@ static void __init __efi_enter_virtual_mode(void) ...@@ -797,6 +798,7 @@ static void __init __efi_enter_virtual_mode(void)
new_memmap = efi_map_regions(&count, &pg_shift); new_memmap = efi_map_regions(&count, &pg_shift);
if (!new_memmap) { if (!new_memmap) {
pr_err("Error reallocating memory, EFI runtime non-functional!\n"); pr_err("Error reallocating memory, EFI runtime non-functional!\n");
clear_bit(EFI_RUNTIME_SERVICES, &efi.flags);
return; return;
} }
...@@ -804,8 +806,10 @@ static void __init __efi_enter_virtual_mode(void) ...@@ -804,8 +806,10 @@ static void __init __efi_enter_virtual_mode(void)
BUG_ON(!efi.systab); BUG_ON(!efi.systab);
if (efi_setup_page_tables(__pa(new_memmap), 1 << pg_shift)) if (efi_setup_page_tables(__pa(new_memmap), 1 << pg_shift)) {
clear_bit(EFI_RUNTIME_SERVICES, &efi.flags);
return; return;
}
efi_sync_low_kernel_mappings(); efi_sync_low_kernel_mappings();
efi_dump_pagetable(); efi_dump_pagetable();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment