diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-02-03 11:43:36 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-06 06:49:49 +0000 |
| commit | ee88f0d455b543139d693f4ee278c084b72e4826 (patch) | |
| tree | 499847a036acda6aaa92492edb1f0bf1715b2cc5 | |
| parent | 020f32e4026f3041477eaf7dbc9f270af94376ed (diff) | |
| download | vboot-ee88f0d455b543139d693f4ee278c084b72e4826.tar.gz | |
vboot/vboot_display: retrieve TPM versions from vboot1 structures
The sd->kernel_version_secdatak variable referenced here is never
actually initialized by current code, so it always shows as 0x00000000.
This patch reverts part of the changes regarding TPM versions in
CL:1680190.
This CL is a temporary fix for kukui. Please do not merge this CL to
ToT, which will be fixed by initializing the variable in question
instead (see CL:1651221).
BRANCH=kukui
BUG=none
TEST=emerge-kukui vboot_reference
Change-Id: I86316a175be7a29eb9c0e4e67dfd59c0ddff9fed
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2035098
Tested-by: Yu-Ping Wu <yupingso@chromium.org>
Auto-Submit: Yu-Ping Wu <yupingso@chromium.org>
Commit-Queue: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 218d66f7..58bbc619 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -295,10 +295,10 @@ vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx) used += StrnAppend(buf + used, "\nTPM: fwver=0x", DEBUG_INFO_SIZE - used); used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, - sd->fw_version_secdata, 16, 8); + shared->fw_version_tpm, 16, 8); used += StrnAppend(buf + used, " kernver=0x", DEBUG_INFO_SIZE - used); used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, - sd->kernel_version_secdata, 16, 8); + shared->kernel_version_tpm, 16, 8); /* Add GBB flags */ used += StrnAppend(buf + used, |