[coreboot-gerrit] New patch to review for coreboot: 707e20e vboot2: Fill vboot1 handoff with correct TPM firmware version

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9565

-gerrit

commit 707e20e1d9f16910923f1bb042fdb252212fdc20
Author: Julius Werner <jwerner at chromium.org>
Date:   Thu Jan 29 17:50:58 2015 -0800

    vboot2: Fill vboot1 handoff with correct TPM firmware version
    
    sd->fw_version represents the version of the *current* firmware, which
    is not necessarily the same as the one stored in the TPM (and may be 0
    in recovery mode). Use the newly added sd->fw_version_secdata instead
    which contains a more correct value.
    
    CQ-DEPEND=CL:244601
    BRANCH=veyron
    BUG=chrome-os-partner:35941
    TEST=Booted Jerry in recovery mode, confirmed crossystem tpm_fwver was
    corrent (and not 0).
    
    Change-Id: I30f5998da5ac518d6fcb7a651eba4e1fabc14478
    Signed-off-by: Stefan Reinauer <reinauer at chromium.org>
    Original-Commit-Id: eb8142f69cea34e11f9081caafcaae7a15cc3801
    Original-Change-Id: Id95bd8c6412f2e8b2ae643c3b5a3dee13d0d47be
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/244591
    Original-Reviewed-by: Randall Spangler <rspangler at chromium.org>
---
 src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c
index 33ff79a..87ea289 100644
--- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c
+++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c
@@ -79,7 +79,7 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff,
 	vb_sd->struct_size = sizeof(VbSharedDataHeader);
 	vb_sd->data_size = VB_SHARED_DATA_MIN_SIZE;
 	vb_sd->data_used = sizeof(VbSharedDataHeader);
-	vb_sd->fw_version_tpm = vb2_sd->fw_version;
+	vb_sd->fw_version_tpm = vb2_sd->fw_version_secdata;
 
 	if (get_write_protect_state())
 		vb_sd->flags |= VBSD_BOOT_FIRMWARE_WP_ENABLED;