Merge tag 'efi-next-for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Pull EFI updates from Ard Biesheuvel:
 "A healthy mix of EFI contributions this time:

   - Performance tweaks for efifb earlycon (Andy)

   - Preparatory refactoring and cleanup work in the efivar layer, which
     is needed to accommodate the Snapdragon arm64 laptops that expose
     their EFI variable store via a TEE secure world API (Johan)

   - Enhancements to the EFI memory map handling so that Xen dom0 can
     safely access EFI configuration tables (Demi Marie)

   - Wire up the newly introduced IBT/BTI flag in the EFI memory
     attributes table, so that firmware that is generated with ENDBR/BTI
     landing pads will be mapped with enforcement enabled

   - Clean up how we check and print the EFI revision exposed by the
     firmware

   - Incorporate EFI memory attributes protocol definition and wire it
     up in the EFI zboot code (Evgeniy)

     This ensures that these images can execute under new and stricter
     rules regarding the default memory permissions for EFI page
     allocations (More work is in progress here)

   - CPER header cleanup (Dan Williams)

   - Use a raw spinlock to protect the EFI runtime services stack on
     arm64 to ensure the correct semantics under -rt (Pierre)

   - EFI framebuffer quirk for Lenovo Ideapad (Darrell)"

* tag 'efi-next-for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: (24 commits)
  firmware/efi sysfb_efi: Add quirk for Lenovo IdeaPad Duet 3
  arm64: efi: Make efi_rt_lock a raw_spinlock
  efi: Add mixed-mode thunk recipe for GetMemoryAttributes
  efi: x86: Wire up IBT annotation in memory attributes table
  efi: arm64: Wire up BTI annotation in memory attributes table
  efi: Discover BTI support in runtime services regions
  efi/cper, cxl: Remove cxl_err.h
  efi: Use standard format for printing the EFI revision
  efi: Drop minimum EFI version check at boot
  efi: zboot: Use EFI protocol to remap code/data with the right attributes
  efi/libstub: Add memory attribute protocol definitions
  efi: efivars: prevent double registration
  efi: verify that variable services are supported
  efivarfs: always register filesystem
  efi: efivars: add efivars printk prefix
  efi: Warn if trying to reserve memory under Xen
  efi: Actually enable the ESRT under Xen
  efi: Apply allowlist to EFI configuration tables when running under Xen
  efi: xen: Implement memory descriptor lookup based on hypercall
  efi: memmap: Disregard bogus entries instead of returning them
  ...

diff --cc arch/arm64/include/asm/efi.h
index acaa39f,1b81dd5..f86b157
--- 1/arch/arm64/include/asm/efi.h
--- 2/arch/arm64/include/asm/efi.h
+++ b/arch/arm64/include/asm/efi.h
@@@ -47,18 -48,9 +48,18 @@@ int efi_set_mapping_permissions(struct 
        efi_virtmap_unload();                                           \
  })
  
- extern spinlock_t efi_rt_lock;
+ extern raw_spinlock_t efi_rt_lock;
 +extern u64 *efi_rt_stack_top;
  efi_status_t __efi_rt_asm_wrapper(void *, const char *, ...);
  
 +/*
 + * efi_rt_stack_top[-1] contains the value the stack pointer had before
 + * switching to the EFI runtime stack.
 + */
 +#define current_in_efi()                                              \
 +      (!preemptible() && efi_rt_stack_top != NULL &&                  \
 +       on_task_stack(current, READ_ONCE(efi_rt_stack_top[-1]), 1))
 +
  #define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)
  
  /*

diff --cc arch/arm64/kernel/efi.c
Simple merge

diff --cc arch/arm64/kernel/traps.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc drivers/firmware/efi/efi.c
Simple merge

diff --cc drivers/firmware/efi/memattr.c
Simple merge

diff --cc drivers/firmware/google/gsmi.c
Simple merge

diff --cc include/linux/efi.h
Simple merge