Skip to content

Commit

Permalink
x86/efi: Do not export efi runtime map in case old map
Browse files Browse the repository at this point in the history
For ioremapped efi memory aka old_map the virt addresses are not persistant
across kexec reboot. kexec-tools will read the runtime maps from sysfs then
pass them to 2nd kernel and assuming kexec efi boot is ok. This will cause
kexec boot failure.

To address this issue do not export runtime maps in case efi old_map so
userspace can use no efi boot instead.

Signed-off-by: Dave Young <dyoung@redhat.com>
Acked-by: Borislav Petkov <bp@suse.de>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
  • Loading branch information
Dave Young authored and Matt Fleming committed Jun 2, 2014
1 parent 34f5114 commit a3530e8
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/x86/platform/efi/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,9 @@ static void __init save_runtime_map(void)
void *tmp, *p, *q = NULL;
int count = 0;

if (efi_enabled(EFI_OLD_MEMMAP))
return;

for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
md = p;

Expand Down

0 comments on commit a3530e8

Please sign in to comment.