summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-11-12 13:20:17 +0300
committerThomas Gleixner <tglx@linutronix.de>2019-11-12 13:20:17 +0300
commit2278f452a12d5b5b01f96441a7a4336710365022 (patch)
treea45a45d098ccecd7edfc3303e38ab4699568e8f5 /arch/x86
parenta99d8080aaf358d5d23581244e5da23b35e340b9 (diff)
parentd99c1ba6a73b9e93e2884b7893fe19e3c082ba03 (diff)
downloadlinux-2278f452a12d5b5b01f96441a7a4336710365022.tar.xz
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')
-rw-r--r--arch/x86/boot/compressed/eboot.c3
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);