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

Merge tag 'efi-core-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI changes from Ingo Molnar:

 - Preliminary RISC-V enablement - the bulk of it will arrive via the
   RISCV tree.

 - Relax decompressed image placement rules for 32-bit ARM

 - Add support for passing MOK certificate table contents via a config
   table rather than a EFI variable.

 - Add support for 18 bit DIMM row IDs in the CPER records.

 - Work around broken Dell firmware that passes the entire Boot####
   variable contents as the command line

 - Add definition of the EFI_MEMORY_CPU_CRYPTO memory attribute so we
   can identify it in the memory map listings.

 - Don't abort the boot on arm64 if the EFI RNG protocol is available
   but returns with an error

 - Replace slashes with exclamation marks in efivarfs file names

 - Split efi-pstore from the deprecated efivars sysfs code, so we can
   disable the latter on !x86.

 - Misc fixes, cleanups and updates.

* tag 'efi-core-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
  efi: mokvar: add missing include of asm/early_ioremap.h
  efi: efivars: limit availability to X86 builds
  efi: remove some false dependencies on CONFIG_EFI_VARS
  efi: gsmi: fix false dependency on CONFIG_EFI_VARS
  efi: efivars: un-export efivars_sysfs_init()
  efi: pstore: move workqueue handling out of efivars
  efi: pstore: disentangle from deprecated efivars module
  efi: mokvar-table: fix some issues in new code
  efi/arm64: libstub: Deal gracefully with EFI_RNG_PROTOCOL failure
  efivarfs: Replace invalid slashes with exclamation marks in dentries.
  efi: Delete deprecated parameter comments
  efi/libstub: Fix missing-prototypes in string.c
  efi: Add definition of EFI_MEMORY_CPU_CRYPTO and ability to report it
  cper,edac,efi: Memory Error Record: bank group/address and chip id
  edac,ghes,cper: Add Row Extension to Memory Error Record
  efi/x86: Add a quirk to support command line arguments on Dell EFI firmware
  efi/libstub: Add efi_warn and *_once logging helpers
  integrity: Load certs from the EFI MOK config table
  integrity: Move import of MokListRT certs to a separate routine
  efi: Support for MOK variable config table
  ...
parents ed016af5 4d0a4388

Documentation/arm/uefi.rst

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ makes it possible for the kernel to support additional features: 
For actually enabling [U]EFI support, enable:



- CONFIG_EFI=y

- CONFIG_EFI_VARS=y or m

- CONFIG_EFIVAR_FS=y or m



The implementation depends on receiving information about the UEFI environment

in a Flattened Device Tree (FDT) - so is only available with CONFIG_OF.

arch/arm/include/asm/efi.h

+11 −12
Original line number Diff line number Diff line
@@ -66,25 +66,24 @@ static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt) 
#define MAX_UNCOMP_KERNEL_SIZE	SZ_32M



/*

 * The kernel zImage should preferably be located between 32 MB and 128 MB

 * from the base of DRAM. The min address leaves space for a maximal size

 * uncompressed image, and the max address is due to how the zImage decompressor

 * picks a destination address.

 * phys-to-virt patching requires that the physical to virtual offset fits

 * into the immediate field of an add/sub instruction, which comes down to the

 * 24 least significant bits being zero, and so the offset should be a multiple

 * of 16 MB. Since PAGE_OFFSET itself is a multiple of 16 MB, the physical

 * base should be aligned to 16 MB as well.

 */

#define ZIMAGE_OFFSET_LIMIT	SZ_128M

#define MIN_ZIMAGE_OFFSET	MAX_UNCOMP_KERNEL_SIZE

#define EFI_PHYS_ALIGN		SZ_16M



/* on ARM, the FDT should be located in the first 128 MB of RAM */

static inline unsigned long efi_get_max_fdt_addr(unsigned long dram_base)

/* on ARM, the FDT should be located in a lowmem region */

static inline unsigned long efi_get_max_fdt_addr(unsigned long image_addr)

{

	return dram_base + ZIMAGE_OFFSET_LIMIT;

	return round_down(image_addr, EFI_PHYS_ALIGN) + SZ_512M;

}



/* on ARM, the initrd should be loaded in a lowmem region */

static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base,

						    unsigned long image_addr)

static inline unsigned long efi_get_max_initrd_addr(unsigned long image_addr)

{

	return dram_base + SZ_512M;

	return round_down(image_addr, EFI_PHYS_ALIGN) + SZ_512M;

}



struct efi_arm_entry_state {

arch/arm64/include/asm/efi.h

+2 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ efi_status_t __efi_rt_asm_wrapper(void *, const char *, ...); 
	(SEGMENT_ALIGN > THREAD_ALIGN ? SEGMENT_ALIGN : THREAD_ALIGN)



/* on arm64, the FDT may be located anywhere in system RAM */

static inline unsigned long efi_get_max_fdt_addr(unsigned long dram_base)

static inline unsigned long efi_get_max_fdt_addr(unsigned long image_addr)

{

	return ULONG_MAX;

}
@@ -80,8 +80,7 @@ static inline unsigned long efi_get_max_fdt_addr(unsigned long dram_base) 
 * apply to other bootloaders, and are required for some kernel

 * configurations.

 */

static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base,

						    unsigned long image_addr)

static inline unsigned long efi_get_max_initrd_addr(unsigned long image_addr)

{

	return (image_addr & ~(SZ_1G - 1UL)) + (1UL << (VA_BITS_MIN - 1));

}

arch/x86/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -1077,6 +1077,7 @@ void __init setup_arch(char **cmdline_p) 
	efi_fake_memmap();

	efi_find_mirror();

	efi_esrt_init();

	efi_mokvar_table_init();



	/*

	 * The EFI specification says that boot service code won't be

arch/x86/platform/efi/efi.c

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ static const unsigned long * const efi_tables[] = { 
	&efi.tpm_log,

	&efi.tpm_final_log,

	&efi_rng_seed,

#ifdef CONFIG_LOAD_UEFI_KEYS

	&efi.mokvar_table,

#endif

};



u64 efi_setup;		/* efi setup_data physical address */

CRA Git | Maintained and supported by SUSTech CRA and CCSE