From db70f3bb4d5d58441b1c93d216347ec296b4f787 Mon Sep 17 00:00:00 2001 From: Philipp Deppenwiese Date: Tue, 27 Feb 2018 22:18:11 +0100 Subject: drivers/tpm: Add TPM ramstage driver for devices without vboot. Logic: If vboot is not used and the tpm is not initialized in the romstage makes use of the ramstage driver to initialize the TPM globally without having setup calls in lower SoC level implementations. * Add TPM driver in ramstage chip init which calls the tpm_setup function. * Purge all occurrences of TPM init code and headers. * Only compile TIS drivers into ramstage except for vboot usage. * Remove Google Urara/Rotor TPM support because of missing i2c driver in ramstage. Change-Id: I7536c9734732aeaa85ccc7916c12eecb9ca26b2e Signed-off-by: Philipp Deppenwiese Reviewed-on: https://review.coreboot.org/24905 Reviewed-by: Patrick Rudolph Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- src/drivers/intel/fsp1_1/romstage.c | 10 ---------- src/drivers/tpm/Kconfig | 7 +++++++ src/drivers/tpm/Makefile.inc | 1 + src/drivers/tpm/tpm.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 src/drivers/tpm/Kconfig create mode 100644 src/drivers/tpm/Makefile.inc create mode 100644 src/drivers/tpm/tpm.c (limited to 'src/drivers') diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c index 0320bf5724..51f9a75373 100644 --- a/src/drivers/intel/fsp1_1/romstage.c +++ b/src/drivers/intel/fsp1_1/romstage.c @@ -37,7 +37,6 @@ #include #include #include -#include #include asmlinkage void *romstage_main(FSP_INFO_HEADER *fih) @@ -167,15 +166,6 @@ void romstage_common(struct romstage_params *params) if (romstage_handoff_init( params->power_state->prev_sleep_state == ACPI_S3) < 0) hard_reset(); - - /* - * Initialize the TPM, unless the TPM was already initialized - * in verstage and used to verify romstage. - */ - if ((IS_ENABLED(CONFIG_TPM1) || IS_ENABLED(CONFIG_TPM2)) && - !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK)) - tpm_setup(params->power_state->prev_sleep_state == - ACPI_S3); } void after_cache_as_ram_stage(void) diff --git a/src/drivers/tpm/Kconfig b/src/drivers/tpm/Kconfig new file mode 100644 index 0000000000..8508210fc6 --- /dev/null +++ b/src/drivers/tpm/Kconfig @@ -0,0 +1,7 @@ +config TPM_INIT + bool + default y if TPM1 || TPM2 + depends on !VBOOT + help + This driver automatically initializes the TPM if vboot is not used. + The TPM driver init is done during the ramstage chip init phase. diff --git a/src/drivers/tpm/Makefile.inc b/src/drivers/tpm/Makefile.inc new file mode 100644 index 0000000000..4e80600ddf --- /dev/null +++ b/src/drivers/tpm/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_TPM_INIT) += tpm.c diff --git a/src/drivers/tpm/tpm.c b/src/drivers/tpm/tpm.c new file mode 100644 index 0000000000..e4a81c3da4 --- /dev/null +++ b/src/drivers/tpm/tpm.c @@ -0,0 +1,35 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2018 Facebook Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +#if IS_ENABLED(CONFIG_ARCH_X86) +#include +#endif + +static void init_tpm_dev(void *unused) +{ +#if IS_ENABLED(CONFIG_ARCH_X86) + int s3resume = acpi_is_wakeup_s3(); + tpm_setup(s3resume); +#else + tpm_setup(false); +#endif +} + +BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, init_tpm_dev, NULL); -- cgit v1.2.3