Commit fc4c9f45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull EFI updates from Ard Biesheuvel:
 "Another fairly sizable pull request, by EFI subsystem standards.

  Most of the work was done by me, some of it in collaboration with the
  distro and bootloader folks (GRUB, systemd-boot), where the main focus
  has been on removing pointless per-arch differences in the way EFI
  boots a Linux kernel.

   - Refactor the zboot code so that it incorporates all the EFI stub
     logic, rather than calling the decompressed kernel as a EFI app.

   - Add support for initrd= command line option to x86 mixed mode.

   - Allow initrd= to be used with arbitrary EFI accessible file systems
     instead of just the one the kernel itself was loaded from.

   - Move some x86-only handling and manipulation of the EFI memory map
     into arch/x86, as it is not used anywhere else.

   - More flexible handling of any random seeds provided by the boot
     environment (i.e., systemd-boot) so that it becomes available much
     earlier during the boot.

   - Allow improved arch-agnostic EFI support in loaders, by setting a
     uniform baseline of supported features, and adding a generic magic
     number to the DOS/PE header. This should allow loaders such as GRUB
     or systemd-boot to reduce the amount of arch-specific handling
     substantially.

   - (arm64) Run EFI runtime services from a dedicated stack, and use it
     to recover from synchronous exceptions that might occur in the
     firmware code.

   - (arm64) Ensure that we don't allocate memory outside of the 48-bit
     addressable physical range.

   - Make EFI pstore record size configurable

   - Add support for decoding CXL specific CPER records"

* tag 'efi-next-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: (43 commits)
  arm64: efi: Recover from synchronous exceptions occurring in firmware
  arm64: efi: Execute runtime services from a dedicated stack
  arm64: efi: Limit allocations to 48-bit addressable physical region
  efi: Put Linux specific magic number in the DOS header
  efi: libstub: Always enable initrd command line loader and bump version
  efi: stub: use random seed from EFI variable
  efi: vars: prohibit reading random seed variables
  efi: random: combine bootloader provided RNG seed with RNG protocol output
  efi/cper, cxl: Decode CXL Error Log
  efi/cper, cxl: Decode CXL Protocol Error Section
  efi: libstub: fix efi_load_initrd_dev_path() kernel-doc comment
  efi: x86: Move EFI runtime map sysfs code to arch/x86
  efi: runtime-maps: Clarify purpose and enable by default for kexec
  efi: pstore: Add module parameter for setting the record size
  efi: xen: Set EFI_PARAVIRT for Xen dom0 boot on all architectures
  efi: memmap: Move manipulation routines into x86 arch tree
  efi: memmap: Move EFI fake memmap support into x86 arch tree
  efi: libstub: Undeprecate the command line initrd loader
  efi: libstub: Add mixed mode support to command line initrd loader
  efi: libstub: Permit mixed mode return types other than efi_status_t
  ...
parents 717e6eb4 e8dfdf31

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7839,7 +7839,6 @@ F: Documentation/admin-guide/efi-stub.rst 
F:	arch/*/include/asm/efi.h

F:	arch/*/kernel/efi.c

F:	arch/arm/boot/compressed/efi-header.S

F:	arch/arm64/kernel/efi-entry.S

F:	arch/x86/platform/efi/

F:	drivers/firmware/efi/

F:	include/linux/efi*.h

arch/arm/include/asm/efi.h

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ void efi_virtmap_unload(void); 


/* arch specific definitions used by the stub code */



struct screen_info *alloc_screen_info(void);

void free_screen_info(struct screen_info *si);



/*

 * A reasonable upper bound for the uncompressed kernel size is 32 MBytes,

 * so we will reserve that amount of memory. We have no easy way to tell what

arch/arm/kernel/efi.c

+5 −26
Original line number Diff line number Diff line
@@ -75,38 +75,13 @@ int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md) 
	return 0;

}



static unsigned long __initdata screen_info_table = EFI_INVALID_TABLE_ADDR;

static unsigned long __initdata cpu_state_table = EFI_INVALID_TABLE_ADDR;



const efi_config_table_type_t efi_arch_tables[] __initconst = {

	{LINUX_EFI_ARM_SCREEN_INFO_TABLE_GUID, &screen_info_table},

	{LINUX_EFI_ARM_CPU_STATE_TABLE_GUID, &cpu_state_table},

	{}

};



static void __init load_screen_info_table(void)

{

	struct screen_info *si;



	if (screen_info_table != EFI_INVALID_TABLE_ADDR) {

		si = early_memremap_ro(screen_info_table, sizeof(*si));

		if (!si) {

			pr_err("Could not map screen_info config table\n");

			return;

		}

		screen_info = *si;

		early_memunmap(si, sizeof(*si));



		/* dummycon on ARM needs non-zero values for columns/lines */

		screen_info.orig_video_cols = 80;

		screen_info.orig_video_lines = 25;



		if (memblock_is_map_memory(screen_info.lfb_base))

			memblock_mark_nomap(screen_info.lfb_base,

					    screen_info.lfb_size);

	}

}



