aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu-Ping Wu <yupingso@chromium.org>2022-08-19 11:59:55 +0800
committerMartin L Roth <gaumless@gmail.com>2022-08-21 15:01:19 +0000
commit28f1729f157924f37e0a875898404d36fb7a9954 (patch)
tree8429bb3bdb810e566d97b165ed520c6f3c22b286
parent6aec7c57b2b156b601f25e3b05977dbf832ba48e (diff)
tpm: Correct TI50_FIRMWARE_VERSION_NOT_SUPPORTED help text
Reading firmware_version register is supported on Ti50 version 0.22.4. Therefore correct the help text of the Kconfig option TI50_FIRMWARE_VERSION_NOT_SUPPORTED. Also change the message level to BIOS_WARNING. BUG=b:234533588 TEST=emerge-corsola coreboot BRANCH=none Change-Id: I66a0ef896c9dc4cd0f586555a55dbcd1cfd863f9 Signed-off-by: Yu-Ping Wu <yupingso@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/66906 Reviewed-by: Yidi Lin <yidilin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Andrey Pronin <apronin@google.com> Reviewed-by: Hung-Te Lin <hungte@chromium.org>
-rw-r--r--src/drivers/tpm/cr50.c2
-rw-r--r--src/security/tpm/tss/vendor/cr50/Kconfig6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/tpm/cr50.c b/src/drivers/tpm/cr50.c
index 1724b8d0f6..1fe6cf8b89 100644
--- a/src/drivers/tpm/cr50.c
+++ b/src/drivers/tpm/cr50.c
@@ -193,7 +193,7 @@ enum cb_err cr50_get_firmware_version(struct cr50_firmware_version *version)
goto success;
if (CONFIG(TI50_FIRMWARE_VERSION_NOT_SUPPORTED)) {
- printk(BIOS_ERR, "Reading Ti50 firmware version is not supported\n");
+ printk(BIOS_WARNING, "Reading Ti50 firmware version is not supported\n");
if (version)
*version = cr50_firmware_version;
return CB_ERR;
diff --git a/src/security/tpm/tss/vendor/cr50/Kconfig b/src/security/tpm/tss/vendor/cr50/Kconfig
index 547f0fde3e..a483e36deb 100644
--- a/src/security/tpm/tss/vendor/cr50/Kconfig
+++ b/src/security/tpm/tss/vendor/cr50/Kconfig
@@ -34,11 +34,11 @@ config TI50_FIRMWARE_VERSION_NOT_SUPPORTED
bool
default n
help
- Ti50 FW versions below 0.15 don't support the firmware_version register,
+ 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.0.15. The config will be removed once all Ti50 stocks are updated to
- 0.0.15 or higher.
+ 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