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

Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI updates from Ingo Molnar:
 "The main changes in this cycle were:

   - Wire up the EFI RNG code for x86. This enables an additional source
     of entropy during early boot.

   - Enable the TPM event log code on ARM platforms.

   - Update Ard's email address"

* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi: libstub/tpm: enable tpm eventlog function for ARM platforms
  x86: efi/random: Invoke EFI_RNG_PROTOCOL to seed the UEFI RNG table
  efi/random: use arch-independent efi_call_proto()
  MAINTAINERS: update Ard's email address to @kernel.org
parents 3f612813 2278f452

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Andy Adamson <andros@citi.umich.edu> 
Antoine Tenart <antoine.tenart@free-electrons.com>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Archit Taneja <archit@ti.com>

Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>

Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -6019,14 +6019,14 @@ F: sound/usb/misc/ua101.c 
EFI TEST DRIVER

L:	linux-efi@vger.kernel.org

M:	Ivan Hu <ivan.hu@canonical.com>

M:	Ard Biesheuvel <ard.biesheuvel@linaro.org>

M:	Ard Biesheuvel <ardb@kernel.org>

S:	Maintained

F:	drivers/firmware/efi/test/















EFI VARIABLE FILESYSTEM















M:	Matthew Garrett <matthew.garrett@nebula.com>















M:	Jeremy Kerr <jk@ozlabs.org>













M:	Ard Biesheuvel <ard.biesheuvel@linaro.org>













M:	Ard Biesheuvel <ardb@kernel.org>















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git















L:	linux-efi@vger.kernel.org















S:	Maintained










@@ -6207,7 +6207,7 @@ S:	Supported













F:	security/integrity/evm/





























EXTENSIBLE FIRMWARE INTERFACE (EFI)













M:	Ard Biesheuvel <ard.biesheuvel@linaro.org>













M:	Ard Biesheuvel <ardb@kernel.org>















L:	linux-efi@vger.kernel.org















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git















S:	Maintained










@@ -15083,7 +15083,7 @@ F:	include/media/soc_camera.h













F:	drivers/staging/media/soc_camera/





























SOCIONEXT SYNQUACER I2C DRIVER













M:	Ard Biesheuvel <ard.biesheuvel@linaro.org>













M:	Ard Biesheuvel <ardb@kernel.org>















L:	linux-i2c@vger.kernel.org















S:	Maintained















F:	drivers/i2c/busses/i2c-synquacer.c

































arch/x86/boot/compressed/eboot.c



+3
−0






























Original line number
Diff line number
Diff line








@@ -782,6 +782,9 @@ efi_main(struct efi_config *c, struct boot_params *boot_params)





























	/* Ask the firmware to clear memory on unclean shutdown */















	efi_enable_reset_attack_mitigation(sys_table);



























	efi_random_get_seed(sys_table);





























	efi_retrieve_tpm2_eventlog(sys_table);































	setup_graphics(boot_params);

































drivers/firmware/efi/libstub/Makefile



+3
−2






























Original line number
Diff line number
Diff line








@@ -38,7 +38,8 @@ OBJECT_FILES_NON_STANDARD	:= y













# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.















KCOV_INSTRUMENT			:= n





























lib-y				:= efi-stub-helper.o gop.o secureboot.o tpm.o













lib-y				:= efi-stub-helper.o gop.o secureboot.o tpm.o \













				   random.o































# include the stub's generic dependencies from lib/ when building for ARM/arm64















arm-deps-y := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c fdt_empty_tree.c fdt_sw.c









@@ -47,7 +48,7 @@ arm-deps-$(CONFIG_ARM64) += sort.c













$(obj)/lib-%.o: $(srctree)/lib/%.c FORCE















	$(call if_changed_rule,cc_o_c)





























lib-$(CONFIG_EFI_ARMSTUB)	+= arm-stub.o fdt.o string.o random.o \













lib-$(CONFIG_EFI_ARMSTUB)	+= arm-stub.o fdt.o string.o \















				   $(patsubst %.c,lib-%.o,$(arm-deps-y))































lib-$(CONFIG_ARM)		+= arm32-stub.o

































drivers/firmware/efi/libstub/arm-stub.c



+2
−0






























Original line number
Diff line number
Diff line








@@ -189,6 +189,8 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table,













		goto fail_free_cmdline;















	}





























	efi_retrieve_tpm2_eventlog(sys_table);





























	/* Ask the firmware to clear memory on unclean shutdown */















	efi_enable_reset_attack_mitigation(sys_table);

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE