[tip: efi/core] efi: libstub/tpm: enable tpm eventlog function for ARM platforms

From: tip-bot2 for Xinwei Kong
Date: Tue Nov 12 2019 - 05:27:17 EST


The following commit has been merged into the efi/core branch of tip:

Commit-ID: d99c1ba6a73b9e93e2884b7893fe19e3c082ba03
Gitweb: https://git.kernel.org/tip/d99c1ba6a73b9e93e2884b7893fe19e3c082ba03
Author: Xinwei Kong <kong.kongxinwei@xxxxxxxxxxxxx>
AuthorDate: Thu, 07 Nov 2019 16:24:21 +08:00
Committer: Ard Biesheuvel <ardb@xxxxxxxxxx>
CommitterDate: Thu, 07 Nov 2019 10:18:45 +01:00

efi: libstub/tpm: enable tpm eventlog function for ARM platforms

Wire up the existing code for ARM that loads the TPM event log into
OS accessible buffers while running the EFI stub so that the kernel
proper can access it at runtime.

Tested-by: Zou Cao <zoucao@xxxxxxxxxxxxxxxxx>
Signed-off-by: Xinwei Kong <kong.kongxinwei@xxxxxxxxxxxxx>
Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
---
drivers/firmware/efi/libstub/arm-stub.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index c382a48..817237c 100644
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -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);