diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-01 11:40:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-01 11:40:01 -0700 |
| commit | f8566aa4f1766bb0267b7a0ed89c1d2c4a82ee1a (patch) | |
| tree | c0dbe7cb600a12669d6269e406822d0927f83296 | |
| parent | ad2885979ea6657fa8d3da51a301ec0e998ad8e7 (diff) | |
| parent | 0303c9729afc4094ef53e552b7b8cff7436028d6 (diff) | |
| download | net-next-f8566aa4f1766bb0267b7a0ed89c1d2c4a82ee1a.tar.gz | |
Merge tag 'x86-urgent-2023-07-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner:
"A single regression fix for x86:
Moving the invocation of arch_cpu_finalize_init() earlier in the boot
process caused a boot regression on IBT enabled system.
The root cause is not the move of arch_cpu_finalize_init() itself. The
system fails to boot because the subsequent efi_enter_virtual_mode()
code has a non-IBT safe EFI call inside. This was not noticed before
because IBT was enabled after the EFI initialization.
Switching the EFI call to use the IBT safe wrapper cures the problem"
* tag 'x86-urgent-2023-07-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/efi: Make efi_set_virtual_address_map IBT safe
| -rw-r--r-- | arch/x86/platform/efi/efi_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 232acf418cfbe6..77f7ac3668cb4a 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -853,9 +853,9 @@ efi_set_virtual_address_map(unsigned long memory_map_size, /* Disable interrupts around EFI calls: */ local_irq_save(flags); - status = efi_call(efi.runtime->set_virtual_address_map, - memory_map_size, descriptor_size, - descriptor_version, virtual_map); + status = arch_efi_call_virt(efi.runtime, set_virtual_address_map, + memory_map_size, descriptor_size, + descriptor_version, virtual_map); local_irq_restore(flags); efi_fpu_end(); |