diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-27 08:56:02 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-27 08:56:02 -0600 |
| commit | 46ff00bea5dd2dd247d5e2fdadbf5dcf8653cd9a (patch) | |
| tree | e49c0ff69ef5d457efc93df68add191b2ac33849 /drivers | |
| parent | 6c012d6a2f2a24977d5903e88b8d433a720709c6 (diff) | |
| parent | 89aa8463cdf3919ca4f04fc24ec8b154ff56d97e (diff) | |
Merge tag 'tpm-master-27052024' of https://source.denx.de/u-boot/custodians/u-boot-tpm
TPM fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tpm/tpm2_tis_spi.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c index de9cf8f21e0..7f8df318330 100644 --- a/drivers/tpm/tpm2_tis_spi.c +++ b/drivers/tpm/tpm2_tis_spi.c @@ -237,19 +237,22 @@ static int tpm_tis_spi_probe(struct udevice *dev) /* legacy reset */ ret = gpio_request_by_name(dev, "gpio-reset", 0, &reset_gpio, GPIOD_IS_OUT); - if (ret) { + if (!ret) { log(LOGC_NONE, LOGL_NOTICE, - "%s: missing reset GPIO\n", __func__); - goto init; + "%s: gpio-reset is deprecated\n", __func__); } - log(LOGC_NONE, LOGL_NOTICE, - "%s: gpio-reset is deprecated\n", __func__); } - dm_gpio_set_value(&reset_gpio, 1); - mdelay(1); - dm_gpio_set_value(&reset_gpio, 0); + + if (!ret) { + log(LOGC_NONE, LOGL_WARNING, + "%s: TPM gpio reset should not be used on secure production devices\n", + dev->name); + dm_gpio_set_value(&reset_gpio, 1); + mdelay(1); + dm_gpio_set_value(&reset_gpio, 0); + } } -init: + /* Ensure a minimum amount of time elapsed since reset of the TPM */ mdelay(drv_data->time_before_first_cmd_ms); |