diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2019-11-12 11:20:17 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-11-12 11:20:17 +0100 |
| commit | 2278f452a12d5b5b01f96441a7a4336710365022 (patch) | |
| tree | a45a45d098ccecd7edfc3303e38ab4699568e8f5 /arch/x86/boot | |
| parent | Linux 5.4-rc6 (diff) | |
| parent | efi: libstub/tpm: enable tpm eventlog function for ARM platforms (diff) | |
| download | linux-dev-2278f452a12d5b5b01f96441a7a4336710365022.tar.xz linux-dev-2278f452a12d5b5b01f96441a7a4336710365022.zip | |
Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core
Pull EFI changes for v5.5 from Ard Biesheuvel:
- Change my email address to @kernel.org so I am no longer at the mercy of
useless corporate email infrastructure
- 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.
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 82bc60c8acb2..68945c5700bf 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -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); |