diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 647ea987da0e2b89e5e11e29deb231c07812abf5..d3cb42fd51ec2d33d4085c25f132b79875550ed8 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -11,20 +11,11 @@ #include #include #include -#include #ifdef CONFIG_EFI extern void efi_init(void); - -bool efi_runtime_fixup_exception(struct pt_regs *regs, const char *msg); #else #define efi_init() - -static inline -bool efi_runtime_fixup_exception(struct pt_regs *regs, const char *msg) -{ - return false; -} #endif int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); @@ -34,7 +25,6 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); ({ \ efi_virtmap_load(); \ __efi_fpsimd_begin(); \ - raw_spin_lock(&efi_rt_lock); \ }) #define arch_efi_call_virt(p, f, args...) \ @@ -46,12 +36,10 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); #define arch_efi_call_virt_teardown() \ ({ \ - raw_spin_unlock(&efi_rt_lock); \ __efi_fpsimd_end(); \ efi_virtmap_unload(); \ }) -extern raw_spinlock_t efi_rt_lock; efi_status_t __efi_rt_asm_wrapper(void *, const char *, ...); #define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT) diff --git a/arch/arm64/kernel/efi-rt-wrapper.S b/arch/arm64/kernel/efi-rt-wrapper.S index a9ae26e176f1c8adfd6371150c061098050c68e8..f513e6af971b3ef20078afc29b30f336499fa473 100644 --- a/arch/arm64/kernel/efi-rt-wrapper.S +++ b/arch/arm64/kernel/efi-rt-wrapper.S @@ -10,7 +10,7 @@ #include ENTRY(__efi_rt_asm_wrapper) - stp x29, x30, [sp, #-112]! + stp x29, x30, [sp, #-32]! mov x29, sp /* @@ -20,22 +20,6 @@ ENTRY(__efi_rt_asm_wrapper) */ stp x1, x18, [sp, #16] - /* - * Preserve all callee saved registers and preserve the stack pointer - * value at the base of the EFI runtime stack so we can recover from - * synchronous exceptions occurring while executing the firmware - * routines. - */ - stp x19, x20, [sp, #32] - stp x21, x22, [sp, #48] - stp x23, x24, [sp, #64] - stp x25, x26, [sp, #80] - stp x27, x28, [sp, #96] - - ldr_l x16, efi_rt_stack_top - mov sp, x16 - stp x18, x29, [sp, #-16]! - /* * We are lucky enough that no EFI runtime services take more than * 5 arguments, so all are passed in registers rather than via the @@ -49,10 +33,9 @@ ENTRY(__efi_rt_asm_wrapper) mov x4, x6 blr x8 - mov sp, x29 ldp x1, x2, [sp, #16] cmp x2, x18 - ldp x29, x30, [sp], #112 + ldp x29, x30, [sp], #32 b.ne 0f ret 0: @@ -63,22 +46,6 @@ ENTRY(__efi_rt_asm_wrapper) * called with preemption disabled and a separate shadow stack is used * for interrupts. */ -#ifdef CONFIG_SHADOW_CALL_STACK - ldr_l x18, efi_rt_stack_top - ldr x18, [x18, #-16] -#endif - + mov x18, x2 b efi_handle_corrupted_x18 // tail call ENDPROC(__efi_rt_asm_wrapper) - -ENTRY(__efi_rt_asm_recover) - mov sp, x30 - - ldp x19, x20, [sp, #32] - ldp x21, x22, [sp, #48] - ldp x23, x24, [sp, #64] - ldp x25, x26, [sp, #80] - ldp x27, x28, [sp, #96] - ldp x29, x30, [sp], #112 - ret -ENDPROC(__efi_rt_asm_recover) diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index b2a3d5f5d36f56a244baaa0071a0f13e24992f82..4f9acb5fbe97053504d2d61c60a083093f1382f0 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -132,53 +132,3 @@ asmlinkage efi_status_t efi_handle_corrupted_x18(efi_status_t s, const char *f) pr_err_ratelimited(FW_BUG "register x18 corrupted by EFI %s\n", f); return s; } - -DEFINE_RAW_SPINLOCK(efi_rt_lock); - -asmlinkage u64 *efi_rt_stack_top __ro_after_init; - -asmlinkage efi_status_t __efi_rt_asm_recover(void); - -bool efi_runtime_fixup_exception(struct pt_regs *regs, const char *msg) -{ - /* Check whether the exception occurred while running the firmware */ - if (current_work() != &efi_rts_work.work || regs->pc >= TASK_SIZE_64) - return false; - - pr_err(FW_BUG "Unable to handle %s in EFI runtime service\n", msg); - add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK); - clear_bit(EFI_RUNTIME_SERVICES, &efi.flags); - - regs->regs[0] = EFI_ABORTED; - regs->regs[30] = efi_rt_stack_top[-1]; - regs->pc = (u64)__efi_rt_asm_recover; - - if (IS_ENABLED(CONFIG_SHADOW_CALL_STACK)) - regs->regs[18] = efi_rt_stack_top[-2]; - - return true; -} - -/* EFI requires 8 KiB of stack space for runtime services */ -static_assert(THREAD_SIZE >= SZ_8K); - -static int __init arm64_efi_rt_init(void) -{ - void *p; - - if (!efi_enabled(EFI_RUNTIME_SERVICES)) - return 0; - - p = __vmalloc_node(THREAD_SIZE, THREAD_ALIGN, GFP_KERNEL, - PAGE_KERNEL, 0, - NUMA_NO_NODE, &&l); -l: if (!p) { - pr_warn("Failed to allocate EFI runtime stack\n"); - clear_bit(EFI_RUNTIME_SERVICES, &efi.flags); - return -ENOMEM; - } - - efi_rt_stack_top = p + THREAD_SIZE; - return 0; -} -core_initcall(arm64_efi_rt_init); diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index a3c33ccecd839f8426a744cc7e27ab3c8bdd92ea..96bfdade877ae066a2dd9574b83c414e329d8e26 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -333,9 +332,6 @@ static void __do_kernel_fault(unsigned long addr, unsigned int esr, msg = "paging request"; } - if (efi_runtime_fixup_exception(regs, msg)) - return; - die_kernel_fault(msg, addr, esr, regs); } diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index cba62aded6d1885d9ea509f5ab503edee3219c09..f40c0e215f84905b9118cee4b989d7a38d52921e 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -85,7 +85,6 @@ struct efi_runtime_work efi_rts_work; else \ pr_err("Failed to queue work to efi_rts_wq.\n"); \ \ - WARN_ON_ONCE(efi_rts_work.status == EFI_ABORTED); \ exit: \ efi_rts_work.efi_rts_id = EFI_NONE; \ efi_rts_work.status; \