<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/26218">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Paul Menzel: Looks good to me, but someone else must approve
Aaron Durbin: Looks good to me, approved
Philipp Deppenwiese: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">timestamp: Add timestamps for TPM communication<br><br>On grunt these operations combined take a little over 37ms.<br><br>BUG=b:64549506<br>TEST=built on grunt<br> 511:starting TPM PCR extend 301,268 (598)<br> 512:finished TPM PCR extend 326,710 (25,442)<br> 513:starting locking TPM 326,716 (6)<br> 514:finished locking TPM 339,517 (12,801)<br><br>Change-Id: I05cfb3d0f8463f073e329a035484a340546649e1<br>Signed-off-by: Raul E Rangel <rrangel@chromium.org><br>Reviewed-on: https://review.coreboot.org/26218<br>Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net><br>Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com><br>Reviewed-by: Aaron Durbin <adurbin@chromium.org><br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>---<br>M src/commonlib/include/commonlib/timestamp_serialized.h<br>M src/security/vboot/vboot_logic.c<br>2 files changed, 13 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/commonlib/include/commonlib/timestamp_serialized.h b/src/commonlib/include/commonlib/timestamp_serialized.h</span><br><span>index 42b55bc..304e43f 100644</span><br><span>--- a/src/commonlib/include/commonlib/timestamp_serialized.h</span><br><span>+++ b/src/commonlib/include/commonlib/timestamp_serialized.h</span><br><span>@@ -76,6 +76,10 @@</span><br><span> TS_DONE_LOADING = 508,</span><br><span> TS_DONE_HASHING = 509,</span><br><span> TS_END_HASH_BODY = 510,</span><br><span style="color: hsl(120, 100%, 40%);">+ TS_START_TPMPCR = 511,</span><br><span style="color: hsl(120, 100%, 40%);">+ TS_END_TPMPCR = 512,</span><br><span style="color: hsl(120, 100%, 40%);">+ TS_START_TPMLOCK = 513,</span><br><span style="color: hsl(120, 100%, 40%);">+ TS_END_TPMLOCK = 514,</span><br><span> TS_START_COPYVPD = 550,</span><br><span> TS_END_COPYVPD_RO = 551,</span><br><span> TS_END_COPYVPD_RW = 552,</span><br><span>@@ -190,6 +194,10 @@</span><br><span> { TS_DONE_LOADING, "finished loading body (ignore for x86)" },</span><br><span> { TS_DONE_HASHING, "finished calculating body hash (SHA2)" },</span><br><span> { TS_END_HASH_BODY, "finished verifying body signature (RSA)" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TS_START_TPMPCR, "starting TPM PCR extend" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TS_END_TPMPCR, "finished TPM PCR extend" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TS_START_TPMLOCK, "starting locking TPM" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TS_END_TPMLOCK, "finished locking TPM" },</span><br><span> </span><br><span> { TS_START_COPYVPD, "starting to load Chrome OS VPD" },</span><br><span> { TS_END_COPYVPD_RO, "finished loading Chrome OS VPD (RO)" },</span><br><span>diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c</span><br><span>index 9221a12..2600f84 100644</span><br><span>--- a/src/security/vboot/vboot_logic.c</span><br><span>+++ b/src/security/vboot/vboot_logic.c</span><br><span>@@ -403,6 +403,7 @@</span><br><span> vboot_reboot();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_add_now(TS_START_TPMPCR);</span><br><span> rv = extend_pcrs(&ctx);</span><br><span> if (rv) {</span><br><span> printk(BIOS_WARNING, "Failed to extend TPM PCRs (%#x)\n", rv);</span><br><span>@@ -410,8 +411,11 @@</span><br><span> save_if_needed(&ctx);</span><br><span> vboot_reboot();</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_add_now(TS_END_TPMPCR);</span><br><span> </span><br><span> /* Lock TPM */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_add_now(TS_START_TPMLOCK);</span><br><span> rv = antirollback_lock_space_firmware();</span><br><span> if (rv) {</span><br><span> printk(BIOS_INFO, "Failed to lock TPM (%x)\n", rv);</span><br><span>@@ -419,6 +423,7 @@</span><br><span> save_if_needed(&ctx);</span><br><span> vboot_reboot();</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp_add_now(TS_END_TPMLOCK);</span><br><span> </span><br><span> /* Lock rec hash space if available. */</span><br><span> if (IS_ENABLED(CONFIG_VBOOT_HAS_REC_HASH_SPACE)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26218">change 26218</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26218"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I05cfb3d0f8463f073e329a035484a340546649e1 </div>
<div style="display:none"> Gerrit-Change-Number: 26218 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Raul Rangel <rrangel@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Aaron Durbin <adurbin@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Raul Rangel <rrangel@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>