Commit 97a77ab1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull EFI updates from Ard Biesheuvel:

 - Enable mirrored memory for arm64

 - Fix up several abuses of the efivar API

 - Refactor the efivar API in preparation for moving the 'business
   logic' part of it into efivarfs

 - Enable ACPI PRM on arm64

* tag 'efi-next-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: (24 commits)
  ACPI: Move PRM config option under the main ACPI config
  ACPI: Enable Platform Runtime Mechanism(PRM) support on ARM64
  ACPI: PRM: Change handler_addr type to void pointer
  efi: Simplify arch_efi_call_virt() macro
  drivers: fix typo in firmware/efi/memmap.c
  efi: vars: Drop __efivar_entry_iter() helper which is no longer used
  efi: vars: Use locking version to iterate over efivars linked lists
  efi: pstore: Omit efivars caching EFI varstore access layer
  efi: vars: Add thin wrapper around EFI get/set variable interface
  efi: vars: Don't drop lock in the middle of efivar_init()
  pstore: Add priv field to pstore_record for backend specific use
  Input: applespi - avoid efivars API and invoke EFI services directly
  selftests/kexec: remove broken EFI_VARS secure boot fallback check
  brcmfmac: Switch to appropriate helper to load EFI variable contents
  iwlwifi: Switch to proper EFI variable store interface
  media: atomisp_gmin_platform: stop abusing efivar API
  efi: efibc: avoid efivar API for setting variables
  efi: avoid efivars layer when loading SSDTs from variables
  efi: Correct comment on efi_memmap_alloc
  memblock: Disable mirror feature if kernelcore is not specified
  ...
parents ff89dd08 e3435fff

arch/arm/include/asm/efi.h

+0 −7
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
#define arch_efi_call_virt_setup()	efi_virtmap_load()

#define arch_efi_call_virt_teardown()	efi_virtmap_unload()



#define arch_efi_call_virt(p, f, args...)				\

({									\

	efi_##f##_t *__f;						\

	__f = p->f;							\

	__f(args);							\

})



#define ARCH_EFI_IRQ_FLAGS_MASK \

	(PSR_J_BIT | PSR_E_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT | \

	 PSR_T_BIT | MODE_MASK)

arch/arm64/include/asm/efi.h

+2 −5
Original line number Diff line number Diff line
@@ -27,12 +27,9 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
	__efi_fpsimd_begin();						\

})



#undef arch_efi_call_virt

#define arch_efi_call_virt(p, f, args...)				\

({									\

	efi_##f##_t *__f;						\

	__f = p->f;							\

	__efi_rt_asm_wrapper(__f, #f, args);				\

})

	__efi_rt_asm_wrapper((p)->f, #f, args)



#define arch_efi_call_virt_teardown()					\

({									\

arch/arm64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ void __init arm64_memblock_init(void) 
			"initrd not fully accessible via the linear mapping -- please check your bootloader ...\n")) {

			phys_initrd_size = 0;

		} else {

			memblock_remove(base, size); /* clear MEMBLOCK_ flags */

			memblock_add(base, size);

			memblock_clear_nomap(base, size);

			memblock_reserve(base, size);

		}

	}

arch/loongarch/include/asm/efi.h

+2 −14
Original line number Diff line number Diff line
@@ -13,20 +13,8 @@ void efifb_setup_from_dmi(struct screen_info *si, const char *opt); 


#define ARCH_EFI_IRQ_FLAGS_MASK  0x00000004  /* Bit 2: CSR.CRMD.IE */



#define arch_efi_call_virt_setup()               \

({                                               \

})



#define arch_efi_call_virt(p, f, args...)        \

({                                               \

	efi_##f##_t * __f;                       \

	__f = p->f;                              \

	__f(args);                               \

})



#define arch_efi_call_virt_teardown()            \

({                                               \

})

#define arch_efi_call_virt_setup()

#define arch_efi_call_virt_teardown()



#define EFI_ALLOC_ALIGN		SZ_64K

arch/riscv/include/asm/efi.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
#define arch_efi_call_virt_setup()      efi_virtmap_load()

#define arch_efi_call_virt_teardown()   efi_virtmap_unload()



#define arch_efi_call_virt(p, f, args...) p->f(args)



#define ARCH_EFI_IRQ_FLAGS_MASK (SR_IE | SR_SPIE)



/* Load initrd anywhere in system RAM */