static void __init load_cpu_state_table(void)

{

	if (cpu_state_table != EFI_INVALID_TABLE_ADDR) {
@@ -145,7 +120,11 @@ void __init arm_efi_init(void) 
{

	efi_init();



	load_screen_info_table();

	if (screen_info.orig_video_isVGA == VIDEO_TYPE_EFI) {

		/* dummycon on ARM needs non-zero values for columns/lines */

		screen_info.orig_video_cols = 80;

		screen_info.orig_video_lines = 25;

	}



	/* ARM does not permit early mappings to persist across paging_init() */

	efi_memmap_unmap();

arch/arm64/include/asm/efi.h

+24 −3
Original line number Diff line number Diff line
@@ -14,8 +14,16 @@ 


#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);
@@ -25,6 +33,7 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
({									\

	efi_virtmap_load();						\

	__efi_fpsimd_begin();						\

	spin_lock(&efi_rt_lock);					\

})



#undef arch_efi_call_virt
@@ -33,10 +42,12 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 


#define arch_efi_call_virt_teardown()					\

({									\

	spin_unlock(&efi_rt_lock);					\

	__efi_fpsimd_end();						\

	efi_virtmap_unload();						\

})



extern 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)
@@ -76,13 +87,23 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long image_addr) 
	return (image_addr & ~(SZ_1G - 1UL)) + (1UL << (VA_BITS_MIN - 1));

}



#define alloc_screen_info(x...)		&screen_info



static inline void free_screen_info(struct screen_info *si)

static inline unsigned long efi_get_kimg_min_align(void)

{

	extern bool efi_nokaslr;



	/*

	 * Although relocatable kernels can fix up the misalignment with

	 * respect to MIN_KIMG_ALIGN, the resulting virtual text addresses are

	 * subtly out of sync with those recorded in the vmlinux when kaslr is

	 * disabled but the image required relocation anyway. Therefore retain

	 * 2M alignment if KASLR was explicitly disabled, even if it was not

	 * going to be activated to begin with.

	 */

	return efi_nokaslr ? MIN_KIMG_ALIGN : EFI_KIMG_ALIGN;

}



#define EFI_ALLOC_ALIGN		SZ_64K

#define EFI_ALLOC_LIMIT		((1UL << 48) - 1)



/*

 * On ARM systems, virtually remapped UEFI runtime services are set up in two

arch/arm64/kernel/Makefile

+1 −8
Original line number Diff line number Diff line
@@ -36,12 +36,6 @@ obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ 
			   syscall.o proton-pack.o idreg-override.o idle.o	\

			   patching.o



targets			+= efi-entry.o



OBJCOPYFLAGS := --prefix-symbols=__efistub_

$(obj)/%.stub.o: $(obj)/%.o FORCE

	$(call if_changed,objcopy)



obj-$(CONFIG_COMPAT)			+= sys32.o signal32.o			\

					   sys_compat.o

obj-$(CONFIG_COMPAT)			+= sigreturn32.o
@@ -57,8 +51,7 @@ obj-$(CONFIG_CPU_PM) += sleep.o suspend.o 
obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o

obj-$(CONFIG_KGDB)			+= kgdb.o

obj-$(CONFIG_EFI)			+= efi.o efi-entry.stub.o		\

					   efi-rt-wrapper.o

obj-$(CONFIG_EFI)			+= efi.o efi-rt-wrapper.o

obj-$(CONFIG_PCI)			+= pci.o

obj-$(CONFIG_ARMV8_DEPRECATED)		+= armv8_deprecated.o

obj-$(CONFIG_ACPI)			+= acpi.o