GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/i2c/tpm: Work around missing board_cfg in Ti50 FW under 0.15 

Ti50 FW under 0.15 is not support board cfg command which causes I2C
errors and entering recovery mode. And ODM stocks are 0.12 pre-flashed.
Add workaround for the old Ti50 chip.

BUG=b:224650720
TEST=no I2C errors in coreboot.
[ERROR]  cr50_i2c_read: Address write failed
[INFO ]  .I2C stop bit not received

Signed-off-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Change-Id: Ieec7842ca66b4c690df04a400cebcf45138c745d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63011
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Kangheui Won <khwon@chromium.org>
This commit is contained in:
Eric Lai 2022-03-23 08:48:03 +08:00 committed by Tim Wawrzynczak
parent 66f99f7fa7
commit c4ca20f67f
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/drivers/i2c/tpm/Kconfig
View File

@ -24,6 +24,15 @@ config MAINBOARD_HAS_I2C_TPM_GENERIC
help help
Board has a generic I2C TPM support Board has a generic I2C TPM support
config MAINBOARD_NEEDS_I2C_TI50_WORKAROUND
bool
default n
help
Ti50 FW versions below 0.15 don't support the firmware_version or board_cfg registers,
and trying to access them causes I2C errors. This config will skip accesses to these
registers, and should be selected for boards using Ti50 chips with FW < 0.15. The config
will be removed once all Ti50 stocks are updated to 0.15 or higher.
config DRIVER_TIS_DEFAULT config DRIVER_TIS_DEFAULT
bool bool
depends on I2C_TPM depends on I2C_TPM

4
src/drivers/i2c/tpm/cr50.c
View File

@ -500,7 +500,9 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr)
printk(BIOS_DEBUG, "cr50 TPM 2.0 (i2c %u:0x%02x id 0x%x)\n", printk(BIOS_DEBUG, "cr50 TPM 2.0 (i2c %u:0x%02x id 0x%x)\n",
bus, dev_addr, did_vid >> 16); bus, dev_addr, did_vid >> 16);
if (tpm_first_access_this_boot()) { /* Ti50 FW version under 0.15 doesn't support board cfg command
TODO: remove this flag after all stocks Ti50 uprev to 0.15 or above */
if (!CONFIG(MAINBOARD_NEEDS_I2C_TI50_WORKAROUND) && tpm_first_access_this_boot()) {
/* This is called for the side-effect of printing the version string. */ /* This is called for the side-effect of printing the version string. */
cr50_get_firmware_version(&ver); cr50_get_firmware_version(&ver);
cr50_set_board_cfg(); cr50_set_board_cfg();

1
src/mainboard/google/brya/Kconfig
View File

@ -60,6 +60,7 @@ config BOARD_GOOGLE_BASEBOARD_NISSA
def_bool n def_bool n
select BOARD_GOOGLE_BRYA_COMMON select BOARD_GOOGLE_BRYA_COMMON
select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if CHROMEOS select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if CHROMEOS
select MAINBOARD_NEEDS_I2C_TI50_WORKAROUND
select MEMORY_SOLDERDOWN select MEMORY_SOLDERDOWN
select SOC_INTEL_ALDERLAKE_PCH_N select SOC_INTEL_ALDERLAKE_PCH_N
select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW