diff options
| author | Reka Norman <rekanorman@google.com> | 2022-08-29 09:00:27 +1000 |
|---|---|---|
| committer | Subrata Banik <subratabanik@google.com> | 2022-08-29 04:57:37 +0000 |
| commit | 39564922a56feb18c85da8748bfb0f55b9fa1eeb (patch) | |
| tree | c2d1a5ef1f8b814ea981fd86af164f7bae49e5d2 | |
| parent | feab41b030890e1a11519cbdf603c43f2baafdaa (diff) | |
| download | coreboot-39564922a56feb18c85da8748bfb0f55b9fa1eeb.tar.gz coreboot-39564922a56feb18c85da8748bfb0f55b9fa1eeb.tar.bz2 coreboot-39564922a56feb18c85da8748bfb0f55b9fa1eeb.zip | |
drivers/i2c/tpm: Remove TI50_FIRMWARE_VERSION_NOT_SUPPORTED
This workaround was added since reading the firmware version on Ti50
versions < 0.0.15 will cause the Ti50 to become unresponsive. No one is
using Ti50 this old anymore, so remove the workaround.
BUG=b:224650720,b:236911319
TEST=Boot to OS on nivviks with Ti50 0.22.4. Check the log contains the
firmware version:
[INFO ] Firmware version: Ti50/D3C1 RO_B:0.0.26/- RW_B:0.22.4/ti50_common:v095c
Change-Id: I3628b799e436a80d0512dabd356c4b2566ed600a
Signed-off-by: Reka Norman <rekanorman@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67138
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kangheui Won <khwon@chromium.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
| -rw-r--r-- | src/drivers/tpm/cr50.c | 7 | ||||
| -rw-r--r-- | src/mainboard/google/brya/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/rex/Kconfig | 1 | ||||
| -rw-r--r-- | src/security/tpm/tss/vendor/cr50/Kconfig | 10 |
4 files changed, 0 insertions, 19 deletions
diff --git a/src/drivers/tpm/cr50.c b/src/drivers/tpm/cr50.c index 1fe6cf8b89b6..25ce881d8aa8 100644 --- a/src/drivers/tpm/cr50.c +++ b/src/drivers/tpm/cr50.c @@ -192,13 +192,6 @@ enum cb_err cr50_get_firmware_version(struct cr50_firmware_version *version) cr50_firmware_version.minor) goto success; - if (CONFIG(TI50_FIRMWARE_VERSION_NOT_SUPPORTED)) { - printk(BIOS_WARNING, "Reading Ti50 firmware version is not supported\n"); - if (version) - *version = cr50_firmware_version; - return CB_ERR; - } - int chunk_count = 0; size_t chunk_size = 50; char version_str[301]; diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 7def530ace25..eebb720ddf18 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -82,7 +82,6 @@ config BOARD_GOOGLE_BASEBOARD_NISSA select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW select SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE select SYSTEM_TYPE_LAPTOP - select TI50_FIRMWARE_VERSION_NOT_SUPPORTED select TPM_GOOGLE_TI50 select SOC_INTEL_COMMON_MMC_OVERRIDE diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig index 9f4018da62a2..50ca924921b5 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -22,7 +22,6 @@ config BOARD_GOOGLE_BASEBOARD_REX select MEMORY_SOLDERDOWN select SOC_INTEL_METEORLAKE select SYSTEM_TYPE_LAPTOP - select TI50_FIRMWARE_VERSION_NOT_SUPPORTED select TPM_GOOGLE_TI50 config BOARD_GOOGLE_REX0 diff --git a/src/security/tpm/tss/vendor/cr50/Kconfig b/src/security/tpm/tss/vendor/cr50/Kconfig index a483e36deb57..33a5cf3da17f 100644 --- a/src/security/tpm/tss/vendor/cr50/Kconfig +++ b/src/security/tpm/tss/vendor/cr50/Kconfig @@ -30,16 +30,6 @@ config CR50_USE_LONG_INTERRUPT_PULSES Whether to request longer interrupt pulses using Cr50 BOARD_CFG register. If the Cr50 firmware is too old, it will not be able to honor the request. -config TI50_FIRMWARE_VERSION_NOT_SUPPORTED - bool - default n - help - Ti50 FW versions below 0.22.4 don't support the firmware_version register, - and trying to access it causes I2C errors. This config will skip accesses - to the register, and should be selected for boards using Ti50 chips with - FW < 0.22.4. The config will be removed once all Ti50 stocks are updated to - 0.22.4 or higher. - config GOOGLE_TPM_IRQ_TIMEOUT_MS int default 100 if TPM_GOOGLE_CR50 && I2C_TPM |