diff options
| author | Youness Alaoui <youness.alaoui@puri.sm> | 2018-02-07 11:49:35 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-03-26 10:22:23 +0000 |
| commit | 676887d2e2e474f70a8ebb1b6065f71e4e81001d (patch) | |
| tree | a19ecb9eeecc0ec0196941182b3c9fb56c4f0b5e | |
| parent | e415a4c355b3c030bef7304897a166b1ca60dd7c (diff) | |
drivers/intel/fsp: Fix TPM initialization when vboot is disabled
A change introduced by commit fe4983e5 [1] in order to prevent
re-initialization of the TPM if already set up in verstage
had the wrong logic in the if statement, causing the TPM
to never be initialized if vboot is disabled.
The RESUME_PATH_SAME_AS_BOOT config is enabled by default for
ARCH_X86, resulting in the if statement to always evaluate to
false. Remove that condition from the if statement to allow it
to function as intended.
This patch also enables TPM initialization for FSP 2.0 with
the same conditions.
[1] intel/fsp1_1: Do not re-init TPM in romstage if already setup in verstage
https://review.coreboot.org/#/c/coreboot/+/14106/
Change-Id: Ic43d1aa31a296386c7eab6d997f9b701e9ea0fe5
Signed-off-by: Youness Alaoui <youness.alaoui@puri.sm>
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/23680
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/drivers/intel/fsp1_1/romstage.c | 1 | ||||
| -rw-r--r-- | src/drivers/intel/fsp2_0/memory_init.c | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c index 69ea7865ea..88401f0b4b 100644 --- a/src/drivers/intel/fsp1_1/romstage.c +++ b/src/drivers/intel/fsp1_1/romstage.c @@ -172,7 +172,6 @@ void romstage_common(struct romstage_params *params) * in verstage and used to verify romstage. */ if (IS_ENABLED(CONFIG_LPC_TPM) && - !IS_ENABLED(CONFIG_RESUME_PATH_SAME_AS_BOOT) && !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK)) init_tpm(params->power_state->prev_sleep_state == ACPI_S3); diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 8eb1bd54ea..0abe121aa6 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -31,6 +31,7 @@ #include <string.h> #include <symbols.h> #include <timestamp.h> +#include <security/tpm/tis.h> #include <security/tpm/tss.h> #include <security/vboot/vboot_common.h> #include <vb2_api.h> @@ -146,6 +147,14 @@ static void do_fsp_post_memory_init(bool s3wake, uint32_t fsp_version) /* Create romstage handof information */ romstage_handoff_init(s3wake); + + /* + * Initialize the TPM, unless the TPM was already initialized + * in verstage and used to verify romstage. + */ + if (IS_ENABLED(CONFIG_LPC_TPM) && + !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK)) + init_tpm(s3wake); } static int mrc_cache_verify_tpm_hash(const uint8_t *data, size_t size) |