diff options
| author | Stephen Douthit <stephend@silicom-usa.com> | 2018-03-07 13:17:36 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-11-27 21:02:49 -0500 |
| commit | 42efebdf1d120554e1a30e8debf562527ec6a53d (patch) | |
| tree | a5ad1ad96dd0a228b165c8e62bac7dab7afe0242 | |
| parent | a698c8995ffb2838296ec284fe3c4ad33dfca307 (diff) | |
| download | seabios-42efebdf1d120554e1a30e8debf562527ec6a53d.tar.gz | |
tpm: Check for TPM related ACPI tables before attempting hw probe
Signed-off-by: Stephen Douthit <stephend@silicom-usa.com>
| -rw-r--r-- | src/tcgbios.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tcgbios.c b/src/tcgbios.c index 40b30281..24846d3b 100644 --- a/src/tcgbios.c +++ b/src/tcgbios.c @@ -968,6 +968,13 @@ tpm_setup(void) if (!CONFIG_TCGBIOS) return; + int ret = tpm_tpm2_probe(); + if (ret) { + ret = tpm_tcpa_probe(); + if (ret) + return; + } + TPM_version = tpmhw_probe(); if (TPM_version == TPM_VERSION_NONE) return; @@ -976,13 +983,6 @@ tpm_setup(void) "TCGBIOS: Detected a TPM %s.\n", (TPM_version == TPM_VERSION_1_2) ? "1.2" : "2"); - int ret = tpm_tpm2_probe(); - if (ret) { - ret = tpm_tcpa_probe(); - if (ret) - return; - } - TPM_working = 1; if (runningOnXen()) |